Skip to content

Commit 671c6b0

Browse files
authoredJun 11, 2024··
[workload] Remove name versioning from coreclr runtime packs since they are never referenced by name (#103314)
* Remove incorrect version from bare runtime packs * Add versioning back to the current pack but remove references in net8
1 parent 41d4c46 commit 671c6b0

File tree

2 files changed

+17
-46
lines changed

2 files changed

+17
-46
lines changed
 

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

+17-8
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@
115115
"packs": [
116116
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.osx-arm64",
117117
"Microsoft.NETCore.App.Runtime.Mono.${NetVersion}.osx-x64",
118-
"Microsoft.NETCore.App.Runtime.osx-arm64",
119-
"Microsoft.NETCore.App.Runtime.osx-x64"
118+
"Microsoft.NETCore.App.Runtime.${NetVersion}.osx-arm64",
119+
"Microsoft.NETCore.App.Runtime.${NetVersion}.osx-x64"
120120
],
121121
"extends": [ "microsoft-net-runtime-mono-tooling" ],
122122
"platforms": [ "osx-arm64", "osx-x64" ]
@@ -484,17 +484,26 @@
484484
"any": "Microsoft.NETCore.App.Runtime.Mono.wasi-wasm"
485485
}
486486
},
487-
"Microsoft.NETCore.App.Runtime.win-x64" : {
487+
"Microsoft.NETCore.App.Runtime.${NetVersion}.win-x64" : {
488488
"kind": "framework",
489-
"version": "${PackageVersion}"
489+
"version": "${PackageVersion}",
490+
"alias-to": {
491+
"any": "Microsoft.NETCore.App.Runtime.win-x64"
492+
}
490493
},
491-
"Microsoft.NETCore.App.Runtime.win-x86" : {
494+
"Microsoft.NETCore.App.Runtime.${NetVersion}.win-x86" : {
492495
"kind": "framework",
493-
"version": "${PackageVersion}"
496+
"version": "${PackageVersion}",
497+
"alias-to": {
498+
"any": "Microsoft.NETCore.App.Runtime.win-x86"
499+
}
494500
},
495-
"Microsoft.NETCore.App.Runtime.win-arm64" : {
501+
"Microsoft.NETCore.App.Runtime.${NetVersion}.win-arm64" : {
496502
"kind": "framework",
497-
"version": "${PackageVersion}"
503+
"version": "${PackageVersion}",
504+
"alias-to": {
505+
"any": "Microsoft.NETCore.App.Runtime.win-arm64"
506+
}
498507
}
499508
}
500509
}

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

-38
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,6 @@
131131
"extends": [ "microsoft-net-runtime-mono-tooling-net8" ],
132132
"platforms": [ "win-x64", "win-arm64", "osx-arm64", "osx-x64" ]
133133
},
134-
"runtimes-windows-net8": {
135-
"abstract": true,
136-
"description": "Windows Runtime Packs for net8.0",
137-
"packs": [
138-
"Microsoft.NETCore.App.Runtime.net8.win-x64",
139-
"Microsoft.NETCore.App.Runtime.net8.win-x86",
140-
"Microsoft.NETCore.App.Runtime.net8.win-arm",
141-
"Microsoft.NETCore.App.Runtime.net8.win-arm64"
142-
]
143-
},
144134
"microsoft-net-runtime-mono-tooling-net8": {
145135
"abstract": true,
146136
"description": "Shared native build tooling for Mono runtime",
@@ -436,33 +426,5 @@
436426
"any": "Microsoft.NETCore.App.Runtime.Mono.wasi-wasm"
437427
}
438428
},
439-
"Microsoft.NETCore.App.Runtime.net8.win-x64" : {
440-
"kind": "framework",
441-
"version": "${PackageVersionNet8}",
442-
"alias-to": {
443-
"any": "Microsoft.NETCore.App.Runtime.win-x64"
444-
}
445-
},
446-
"Microsoft.NETCore.App.Runtime.net8.win-x86" : {
447-
"kind": "framework",
448-
"version": "${PackageVersionNet8}",
449-
"alias-to": {
450-
"any": "Microsoft.NETCore.App.Runtime.win-x86"
451-
}
452-
},
453-
"Microsoft.NETCore.App.Runtime.net8.win-arm" : {
454-
"kind": "framework",
455-
"version": "${PackageVersionNet8}",
456-
"alias-to": {
457-
"any": "Microsoft.NETCore.App.Runtime.win-arm"
458-
}
459-
},
460-
"Microsoft.NETCore.App.Runtime.net8.win-arm64" : {
461-
"kind": "framework",
462-
"version": "${PackageVersionNet8}",
463-
"alias-to": {
464-
"any": "Microsoft.NETCore.App.Runtime.win-arm64"
465-
}
466-
}
467429
}
468430
}

0 commit comments

Comments
 (0)
Please sign in to comment.