Merge in 'release/8.0' changes

dotnet-bot · dotnet-bot · commit d246d8ee9540 · 2024-06-11T16:27:58.000Z
diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in
@@ -396,7 +396,7 @@
         "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64"
       }
     },
-    "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64": {
+    "Microsoft.NETCore.App.Runtime.AOT.Cross.${NetVersion}.ios-arm64": {
       "kind": "Sdk",
       "version": "${PackageVersion}",
       "alias-to": {

Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@`
`396`	`396`	`"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64"`
`397`	`397`	`}`
`398`	`398`	`},`
`399`		`- "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64": {`
	`399`	`+ "Microsoft.NETCore.App.Runtime.AOT.Cross.${NetVersion}.ios-arm64": {`
`400`	`400`	`"kind": "Sdk",`
`401`	`401`	`"version": "${PackageVersion}",`
`402`	`402`	`"alias-to": {`