Skip to content

Commit

Permalink
[dotnet] shorten workload ids (#12035)
Browse files Browse the repository at this point in the history 
Context: xamarin/xamarin-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.
  • Loading branch information
@jonathanpeppers
jonathanpeppers committed Jun 29, 2021
1 parent bfe6faf commit a64b030
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion dotnet/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ export DOTNETSDK_WORKLOAD_MANIFEST_ROOTS:=$(abspath ./Workloads)
.stamp-install-workloads: Makefile Workloads/NuGet.config $(WORKLOAD_TARGETS) $(RUNTIME_PACKS) $(REF_PACKS) $(SDK_PACKS) $(TEMPLATE_PACKS) $(WORKLOAD_PACKS)
$(Q) cd Workloads && $(DOTNET6) workload install --skip-manifest-update \
microsoft-net-runtime-ios microsoft-net-runtime-tvos microsoft-net-runtime-maccatalyst \
$(foreach platform,$(DOTNET_PLATFORMS),microsoft-$(shell echo $(platform) | tr A-Z a-z)-sdk-full)
$(foreach platform,$(DOTNET_PLATFORMS),$(shell echo $(platform) | tr A-Z a-z))
$(Q) touch $@

TARGETS += .stamp-install-workloads
Expand Down
4 changes: 2 additions & 2 deletions dotnet/targets/WorkloadManifest.MacCatalyst.template.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version": "@VERSION@",
"workloads": {
"microsoft-@PLATFORM_LOWERCASE@-sdk-full": {
"description": "Microsoft @PLATFORM@ SDK",
"@PLATFORM_LOWERCASE@": {
"description": "Microsoft @PLATFORM@ SDK for .NET",
"packs": [
"Microsoft.@PLATFORM@.Sdk",
"Microsoft.@PLATFORM@.Ref",
Expand Down
10 changes: 5 additions & 5 deletions dotnet/targets/WorkloadManifest.iOS.template.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"version": "@VERSION@",
"workloads": {
"microsoft-@PLATFORM_LOWERCASE@-sdk-full": {
"description": "Microsoft @PLATFORM@ SDK",
"@PLATFORM_LOWERCASE@": {
"description": "Microsoft @PLATFORM@ SDK for .NET",
"packs": [
"Microsoft.@PLATFORM@.Sdk",
"Microsoft.@PLATFORM@.Windows.Sdk",
"Microsoft.@PLATFORM@.Ref",
"Microsoft.@PLATFORM@.Templates",
"Microsoft.@PLATFORM@.Templates"
],
"extends": [
"microsoft-net-runtime-ios",
],
"microsoft-net-runtime-ios"
]
}
},
"packs": {
Expand Down
4 changes: 2 additions & 2 deletions dotnet/targets/WorkloadManifest.macOS.template.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version": "@VERSION@",
"workloads": {
"microsoft-@PLATFORM_LOWERCASE@-sdk-full": {
"description": "Microsoft @PLATFORM@ SDK",
"@PLATFORM_LOWERCASE@": {
"description": "Microsoft @PLATFORM@ SDK for .NET",
"packs": [
"Microsoft.@PLATFORM@.Sdk",
"Microsoft.@PLATFORM@.Ref",
Expand Down
8 changes: 4 additions & 4 deletions dotnet/targets/WorkloadManifest.tvOS.template.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"version": "@VERSION@",
"workloads": {
"microsoft-@PLATFORM_LOWERCASE@-sdk-full": {
"description": "Microsoft @PLATFORM@ SDK",
"@PLATFORM_LOWERCASE@": {
"description": "Microsoft @PLATFORM@ SDK for .NET",
"packs": [
"Microsoft.@PLATFORM@.Sdk",
"Microsoft.@PLATFORM@.Ref",
"Microsoft.@PLATFORM@.Templates"
],
"extends": [
"microsoft-net-runtime-tvos",
],
"microsoft-net-runtime-tvos"
]
}
},
"packs": {
Expand Down

9 comments on commit a64b030

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (Build). ⚠️

Results were skipped for this run Azure Devops.

Pipeline on Agent
[dotnet] shorten workload ids (#12035)

Context: xamarin/xamarin-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.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ [CI Build] Tests passed on Build. ✅

Tests passed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

✅ API Diff (from PR only) (no change)
✅ Generator Diff (no change)

Packages generated

View packages

🎉 All 221 tests passed 🎉

Pipeline on Agent XAMBOT-1028.BigSur'
[dotnet] shorten workload ids (#12035)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥 Tests failed catastrophically on VSTS: device tests tvOS 🔥

Not enough free space in the host.

Pipeline on Agent
[dotnet] shorten workload ids (#12035)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests tvOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[dotnet] shorten workload ids (#12035)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[dotnet] shorten workload ids (#12035)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac Catalina (10.15) ✅

Tests passed

All tests on macOS X Mac Catalina (10.15) passed.

Pipeline on Agent
[dotnet] shorten workload ids (#12035)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac Mojave (10.14) ✅

Tests passed

All tests on macOS X Mac Mojave (10.14) passed.

Pipeline on Agent
[dotnet] shorten workload ids (#12035)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac High Sierra (10.13) ✅

Tests passed

All tests on macOS X Mac High Sierra (10.13) passed.

Pipeline on Agent
[dotnet] shorten workload ids (#12035)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS32b). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[dotnet] shorten workload ids (#12035)

Please sign in to comment.