yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/12.0' into v12/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/Sync/ServerMessengerBase.cs
#	version.json
This commit is contained in:
Bjarke Berg
2023-06-20 13:56:27 +02:00
parent 6b78d4b647 9c1f912639
commit 197efbb12c
119 changed files with 2525 additions and 1450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.Common/Profiler/WebProfiler.cs
View File

@@ -29,7 +29,7 @@ public class WebProfiler : IProfiler
public void Start()
{
MiniProfiler.StartNew();
MiniProfilerContext.Value = MiniProfiler.Current;
MiniProfilerContext.Value = MiniProfiler.Current!;
}
public void Stop(bool discardResults = false) => MiniProfilerContext.Value?.Stop(discardResults);
@@ -84,7 +84,7 @@ public class WebProfiler : IProfiler
if (cookieValue is not null)
{
AddSubProfiler(MiniProfiler.FromJson(cookieValue));
AddSubProfiler(MiniProfiler.FromJson(cookieValue)!);
}
// If it is a redirect to a relative path (local redirect)

2
src/Umbraco.Web.Common/Profiler/WebProfilerHtml.cs
View File

@@ -34,7 +34,7 @@ public class WebProfilerHtml : IProfilerHtml
var result = StackExchange.Profiling.Internal.Render.Includes(
profiler,
context is not null ? context.Request.PathBase + path : null,
context is not null ? context.Request.PathBase + path : string.Empty,
true,
new List<Guid> { profiler.Id },
RenderPosition.Right,

10
src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
View File

@@ -14,11 +14,11 @@
<PackageReference Include="Asp.Versioning.Mvc" Version="7.0.0" />
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="7.0.0" />
<PackageReference Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.5" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
<PackageReference Include="Smidge.InMemory" Version="4.2.1" />
<PackageReference Include="Smidge.Nuglify" Version="4.2.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.7" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
<PackageReference Include="Smidge.InMemory" Version="4.3.0" />
<PackageReference Include="Smidge.Nuglify" Version="4.3.0" />
</ItemGroup>
<ItemGroup>