Merge branch 'main' into dev/moljac/mu-20250425-alignment-bumps

moljac · web-flow · commit 4f70cd927275 · 2025-04-29T23:32:54.000+02:00
diff --git a/build.cake b/build.cake
@@ -1,5 +1,5 @@
 // Used by binderator, "Windows" is fine because we only use managed code from it
-#tool nuget:?package=Microsoft.Android.Sdk.Windows&version=35.0.0-rc.1.80
+#tool nuget:?package=Microsoft.Android.Sdk.Windows&version=35.0.61
 
 // Cake Addins
 #addin nuget:?package=Cake.FileHelpers&version=7.0.0
diff --git a/tests/allpackages/AllPackagesTests.csproj b/tests/allpackages/AllPackagesTests.csproj
@@ -10,11 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliWrap" Version="3.6.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="CliWrap" Version="3.8.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/allpackages/TestAllIndividualPackages.cs b/tests/allpackages/TestAllIndividualPackages.cs
@@ -189,7 +189,7 @@ async Task TestAllPackages (string template, bool isGps)
 		}
 		xd.Save(proj_file);
 
-		ReplaceInFile (proj_file, ">21</SupportedOSPlatformVersion>", $">{platform_version}</SupportedOSPlatformVersion>");
+    ReplaceInFile (proj_file, ">21</SupportedOSPlatformVersion>", $">{platform_version}</SupportedOSPlatformVersion>");
 		ReplaceInFile (proj_file, ">21.0</SupportedOSPlatformVersion>", $">{platform_version}</SupportedOSPlatformVersion>");
 		ReplaceInFile (proj_file, $";{net_version}-ios", "");
 		ReplaceInFile (proj_file, $";{net_version}-maccatalyst", "");
diff --git a/tests/extended/ExtendedTests.csproj b/tests/extended/ExtendedTests.csproj
@@ -10,11 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliWrap" Version="3.6.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="CliWrap" Version="3.8.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <LangVersion>12.0</LangVersion>
         <PreserveCompilationContext>true</PreserveCompilationContext>
         <RootNamespace>AndroidBinderator</RootNamespace>
@@ -25,7 +25,7 @@
 
     <ItemGroup>
         <PackageReference Include="RazorLight" Version="2.3.1" />
-        <PackageReference Include="System.Text.Json" Version="6.0.10" />
+        <PackageReference Include="System.Text.Json" Version="9.0.4" />
         <PackageReference Include="MavenNet" Version="2.2.14" />
     </ItemGroup>
 
@@ -35,7 +35,7 @@
 
     <ItemGroup>
       <Reference Include="Java.Interop.Tools.Maven">
-        <HintPath>..\..\..\tools\Microsoft.Android.Sdk.Windows.35.0.0-rc.1.80\tools\Java.Interop.Tools.Maven.dll</HintPath>
+        <HintPath>..\..\..\tools\Microsoft.Android.Sdk.Windows.35.0.61\tools\Java.Interop.Tools.Maven.dll</HintPath>
         <Private>True</Private>
       </Reference>
     </ItemGroup>
diff --git a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Test.cs b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Test.cs
@@ -24,7 +24,7 @@ public class Test : TestsBase
 
 		void AddCoreTargets (ProjectRootElement el)
 		{
-			var baseDir = new Uri(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).LocalPath;
+			var baseDir = new Uri(System.Reflection.Assembly.GetExecutingAssembly().Location).LocalPath;
 
 			var props = Path.Combine (baseDir, "..", "..", "source", "Xamarin.Build.Download", "bin", Configuration, "netstandard20", "Xamarin.Build.Download.props");
 
@@ -504,7 +504,7 @@ public void TestGetItemsToDownload ()
 
 			var itemToDownload = project.GetItems ("XamarinBuildDownloadItemToDownload");
 
-			Assert.Equal (1, itemToDownload.Count);
+			Assert.Single (itemToDownload);
 			Assert.True (itemToDownload.First ().GetMetadata ("Url").EvaluatedValue == itemUrl);
 		}
 
@@ -543,7 +543,7 @@ public void TestDeduplicateGetItemsToDownload ()
 
 			var itemToDownload = project.GetItems ("XamarinBuildDownloadItemToDownload");
 
-			Assert.Equal (1, itemToDownload.Count);
+			Assert.Single (itemToDownload);
 			Assert.True (itemToDownload.First ().GetMetadata ("Url").EvaluatedValue == itemUrl);
 		}
 
diff --git a/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj b/util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <RollForward>Major</RollForward>
   </PropertyGroup>
@@ -19,7 +19,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mono.Cecil" Version="0.11.4" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.6" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj b/util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj
@@ -42,6 +42,6 @@
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MSBuildPackageReferenceVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageReferenceVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" PrivateAssets="all" GeneratePathProperty="true" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="all" GeneratePathProperty="true" />
   </ItemGroup>
 </Project>
diff --git a/workloads.json b/workloads.json
@@ -1,10 +1,10 @@
 {
-  "microsoft.net.sdk.android": "34.0.143/8.0.100",
-  "microsoft.net.sdk.ios": "18.0.8303/8.0.100",
-  "microsoft.net.sdk.maccatalyst": "18.0.8303/8.0.100",
-  "microsoft.net.sdk.macos": "15.0.8303/8.0.100",
-  "microsoft.net.sdk.maui": "8.0.82/8.0.100",
-  "microsoft.net.sdk.tvos": "18.0.8303/8.0.100",
-  "microsoft.net.workload.mono.toolchain.current": "8.0.10/8.0.100",
-  "microsoft.net.workload.emscripten.current": "8.0.10/8.0.100"
+  "microsoft.net.sdk.android": "34.0.154/8.0.100",
+  "microsoft.net.sdk.ios": "18.0.8319/8.0.100",
+  "microsoft.net.sdk.maccatalyst": "18.0.8319/8.0.100",
+  "microsoft.net.sdk.macos": "15.0.8319/8.0.100",
+  "microsoft.net.sdk.maui": "8.0.100/8.0.100",
+  "microsoft.net.sdk.tvos": "18.0.8319/8.0.100",
+  "microsoft.net.workload.mono.toolchain.current": "8.0.15/8.0.100",
+  "microsoft.net.workload.emscripten.current": "8.0.15/8.0.100"
 }

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ async Task TestAllPackages (string template, bool isGps)`
`189`	`189`	`}`
`190`	`190`	`xd.Save(proj_file);`
`191`	`191`
`192`		`- ReplaceInFile (proj_file, ">21</SupportedOSPlatformVersion>", $">{platform_version}</SupportedOSPlatformVersion>");`
	`192`	`+ ReplaceInFile (proj_file, ">21</SupportedOSPlatformVersion>", $">{platform_version}</SupportedOSPlatformVersion>");`
`193`	`193`	`ReplaceInFile (proj_file, ">21.0</SupportedOSPlatformVersion>", $">{platform_version}</SupportedOSPlatformVersion>");`
`194`	`194`	`ReplaceInFile (proj_file, $";{net_version}-ios", "");`
`195`	`195`	`ReplaceInFile (proj_file, $";{net_version}-maccatalyst", "");`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class Test : TestsBase`
`24`	`24`
`25`	`25`	`void AddCoreTargets (ProjectRootElement el)`
`26`	`26`	`{`
`27`		`- var baseDir = new Uri(System.Reflection.Assembly.GetExecutingAssembly().CodeBase).LocalPath;`
	`27`	`+ var baseDir = new Uri(System.Reflection.Assembly.GetExecutingAssembly().Location).LocalPath;`
`28`	`28`
`29`	`29`	`var props = Path.Combine (baseDir, "..", "..", "source", "Xamarin.Build.Download", "bin", Configuration, "netstandard20", "Xamarin.Build.Download.props");`
`30`	`30`
`@@ -504,7 +504,7 @@ public void TestGetItemsToDownload ()`
`504`	`504`
`505`	`505`	`var itemToDownload = project.GetItems ("XamarinBuildDownloadItemToDownload");`
`506`	`506`
`507`		`- Assert.Equal (1, itemToDownload.Count);`
	`507`	`+ Assert.Single (itemToDownload);`
`508`	`508`	`Assert.True (itemToDownload.First ().GetMetadata ("Url").EvaluatedValue == itemUrl);`
`509`	`509`	`}`
`510`	`510`
`@@ -543,7 +543,7 @@ public void TestDeduplicateGetItemsToDownload ()`
`543`	`543`
`544`	`544`	`var itemToDownload = project.GetItems ("XamarinBuildDownloadItemToDownload");`
`545`	`545`
`546`		`- Assert.Equal (1, itemToDownload.Count);`
	`546`	`+ Assert.Single (itemToDownload);`
`547`	`547`	`Assert.True (itemToDownload.First ().GetMetadata ("Url").EvaluatedValue == itemUrl);`
`548`	`548`	`}`
`549`	`549`