Merge pull request #300 from MartinZikmund/dependabot/nuget/main/Uno.…

…Sdk-5.4.10
MartinZikmund · Nov 8, 2024 · 6bbb2fa · 6bbb2fa
2 parents 146bcbd + 14d340b
commit 6bbb2fa
Show file tree

Hide file tree

Showing 8 changed files with 451 additions and 259 deletions.
diff --git a/global.json b/global.json
@@ -1,11 +1,9 @@
 {
   "sdk": {
-    "version": "8.0.303",
-    "allowPrerelease": false,
-    "rollForward": "latestMinor"
+    "allowPrerelease": false
   },
-  "msbuild-sdks": {
-    "Uno.Sdk": "5.4.8",
-    "Microsoft.Build.NoTargets": "3.7.56"
-  }
-}
+	"msbuild-sdks": {
+		"Uno.Sdk": "5.6.0-dev.144",
+		"Microsoft.Build.NoTargets": "3.7.56"
+	}
+}
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -26,6 +26,9 @@
 		<WinAppSdkBuildToolsVersion Condition="$(TargetFramework.Contains('windows10'))">10.0.22621.3233</WinAppSdkBuildToolsVersion>
 		<UnoExtensionsVersion Condition="$(TargetFramework.Contains('windows10'))">4.2.2</UnoExtensionsVersion>
 
+
+		<!-- Temporary workaround for https://github.com/unoplatform/uno/issues/18464 -->
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,5 +1,2 @@
 <Project>
-	<!-- Workaround for https://github.com/unoplatform/uno/issues/17910 -->
-	<Target Name="ResolveWebView2CoreDuplicates1" BeforeTargets="_ComputeResolvedFilesToPublishTypes" AfterTargets="ComputeFilesToPublish" />
-	<Target Name="ResolveWebView2CoreDuplicates2" BeforeTargets="_ComputeResolvedFilesToPublishTypes" AfterTargets="ComputeFilesToPublish" />
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -2,29 +2,29 @@
   <ItemGroup>
     <!-- Web -->
     <PackageVersion Include="AutoMapper" Version="13.0.1" />
-    <PackageVersion Include="Azure.Storage.Blobs" Version="12.20.0" />
-    <PackageVersion Include="Betalgo.OpenAI" Version="8.6.0" />
+    <PackageVersion Include="Azure.Storage.Blobs" Version="12.22.2" />
+    <PackageVersion Include="Betalgo.OpenAI" Version="8.7.2" />
     <PackageVersion Include="BuildWebCompiler2022" Version="1.14.10" />
     <PackageVersion Include="Edi.SyndicationFeed.ReaderWriter" Version="2.2.0" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />
-    <PackageVersion Include="MediatR" Version="12.4.0" />
-    <PackageVersion Include="Markdig" Version="0.37.0" />
-    <PackageVersion Include="Markdown.ColorCode" Version="2.2.2" />
+    <PackageVersion Include="MediatR" Version="12.4.1" />
+    <PackageVersion Include="Markdig" Version="0.38.0" />
+    <PackageVersion Include="Markdown.ColorCode" Version="2.3.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Rewrite" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.7" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.7" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.5.3" />
-    <PackageVersion Include="Moq" Version="4.20.70" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.6.2" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="ReverseMarkdown" Version="4.6.0" />
     <PackageVersion Include="System.ServiceModel.Syndication" Version="8.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageVersion Include="WilderMinds.MetaWeblog" Version="5.1.3" />
@@ -34,9 +34,9 @@
     <PackageVersion Include="Xamarin.AndroidX.Annotation" Version="1.6.0.3" />
     <PackageVersion Include="Betalgo.OpenAI.GPT3" Version="6.8.4" />
     <PackageVersion Include="LiteDB" Version="5.0.17" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -53,18 +53,18 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Refit" Version="7.1.2" />
-    <PackageVersion Include="Refit.Newtonsoft.Json" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.7" />
-    <PackageVersion Include="Microsoft.Identity.Web" Version="3.0.1" />
-    <PackageVersion Include="Microsoft.Identity.Web.DownstreamApi" Version="3.0.1" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.0" />
+    <PackageVersion Include="Refit" Version="8.0.0" />
+    <PackageVersion Include="Refit.Newtonsoft.Json" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.10" />
+    <PackageVersion Include="Microsoft.Identity.Web" Version="3.3.1" />
+    <PackageVersion Include="Microsoft.Identity.Web.DownstreamApi" Version="3.3.1" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
     <!-- Uno -->
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
     <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.7" />
     <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
     <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.3" />

diff --git a/src/MZikmund.sln b/src/MZikmund.sln
@@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
+		..\global.json = ..\global.json
 		solution-config.props.sample = solution-config.props.sample
 	EndProjectSection
 EndProject