Skip to content

[dotnet] shorten workload ids #12035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 29, 2021
Merged

[dotnet] shorten workload ids #12035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0594cbb
[dotnet] shorten workload ids
jonathanpeppers Jun 29, 2021
16f49fc
Merge branch 'main' into dotnet-workload-install-ios
jonathanpeppers Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dotnet/Makefile
View file
Open in desktop
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
Open in desktop
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.@[email protected]",
"Microsoft.@[email protected]",
Expand Down
10 changes: 5 additions & 5 deletions dotnet/targets/WorkloadManifest.iOS.template.json
View file
Open in desktop
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.@[email protected]",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]"
],
"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
Open in desktop
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.@[email protected]",
"Microsoft.@[email protected]",
Expand Down
8 changes: 4 additions & 4 deletions dotnet/targets/WorkloadManifest.tvOS.template.json
View file
Open in desktop
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.@[email protected]",
"Microsoft.@[email protected]",
"Microsoft.@[email protected]"
],
"extends": [
"microsoft-net-runtime-tvos",
],
"microsoft-net-runtime-tvos"
]
}
},
"packs": {
Expand Down