Skip to content

Commit 2d7fe94

Browse files
lewinglewing
authored
[workloads] Update net8 mobile workload definitions (#97824)
* Remove trailing commas * Update some other packs * Fix the android arm64 packs too
1 parent cf79806 commit 2d7fe94

File tree

1 file changed

+14
-44
lines changed

1 file changed

+14
-44
lines changed

‎src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net8.Manifest/WorkloadManifest.json.in

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"packs": [
6262
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.ios-arm64",
6363
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.iossimulator-arm64",
64-
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.iossimulator-x64",
64+
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.iossimulator-x64"
6565
],
6666
"extends": [ "runtimes-ios-net8" ],
6767
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
@@ -72,7 +72,7 @@
7272
"packs": [
7373
"Microsoft.NETCore.App.Runtime.Mono.net8.ios-arm64",
7474
"Microsoft.NETCore.App.Runtime.Mono.net8.iossimulator-arm64",
75-
"Microsoft.NETCore.App.Runtime.Mono.net8.iossimulator-x64",
75+
"Microsoft.NETCore.App.Runtime.Mono.net8.iossimulator-x64"
7676
],
7777
"extends": [ "microsoft-net-runtime-mono-tooling-net8" ],
7878
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
@@ -216,7 +216,7 @@
216216
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x86",
217217
"linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.android-x86",
218218
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86",
219-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86"
219+
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.android-x86"
220220
}
221221
},
222222
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.android-x64": {
@@ -228,7 +228,7 @@
228228
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x64",
229229
"linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.android-x64",
230230
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64",
231-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64"
231+
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.android-x64"
232232
}
233233
},
234234
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.android-arm": {
@@ -240,7 +240,7 @@
240240
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm",
241241
"linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.android-arm",
242242
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm",
243-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm"
243+
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.android-arm"
244244
}
245245
},
246246
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.android-arm64": {
@@ -252,7 +252,7 @@
252252
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm64",
253253
"linux-arm64": "Microsoft.NETCore.App.Runtime.AOT.linux-arm64.Cross.android-arm64",
254254
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64",
255-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64"
255+
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.android-arm64"
256256
}
257257
},
258258
"Microsoft.NETCore.App.Runtime.Mono.net8.maccatalyst-arm64": {
@@ -297,13 +297,6 @@
297297
"any": "Microsoft.NETCore.App.Runtime.osx-x64"
298298
}
299299
},
300-
"Microsoft.NETCore.App.Runtime.Mono.net8.ios-arm" : {
301-
"kind": "framework",
302-
"version": "${PackageVersionNet8}",
303-
"alias-to": {
304-
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm"
305-
}
306-
},
307300
"Microsoft.NETCore.App.Runtime.Mono.net8.ios-arm64" : {
308301
"kind": "framework",
309302
"version": "${PackageVersionNet8}",
@@ -325,18 +318,11 @@
325318
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"
326319
}
327320
},
328-
"Microsoft.NETCore.App.Runtime.Mono.net8.iossimulator-x86" : {
329-
"kind": "framework",
330-
"version": "${PackageVersionNet8}",
331-
"alias-to": {
332-
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
333-
}
334-
},
335321
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.tvos-arm64": {
336322
"kind": "Sdk",
337323
"version": "${PackageVersionNet8}",
338324
"alias-to": {
339-
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
325+
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.tvos-arm64",
340326
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64"
341327
}
342328
},
@@ -365,74 +351,58 @@
365351
"kind": "Sdk",
366352
"version": "${PackageVersionNet8}",
367353
"alias-to": {
368-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64",
354+
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.maccatalyst-arm64",
369355
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64"
370356
}
371357
},
372358
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.maccatalyst-x64": {
373359
"kind": "Sdk",
374360
"version": "${PackageVersionNet8}",
375361
"alias-to": {
376-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-x64",
362+
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.maccatalyst-x64",
377363
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-x64"
378364
}
379365
},
380366
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.tvossimulator-arm64": {
381367
"kind": "Sdk",
382368
"version": "${PackageVersionNet8}",
383369
"alias-to": {
384-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64",
370+
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.tvossimulator-arm64",
385371
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64"
386372
}
387373
},
388374
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.tvossimulator-x64": {
389375
"kind": "Sdk",
390376
"version": "${PackageVersionNet8}",
391377
"alias-to": {
392-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64",
378+
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.tvossimulator-x64",
393379
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64"
394380
}
395381
},
396-
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.ios-arm": {
397-
"kind": "Sdk",
398-
"version": "${PackageVersionNet8}",
399-
"alias-to": {
400-
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm",
401-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm"
402-
}
403-
},
404382
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.ios-arm64": {
405383
"kind": "Sdk",
406384
"version": "${PackageVersionNet8}",
407385
"alias-to": {
408386
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64",
409-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64"
387+
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.ios-arm64"
410388
}
411389
},
412390
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.iossimulator-arm64": {
413391
"kind": "Sdk",
414392
"version": "${PackageVersionNet8}",
415393
"alias-to": {
416-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64",
394+
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.iossimulator-arm64",
417395
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64"
418396
}
419397
},
420398
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.iossimulator-x64": {
421399
"kind": "Sdk",
422400
"version": "${PackageVersionNet8}",
423401
"alias-to": {
424-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64",
402+
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-arm64.Cross.iossimulator-x64",
425403
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64"
426404
}
427405
},
428-
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.iossimulator-x86": {
429-
"kind": "Sdk",
430-
"version": "${PackageVersionNet8}",
431-
"alias-to": {
432-
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x86",
433-
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x86"
434-
}
435-
},
436406
"Microsoft.NETCore.App.Runtime.AOT.Cross.net8.browser-wasm": {
437407
"kind": "Sdk",
438408
"version": "${PackageVersionNet8}",

0 commit comments

Comments
 (0)