[net9.0] Update dependencies from dotnet/installer

eng/Version.Details.xml

@@ -1,34 +1,34 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.3.24153.2">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.4.24211.4">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>893b762b6e36d558df7ae6fccdfd8034f83a1c2e</Sha>
+      <Sha>c61f05c5628fdba80433184eb00353a908dbdccc</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink" Version="9.0.0-alpha.1.23556.4">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>cf47d9ff6827a3e1d6f2acbf925cd618418f20dd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.3.24129.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24209.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>5e603d595e63ddc5cdce9777a40608279abdcc37</Sha>
+      <Sha>6b9381be09980dac0d2fc554cf478e054c005cdb</Sha>
     </Dependency>
     <!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal -->
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.3.24129.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24209.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>5e603d595e63ddc5cdce9777a40608279abdcc37</Sha>
+      <Sha>6b9381be09980dac0d2fc554cf478e054c005cdb</Sha>
     </Dependency>
     <!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.3.24151.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.4.24208.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>3e5155276f3d486ef49e1f06ee875d6757983695</Sha>
+      <Sha>79ef5e329b1e31c3775a1977798253cc8f7da6cc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.3.24126.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.4.24204.9" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>0f3e462442af5fe65271e3185d5b645ad40a6041</Sha>
+      <Sha>9ad7c262f14dc5e40a64030ade7788b36e74adf0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24120.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24168.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/cecil</Uri>
-      <Sha>0d0bc8e0f47fdae9834e1eac678f364c50946133</Sha>
+      <Sha>9c8ea966df62f764523b51772763e74e71040a92</Sha>
     </Dependency>
     <!-- This is a subscription of the .NET 8 versions of our packages -->
     <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="17.2.8044">

eng/Versions.props

@@ -2,15 +2,15 @@
   <!--Package versions-->
   <PropertyGroup>
     <!-- Versions updated by maestro -->
-    <MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.3.24153.2</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.3.24129.2</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.4.24211.4</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.4.24209.8</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.3.24129.2</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24209.8</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
     <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24120.1</MicrosoftDotNetCecilPackageVersion>
+    <MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24168.1</MicrosoftDotNetCecilPackageVersion>
     <MicrosoftDotNetXHarnessiOSSharedPackageVersion>9.0.0-prerelease.24203.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
     <!-- Manually updated versions -->
     <Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.100-preview.3.24153.2"
+    "version": "9.0.100-preview.4.24211.4"
   }
 }

tests/dotnet/UnitTests/TrimmerWarningsTest.cs

@@ -8,7 +8,23 @@ public class TrimmerWarningsTest : TestBaseClass {
 		[TestCase (ApplePlatform.TVOS, "tvossimulator-x64")]
 		public void TrimmerWarningsManagedStaticRegistrar (ApplePlatform platform, string runtimeIdentifiers)
 		{
-			TrimmerWarnings (platform, runtimeIdentifiers, "managed-static", Array.Empty<ExpectedBuildMessage> ());
+			// FIXME: dotnet/runtime#100256
+			ExpectedBuildMessage [] expectedWarnings;
+			switch (platform) {
+			case ApplePlatform.iOS:
+			case ApplePlatform.TVOS:
+				expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
+				break;
+			case ApplePlatform.MacOSX:
+			case ApplePlatform.MacCatalyst:
+				expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
+				break;
+			default:
+				Assert.Fail ($"Unknown platform: {platform}");
+				return;
+			}
+
+			TrimmerWarnings (platform, runtimeIdentifiers, "managed-static", expectedWarnings);
 		}
 
 		[Test]
@@ -18,7 +34,23 @@ public void TrimmerWarningsManagedStaticRegistrar (ApplePlatform platform, strin
 		[TestCase (ApplePlatform.TVOS, "tvos-arm64")]
 		public void TrimmerWarningsStaticRegistrar (ApplePlatform platform, string runtimeIdentifiers)
 		{
-			TrimmerWarnings (platform, runtimeIdentifiers, "static", Array.Empty<ExpectedBuildMessage> ());
+			// FIXME: dotnet/runtime#100256
+			ExpectedBuildMessage [] expectedWarnings;
+			switch (platform) {
+			case ApplePlatform.iOS:
+			case ApplePlatform.TVOS:
+				expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
+				break;
+			case ApplePlatform.MacOSX:
+			case ApplePlatform.MacCatalyst:
+				expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
+				break;
+			default:
+				Assert.Fail ($"Unknown platform: {platform}");
+				return;
+			}
+
+			TrimmerWarnings (platform, runtimeIdentifiers, "static", expectedWarnings);
 		}
 
 		[Test]
@@ -28,7 +60,23 @@ public void TrimmerWarningsStaticRegistrar (ApplePlatform platform, string runti
 		[TestCase (ApplePlatform.TVOS, "tvos-arm64")]
 		public void TrimmerWarningsDynamicRegistrar (ApplePlatform platform, string runtimeIdentifiers)
 		{
-			TrimmerWarnings (platform, runtimeIdentifiers, "dynamic", Array.Empty<ExpectedBuildMessage> ());
+			// FIXME: dotnet/runtime#100256
+			ExpectedBuildMessage [] expectedWarnings;
+			switch (platform) {
+			case ApplePlatform.iOS:
+			case ApplePlatform.TVOS:
+				expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
+				break;
+			case ApplePlatform.MacOSX:
+			case ApplePlatform.MacCatalyst:
+				expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
+				break;
+			default:
+				Assert.Fail ($"Unknown platform: {platform}");
+				return;
+			}
+
+			TrimmerWarnings (platform, runtimeIdentifiers, "dynamic", expectedWarnings);
 		}
 
 		void TrimmerWarnings (ApplePlatform platform, string runtimeIdentifiers, string registrar, params ExpectedBuildMessage [] expectedWarnings)

tests/monotouch-test/Compression/CompressionStreamTest.cs

@@ -101,7 +101,7 @@ public void CheckNullRead ()
 				Assert.Ignore ("Requires iOS 9.0+ or macOS 10.11+");
 			MemoryStream backing = new MemoryStream (compressed_data);
 			DeflateStream decompressing = new DeflateStream (backing, CompressionMode.Decompress, CompressionAlgorithm.Zlib);
-			Assert.Throws<ArgumentNullException> (() => decompressing.Read (null, 0, 20));
+			Assert.Throws<ArgumentNullException> (() => IgnoreReturnValue (decompressing.Read (null, 0, 20)));
 		}
 
 		[Test]
@@ -112,7 +112,7 @@ public void CheckCompressingRead ()
 			byte [] dummy = new byte [20];
 			MemoryStream backing = new MemoryStream ();
 			DeflateStream compressing = new DeflateStream (backing, CompressionMode.Compress, CompressionAlgorithm.Zlib);
-			Assert.Throws<InvalidOperationException> (() => compressing.Read (dummy, 0, 20));
+			Assert.Throws<InvalidOperationException> (() => IgnoreReturnValue (compressing.Read (dummy, 0, 20)));
 		}
 
 		[Test]
@@ -123,7 +123,7 @@ public void CheckRangeRead ()
 			byte [] dummy = new byte [20];
 			MemoryStream backing = new MemoryStream (compressed_data);
 			DeflateStream decompressing = new DeflateStream (backing, CompressionMode.Decompress, CompressionAlgorithm.Zlib);
-			Assert.Throws<ArgumentException> (() => decompressing.Read (dummy, 10, 20));
+			Assert.Throws<ArgumentException> (() => IgnoreReturnValue (decompressing.Read (dummy, 10, 20)));
 		}
 
 		[Test]
@@ -135,7 +135,7 @@ public void CheckClosedRead ()
 			MemoryStream backing = new MemoryStream (compressed_data);
 			DeflateStream decompressing = new DeflateStream (backing, CompressionMode.Decompress, CompressionAlgorithm.Zlib);
 			decompressing.Close ();
-			Assert.Throws<ObjectDisposedException> (() => decompressing.Read (dummy, 0, 20));
+			Assert.Throws<ObjectDisposedException> (() => IgnoreReturnValue (decompressing.Read (dummy, 0, 20)));
 		}
 
 		[Test]
@@ -335,7 +335,13 @@ public void Bug19313 ()
 			byte [] buffer = new byte [512];
 			using (var backing = new Bug19313Stream (compressed_data))
 			using (var decompressing = new DeflateStream (backing, CompressionMode.Decompress, CompressionAlgorithm.Zlib))
-				decompressing.Read (buffer, 0, buffer.Length);
+				IgnoreReturnValue (decompressing.Read (buffer, 0, buffer.Length));
+		}
+
+		// Call this with the return value from CompressionStream.Read to avoid:
+		//     error CA2022: Avoid inexact read with 'Compression.CompressionStream.Read(byte[], int, int)' (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2022)
+		void IgnoreReturnValue (int value)
+		{
 		}
 	}
 }

tests/msbuild/Xamarin.MacDev.Tests/TargetTests/DetectSigningIdentityTests.cs

@@ -66,10 +66,26 @@ public void BundleIdentifierInPartialAppManifest ()
 			var recordArgs = BinLog.ReadBuildEvents (rv.BinLogPath).ToList ();
 			var taskIndex = recordArgs.FindIndex (v => v is TaskStartedEventArgs tsea && tsea.TaskName == "DetectSigningIdentity");
 			Assert.That (taskIndex, Is.GreaterThan (0), "Task index");
-			var taskParameterIndex = recordArgs.FindIndex (taskIndex + 1, v => v is BuildMessageEventArgs bmea && bmea.Message.StartsWith ("Task Parameter:BundleIdentifier="));
+			var taskParameterIndex = recordArgs.FindIndex (taskIndex + 1, v => {
+				if (!(v is BuildMessageEventArgs bmea))
+					return false;
+				if (bmea.Message.StartsWith ("Task Parameter:BundleIdentifier="))
+					return true;
+				if (bmea.Message.StartsWith ("TaskInput: BundleIdentifier"))
+					return true;
+				return false;
+			});
 			Assert.That (taskParameterIndex, Is.GreaterThan (0), "Parameter index");
 			var taskParameter = (BuildMessageEventArgs) recordArgs [taskParameterIndex];
-			var bundleIdentifier = taskParameter.Message.Substring ("Task Parameter:BundleIdentifier=".Length);
+			var taskMessage = taskParameter.Message;
+			string bundleIdentifier;
+			if (taskMessage.StartsWith ("Task Parameter:BundleIdentifier=")) {
+				bundleIdentifier = taskMessage.Substring ("Task Parameter:BundleIdentifier=".Length);
+			} else if (taskMessage.StartsWith ("TaskInput: BundleIdentifier")) {
+				bundleIdentifier = taskMessage.Substring ("TaskInput: BundleIdentifier".Length).Trim ();
+			} else {
+				bundleIdentifier = "Unhandled task message format.";
+			}
 			Assert.AreEqual ("com.xamarin.detectsigningidentitytest", bundleIdentifier, "Bundle identifier");
 		}
 	}