[release/9.0.1xx-preview5] Update dependencies from dotnet/sdk (#20646)

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.NET.ILLink.Tasks**: from 9.0.0-preview.5.24256.1 to 9.0.0-preview.5.24306.7 (parent: VS.Tools.Net.Core.SDK.Resolver)
  - **Microsoft.AspNetCore.App.Ref**: from 9.0.0-preview.5.24256.2 to 9.0.0-preview.5.24306.11 (parent: VS.Tools.Net.Core.SDK.Resolver)
  - **Microsoft.NETCore.App.Ref**: from 9.0.0-preview.5.24256.1 to 9.0.0-preview.5.24306.7 (parent: VS.Tools.Net.Core.SDK.Resolver)
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport**: from 9.0.0-preview.5.24223.2 to 9.0.0-preview.5.24306.1 (parent: Microsoft.NETCore.App.Ref)
  - **Microsoft.NETCore.App.Ref**: from 9.0.0-preview.5.24256.1 to 9.0.0-preview.5.24306.7 (parent: VS.Tools.Net.Core.SDK.Resolver)

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

- **Subscription**: fdbf7b46-d24b-47b5-3fd1-08dc7a58f5cd
- **Build**: 20240607.3
- **Date Produced**: June 7, 2024 10:53:07 AM UTC
- **Commit**: 35b2c21ea64c7b401b77076516d9319879d8314b
- **Branch**: refs/heads/release/9.0.1xx-preview5

- **Updates**:
  - **VS.Tools.Net.Core.SDK.Resolver**: [from 9.0.100-preview.5.24262.2 to 9.0.100-preview.5.24307.3][65]
  - **Microsoft.NET.ILLink.Tasks**: [from 9.0.0-preview.5.24256.1 to 9.0.0-preview.5.24306.7][66]
  - **Microsoft.AspNetCore.App.Ref**: [from 9.0.0-preview.5.24256.2 to 9.0.0-preview.5.24306.11][67]
  - **Microsoft.NETCore.App.Ref**: [from 9.0.0-preview.5.24256.1 to 9.0.0-preview.5.24306.7][66]
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport**: [from 9.0.0-preview.5.24223.2 to 9.0.0-preview.5.24306.1][68]
  - **Microsoft.NETCore.App.Ref**: [from 9.0.0-preview.5.24256.1 to 9.0.0-preview.5.24306.7][66]

[65]: dotnet/sdk@1741345...35b2c21
[66]: dotnet/runtime@84b3339...a5cc707
[67]: dotnet/aspnetcore@da3aa27...8af96e0
[68]: dotnet/emsdk@53288f8...068f598

.github/workflows/bump-global-json.yml

@@ -1,4 +1,4 @@
-name: Bump global.json for dotnet/installer bumps
+name: Bump global.json for dotnet/sdk bumps
 on: pull_request_target
 
 jobs:
@@ -10,7 +10,7 @@ jobs:
     # https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
     permissions:
       contents: write
-    if: contains(github.event.pull_request.title, 'Update dependencies from dotnet/installer') && github.actor == 'dotnet-maestro[bot]'
+    if: contains(github.event.pull_request.title, 'Update dependencies from dotnet/sdk') && github.actor == 'dotnet-maestro[bot]'
     steps:
     - name: 'Checkout repo'
       uses: actions/checkout@v4
@@ -20,6 +20,9 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
 
     - name: 'Update global.json'
+      env:
+        PR_NUMBER: ${{ github.event.number }}
+        PR_TITLE: ${{ github.event.pull_request.title }}
       run: |
         set -exo pipefail
         touch Make.config.inc # create a dummy file to avoid logic we don't need executed here
@@ -32,5 +35,5 @@ jobs:
         git config --global user.email "[email protected]"
         git config --global user.name "GitHub Actions"
         git checkout "$GITHUB_HEAD_REF"
-        git commit -m "Re-generate global.json"
+        git commit -m "Re-generate global.json for PR #$PR_NUMBER: $PR_TITLE"
         git push

Make.config

@@ -315,7 +315,7 @@ INCLUDE_TVOS=1
 INCLUDE_MACCATALYST=1
 INCLUDE_DEVICE=1
 INCLUDE_DOTNET_WATCHOS=
-INCLUDE_XAMARIN_LEGACY=1
+INCLUDE_XAMARIN_LEGACY=
 INCLUDE_HOTRESTART=1
 
 ENABLE_DOTNET=1

NuGet.config

@@ -51,6 +51,8 @@
     <add key="darc-pub-dotnet-runtime-397f9ea" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-397f9eac/nuget/v3/index.json" />
     <!-- Add a 7.0.20 feed -->
     <add key="darc-pub-dotnet-runtime-fd36db5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-fd36db5f/nuget/v3/index.json" />
+    <!-- Add a 8.0.7 feed -->
+    <add key="darc-pub-dotnet-runtime-919e5b2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-919e5b2b/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

eng/Version.Details.xml

@@ -1,30 +1,30 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="VS.Tools.Net.Core.SDK.Resolver" Version="9.0.100-preview.5.24262.2">
-      <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>1741345c6399ae203d8f259fb12fb873dac5129d</Sha>
+    <Dependency Name="VS.Tools.Net.Core.SDK.Resolver" Version="9.0.100-preview.5.24307.3">
+      <Uri>https://github.com/dotnet/sdk</Uri>
+      <Sha>35b2c21ea64c7b401b77076516d9319879d8314b</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.5.24256.1" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.5.24306.7" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>84b33395057737db3ea342a5151feb6b90c1b6f6</Sha>
+      <Sha>a5cc707d976a14495462c9c492a921ff0927b8f5</Sha>
     </Dependency>
     <!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on VS.Tools.Net.Core.SDK.Resolver -->
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.5.24256.1" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.5.24306.7" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>84b33395057737db3ea342a5151feb6b90c1b6f6</Sha>
+      <Sha>a5cc707d976a14495462c9c492a921ff0927b8f5</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.5.24256.2" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.5.24306.11" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>da3aa27233a2cec2f6780884f71934b2f5e686ce</Sha>
+      <Sha>8af96e042134fb3b2f21df26dd0f32ea1c00dd37</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.5.24223.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.5.24306.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>53288f87c588907e8ff01f129786820fe998573c</Sha>
+      <Sha>068f59873f1dc5ae74eef9bbe82b847b74560d99</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24230.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/cecil</Uri>

eng/Versions.props

@@ -3,11 +3,11 @@
   <PropertyGroup>
     <!-- Versions updated by maestro -->
     <!-- NOTE: $(VSToolsNetCoreSDKResolverPackageVersion) may be temporary -->
-    <VSToolsNetCoreSDKResolverPackageVersion>9.0.100-preview.5.24262.2</VSToolsNetCoreSDKResolverPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.5.24256.1</MicrosoftNETILLinkTasksPackageVersion>
+    <VSToolsNetCoreSDKResolverPackageVersion>9.0.100-preview.5.24307.3</VSToolsNetCoreSDKResolverPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.5.24306.7</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.5.24256.1</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.5.24306.7</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>

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.100-preview.5.24262.2"
+    "version": "9.0.100-preview.5.24307.3"
   }
 }

tests/common/BinLog.cs

@@ -294,6 +294,8 @@ public static bool TryFindPropertyValue (string binlog, string property, [NotNul
 							if (propname == property)
 								value = propvalue;
 						}
+					} else if (bmea.Message?.StartsWith ($"TaskOutput: {property}") == true) {
+						value = bmea.Message?.Substring ($"TaskOutput: {property}".Length).Trim ();
 					}
 				}
 			}

tests/dotnet/UnitTests/PostBuildTest.cs

@@ -29,9 +29,22 @@ public void ArchiveTest (ApplePlatform platform, string runtimeIdentifiers)
 			var result = DotNet.AssertBuild (project_path, properties);
 			var recordArgs = BinLog.ReadBuildEvents (result.BinLogPath).ToList ();
 			var findString = "Output Property: ArchiveDir";
-			var archiveDirRecord = recordArgs.Where (v => v?.Message?.Contains (findString) == true).ToList ();
-			Assert.That (archiveDirRecord.Count, Is.GreaterThan (0), "ArchiveDir");
-			var archiveDir = archiveDirRecord [0].Message?.Substring (findString.Length + 1)?.Trim ();
+			var findString2 = "TaskOutput: ArchiveDir";
+			var archiveDirs = recordArgs.
+				Select (v => v?.Message).
+				Select (v => {
+					if (v is null)
+						return null;
+					if (v.Contains (findString))
+						return v.Substring (findString.Length + 1);
+					if (v.Contains (findString2))
+						return v.Substring (findString2.Length + 1);
+					return null;
+				}).
+				Where (v => v is not null).
+				ToList ();
+			Assert.That (archiveDirs.Count, Is.GreaterThan (0), "ArchiveDir");
+			var archiveDir = archiveDirs [0]!.Trim ();
 			Assert.That (archiveDir, Does.Exist, "Archive directory existence");
 			AssertDSymDirectory (appPath);
 		}

tools/common/Target.cs

@@ -933,19 +933,33 @@ void GenerateIOSMain (StringWriter sw, Abi abi)
 			sw.WriteLine ("}");
 		}
 
+#if NET
+		static readonly char [] charsToReplaceAot = new [] { '.', '-', '+', '<', '>' };
+#endif
 		static string EncodeAotSymbol (string symbol)
 		{
 			var sb = new StringBuilder ();
 			/* This mimics what the aot-compiler does */
+			// https://github.com/dotnet/runtime/blob/2f08fcbfece0c09319f237a6aee6f74c4a9e14e8/src/mono/mono/metadata/native-library.c#L1265-L1284
+			// https://github.com/dotnet/runtime/blob/2f08fcbfece0c09319f237a6aee6f74c4a9e14e8/src/tasks/Common/Utils.cs#L419-L445
 			foreach (var b in System.Text.Encoding.UTF8.GetBytes (symbol)) {
 				char c = (char) b;
 				if ((c >= '0' && c <= '9') ||
 					(c >= 'a' && c <= 'z') ||
 					(c >= 'A' && c <= 'Z')) {
 					sb.Append (c);
 					continue;
+#if NET
+				} else if (charsToReplaceAot.Contains (c)) {
+					sb.Append ('_');
+				} else {
+					// Append the hex representation of b between underscores
+					sb.Append ($"_{b:X}_");
+#endif
 				}
+#if !NET
 				sb.Append ('_');
+#endif
 			}
 			return sb.ToString ();
 		}