[release/10.0.1xx-preview1] Update dependencies from dotnet/sdk (#22105)

This pull request updates the following dependencies

## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

- **Coherency Updates**:
  - **Microsoft.AspNetCore.App.Ref**: from 10.0.0-preview.1.25079.4 to 10.0.0-preview.1.25107.4 (parent: Microsoft.NET.Sdk)

## From https://github.com/dotnet/sdk

- **Subscription**: d05b3a99-3aea-4518-81ec-4583c1153c08
- **Build**: 20250210.21
- **Date Produced**: February 11, 2025 6:51:46 AM UTC
- **Commit**: d1382d9b07310de51feef4b00ab46e9648cb9919
- **Branch**: refs/heads/release/10.0.1xx-preview1

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 10.0.100-preview.1.25081.4 to 10.0.100-preview.1.25110.21][11]

[11]: dotnet/sdk@c9c8de2...d1382d9

---------

Co-authored-by: Alex Soto <[email protected]>

builds/Makefile

@@ -55,13 +55,14 @@ print-dotnet-pkg-urls: dotnet-install.sh
 	$(Q) if ! test -f $@-found-it.stamp; then echo "No working urls were found."; exit 1; fi
 	$(Q) rm -f $@-found-it.stamp
 
-# We need https://github.com/dotnet/install-scripts/pull/526, which hasn't been released yet.
+# We need https://github.com/dotnet/install-scripts/pull/555, which hasn't been released yet.
 # Revert to using https://dot.net/v1/dotnet-install.sh whenever https://dot.net/v1/dotnet-install.sh has been updated.
-DOTNET_DOWNLOAD_URL?=https://raw.githubusercontent.com/dotnet/install-scripts/87151ae8d2153247f4566208e0df23169d737e92/src/dotnet-install.sh
+DOTNET_DOWNLOAD_URL?=https://raw.githubusercontent.com/dotnet/install-scripts/d48e000adad7243861d799ec86c0bf7210a8fc7a/src/dotnet-install.sh
 
 DOTNET_DOWNLOAD_URL?=https://dot.net/v1/dotnet-install.sh
 
 dotnet-install.sh: Makefile
+	$(Q) echo "Downloading dotnet-install.sh from $(DOTNET_DOWNLOAD_URL) into $@."
 	$(Q) $(CURL_RETRY) $(DOTNET_DOWNLOAD_URL) --output $@.tmp
 	$(Q) chmod +x $@.tmp
 	$(Q) mv $@.tmp $@

eng/Version.Details.xml

@@ -1,30 +1,30 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.1.25081.4">
+    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.1.25110.21">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>c9c8de22fa57f40f0d322865e5ce5f780d9a797d</Sha>
+      <Sha>d1382d9b07310de51feef4b00ab46e9648cb9919</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="10.0.0-preview.1.25078.5" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.1.25080.5" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>1da2ea4983bb5cc3d17a3806eebc435df4cd27dd</Sha>
+      <Sha>b98cabca124ca73be9247c5f7b6796c6ce55e816</Sha>
     </Dependency>
     <!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.NET.Sdk -->
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.1.25078.5" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.1.25080.5" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>1da2ea4983bb5cc3d17a3806eebc435df4cd27dd</Sha>
+      <Sha>b98cabca124ca73be9247c5f7b6796c6ce55e816</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="10.0.0-preview.1.25079.4" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.1.25107.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>3b0d8ebf433269137c0fb345446f5381440668f7</Sha>
+      <Sha>ddbe93118b58c82efcc930842caf0f182d53aa2f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.25059.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-preview.1.25077.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>0de3165cb0d56323b6caaf8e9916d4d9e72da32d</Sha>
+      <Sha>3ac196ac425223d11490e759c2641256ce746f21</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24627.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/cecil</Uri>

eng/Versions.props

@@ -2,12 +2,12 @@
   <!--Package versions-->
   <PropertyGroup>
     <!-- Versions updated by maestro -->
-    <MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25081.4</MicrosoftNETSdkPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.1.25078.5</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25110.21</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksFeedPackageVersion>
     <MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.1.25078.5</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
     <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.1.25081.4"
+    "version": "10.0.100-preview.1.25110.21"
   },
   "tools": {
-    "dotnet": "10.0.100-preview.1.25081.4"
+    "dotnet": "10.0.100-preview.1.25110.21"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5"

msbuild/Xamarin.MacDev.Tasks/Tasks/PackLibraryResources.cs

@@ -49,7 +49,14 @@ public override bool Execute ()
 		{
 			var results = new List<ITaskItem> ();
 
+			var hashOriginalResources = new HashSet<string> (BundleOriginalResourcesWithLogicalNames.Select (v => v.ItemSpec));
+
 			foreach (var item in BundleResourcesWithLogicalNames) {
+				if (hashOriginalResources.Contains (item.ItemSpec)) {
+					Log.LogMessage (MessageImportance.Low, $"Skipping BundleResourcesWithLogicalNames={item.ItemSpec}, because it's also specified in BundleOriginalResourcesWithLogicalNames");
+					continue;
+				}
+
 				var logicalName = item.GetMetadata ("LogicalName");
 
 				if (string.IsNullOrEmpty (logicalName)) {

tests/BundledResources/ResourcesTest.cs

@@ -9,6 +9,7 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using NUnit.Framework;
 
 using Foundation;
@@ -41,10 +42,14 @@ public void Bundled ()
 			if (!hasResources) {
 				Assert.That (resources.Length, Is.EqualTo (0), "No resources");
 			} else {
-				Assert.That (resources.Length, Is.GreaterThanOrEqualTo (2), "Resources");
-				Assert.That (resources, Contains.Item ("__monotouch_content_basn3p08.png"), "res-basn3p08.png");
-				Assert.That (resources, Contains.Item ("__monotouch_content_basn3p08__with__loc.png"), "res-basn3p08_with_loc.png");
-				Assert.That (resources, Contains.Item ("__monotouch_content_xamvideotest.mp4"), "res-xamvideotest.mp4");
+				var expectedResources = new string [] {
+					"basn3p08.png",
+					"basn3p08__with__loc.png",
+					"xamvideotest.mp4",
+				};
+				var oldPrefixed = expectedResources.Select (v => $"__monotouch_content_{v}").ToArray ();
+				var newPrefixed = expectedResources.Select (v => $"__monotouch_item_BundleResource_{v}").ToArray ();
+				Assert.That (resources, Is.EquivalentTo (oldPrefixed).Or.EquivalentTo (newPrefixed), "Resources");
 			}
 		}
 	}