Skip to content

Commit a64b030

Browse files
[dotnet] shorten workload ids (#12035)
Context: dotnet/android#6045 We are aiming to simplify the .NET workload ids to short names like: dotnet workload install maui dotnet workload install android dotnet workload install ios dotnet workload install maccatalyst dotnet workload install macos dotnet workload install tvos Updated the workload ids here, as well as the `.stamp-install-workloads` make target. Other changes: * Updated descriptions to match Android. Still waiting on an *official* description we should be using for each workload. * Fixed trailing `,` that showed up as JSON errors in VS Code.
1 parent bfe6faf commit a64b030

5 files changed

+14
-14
lines changed

dotnet/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ export DOTNETSDK_WORKLOAD_MANIFEST_ROOTS:=$(abspath ./Workloads)
349349
.stamp-install-workloads: Makefile Workloads/NuGet.config $(WORKLOAD_TARGETS) $(RUNTIME_PACKS) $(REF_PACKS) $(SDK_PACKS) $(TEMPLATE_PACKS) $(WORKLOAD_PACKS)
350350
$(Q) cd Workloads && $(DOTNET6) workload install --skip-manifest-update \
351351
microsoft-net-runtime-ios microsoft-net-runtime-tvos microsoft-net-runtime-maccatalyst \
352-
$(foreach platform,$(DOTNET_PLATFORMS),microsoft-$(shell echo $(platform) | tr A-Z a-z)-sdk-full)
352+
$(foreach platform,$(DOTNET_PLATFORMS),$(shell echo $(platform) | tr A-Z a-z))
353353
$(Q) touch $@
354354

355355
TARGETS += .stamp-install-workloads

dotnet/targets/WorkloadManifest.MacCatalyst.template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"version": "@VERSION@",
33
"workloads": {
4-
"microsoft-@PLATFORM_LOWERCASE@-sdk-full": {
5-
"description": "Microsoft @PLATFORM@ SDK",
4+
"@PLATFORM_LOWERCASE@": {
5+
"description": "Microsoft @PLATFORM@ SDK for .NET",
66
"packs": [
77
"Microsoft.@[email protected]",
88
"Microsoft.@[email protected]",

dotnet/targets/WorkloadManifest.iOS.template.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"version": "@VERSION@",
33
"workloads": {
4-
"microsoft-@PLATFORM_LOWERCASE@-sdk-full": {
5-
"description": "Microsoft @PLATFORM@ SDK",
4+
"@PLATFORM_LOWERCASE@": {
5+
"description": "Microsoft @PLATFORM@ SDK for .NET",
66
"packs": [
77
"Microsoft.@[email protected]",
88
"Microsoft.@[email protected]",
99
"Microsoft.@[email protected]",
10-
"Microsoft.@[email protected]",
10+
"Microsoft.@[email protected]"
1111
],
1212
"extends": [
13-
"microsoft-net-runtime-ios",
14-
],
13+
"microsoft-net-runtime-ios"
14+
]
1515
}
1616
},
1717
"packs": {

dotnet/targets/WorkloadManifest.macOS.template.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"version": "@VERSION@",
33
"workloads": {
4-
"microsoft-@PLATFORM_LOWERCASE@-sdk-full": {
5-
"description": "Microsoft @PLATFORM@ SDK",
4+
"@PLATFORM_LOWERCASE@": {
5+
"description": "Microsoft @PLATFORM@ SDK for .NET",
66
"packs": [
77
"Microsoft.@[email protected]",
88
"Microsoft.@[email protected]",

dotnet/targets/WorkloadManifest.tvOS.template.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"version": "@VERSION@",
33
"workloads": {
4-
"microsoft-@PLATFORM_LOWERCASE@-sdk-full": {
5-
"description": "Microsoft @PLATFORM@ SDK",
4+
"@PLATFORM_LOWERCASE@": {
5+
"description": "Microsoft @PLATFORM@ SDK for .NET",
66
"packs": [
77
"Microsoft.@[email protected]",
88
"Microsoft.@[email protected]",
99
"Microsoft.@[email protected]"
1010
],
1111
"extends": [
12-
"microsoft-net-runtime-tvos",
13-
],
12+
"microsoft-net-runtime-tvos"
13+
]
1414
}
1515
},
1616
"packs": {

0 commit comments

Comments
 (0)