Merge in 'release/7.0' changes

dotnet-bot · dotnet-bot · commit 9fb31856f9e3 · 2023-01-11T18:35:07.000Z
diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/WorkloadManifest.json.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest/WorkloadManifest.json.in
@@ -169,7 +169,7 @@
       "kind": "framework",
       "version": "${PackageVersionNet6}",
       "alias-to": {
-        "any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
+        "any": "Microsoft.NETCore.App.Runtime.Mono.android-arm64"
       }
     },
     "Microsoft.NETCore.App.Runtime.Mono.net6.android-x64": {

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@`
`169`	`169`	`"kind": "framework",`
`170`	`170`	`"version": "${PackageVersionNet6}",`
`171`	`171`	`"alias-to": {`
`172`		`- "any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"`
	`172`	`+ "any": "Microsoft.NETCore.App.Runtime.Mono.android-arm64"`
`173`	`173`	`}`
`174`	`174`	`},`
`175`	`175`	`"Microsoft.NETCore.App.Runtime.Mono.net6.android-x64": {`