[dotnet] rename workload to Microsoft.NET.Sdk._platform_.Manifest-6.0.100 #11436
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
….100 Context: https://github.com/dotnet/designs/pull/188/files#diff-8fcaa29d8e6f00b34b3cb1830d93f33e75f04424780a66a3c658c7021048e74fR125 Context: dotnet/android#5898 The `$(PackageId)` of our workload `.nupkg` needs to be: Microsoft.NET.Sdk._platform_.Manifest-6.0.100 While the `$(PackageVersion)` remains the same as before. The layout on disk will change to: dotnet\sdk-manifests\6.0.100\Microsoft.NET.Sdk._platform_\ WorkloadManifest.json WorkloadManifest.targets Note that `.Manifest` and `-6.0.100` are not in the folder name on disk. At the same time, let's also update the `version` in `WorkloadManifest.json` so it contains the proper version for our workload. This used to not be possible because `version` was a `long`, but it now is a `string` where we can put our version.
spouliot
reviewed
May 4, 2021
Collaborator
✅ [PR Build] Tests passed on Build. ✅Tests passed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) 🎉 All 104 tests passed 🎉Pipeline on Agent XAMBOT-1096.BigSur' |
rolfbjarne
reviewed
May 5, 2021
| <Project> | ||
| <PropertyGroup> | ||
| <PackageId>Microsoft.NET.Workload.$(_PlatformName)</PackageId> | ||
| <PackageId>Microsoft.NET.Sdk.$(_PlatformName).Manifest-6.0.100</PackageId> |
Member
There was a problem hiding this comment.
You could do export DOTNET6_VERSION_BAND somewhere in dotnet/Makefile, and then you can use that variable here:
Suggested change
| <PackageId>Microsoft.NET.Sdk.$(_PlatformName).Manifest-6.0.100</PackageId> | |
| <PackageId>Microsoft.NET.Sdk.$(_PlatformName).Manifest-$(DOTNET6_VERSION_BAND)</PackageId> |
Member
Author
There was a problem hiding this comment.
I just passed it with -p:VersionBand, this works, thanks.
Member
Author
|
I manually tested the build artifacts here, and the files make it to the place I expect:
|
spouliot
approved these changes
May 5, 2021
rolfbjarne
approved these changes
May 5, 2021
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) Test results4 tests failed, 100 tests passed.Failed tests
Pipeline on Agent XAMBOT-1104.BigSur' |
mandel-macaque
approved these changes
May 5, 2021
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) Test results4 tests failed, 100 tests passed.Failed tests
Pipeline on Agent XAMBOT-1098.BigSur |
Member
|
Test failures are unrelated (#11456) |
jonathanpeppers
added a commit
to jonathanpeppers/installer
that referenced
this pull request
May 6, 2021
Context: https://github.com/dotnet/designs/pull/188/files#diff-8fcaa29d8e6f00b34b3cb1830d93f33e75f04424780a66a3c658c7021048e74fR125 Context: dotnet/android#5898 Context: dotnet/macios#11436 The Xamarin workload manifest packages have been renamed to have a `$(PackageId)` of: Microsoft.NET.Sdk.[platform].Manifest-6.0.100 The `dotnet` directory on disk is expected to contain: dotnet\sdk-manifests\6.0.100\Microsoft.NET.Sdk.[platform]\ WorkloadManifest.json WorkloadManifest.targets I manually tested `.\build.cmd -pack -publish` which produced `artifacts\**\dotnet-sdk-6.0.100-dev-win-x64.exe`. After installing it, I can see the "advertising manifest" feature seems to be working: > dotnet workload install microsoft-android-sdk-full --configfile NuGet.config Updated advertising manifest microsoft.net.sdk.android. Updated advertising manifest microsoft.net.sdk.ios. Updated advertising manifest microsoft.net.sdk.maccatalyst. Updated advertising manifest microsoft.net.sdk.macos. Updated advertising manifest microsoft.net.sdk.tvos. Failed to update the advertising manifest microsoft.net.workload.blazorwebassembly: microsoft.net.workload.blazorwebassembly.manifest-6.0.100 is not found in NuGet feeds https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json, https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json, https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", Installing pack Microsoft.Android.Sdk version 11.0.200-ci.main.256... Writing workload pack installation record for Microsoft.Android.Sdk version 11.0.200-ci.main.256... Installing pack Microsoft.Android.Sdk.BundleTool version 11.0.200-ci.main.256... Writing workload pack installation record for Microsoft.Android.Sdk.BundleTool version 11.0.200-ci.main.256... Installing pack Microsoft.Android.Ref version 11.0.200-ci.main.256... Writing workload pack installation record for Microsoft.Android.Ref version 11.0.200-ci.main.256... Installing pack Microsoft.Android.Templates version 11.0.200-ci.main.256... Writing workload pack installation record for Microsoft.Android.Templates version 11.0.200-ci.main.256... Garbage collecting for SDK feature bands 6.0.100... Successfully installed workload(s) microsoft-android-sdk-full. Then I'm able to build and run an Android application using the installed workload: > dotnet build HelloAndroid -t:Run ... Build succeeded. 0 Warning(s) 0 Error(s) Time Elapsed 00:00:21.76
jonathanpeppers
added a commit
to dotnet/maui
that referenced
this pull request
May 11, 2021
jonathanpeppers
added a commit
to dotnet/maui
that referenced
this pull request
May 13, 2021
Changes: dotnet/macios@19482a7...4aa8d9a Update dependencies from https://github.com/xamarin/xamarin-macios build 20210509.1 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 11.3.100-ci.main.697 -> To Version 11.3.100-ci.main.733 ~~ Other changes ~~ * Workload manifest packages were renamed See: dotnet/installer#10538 See: dotnet/macios#11436 Co-authored-by: Jonathan Peppers <[email protected]>
lytico
pushed a commit
to lytico/maui
that referenced
this pull request
May 15, 2021
Changes: dotnet/macios@19482a7...4aa8d9a Update dependencies from https://github.com/xamarin/xamarin-macios build 20210509.1 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 11.3.100-ci.main.697 -> To Version 11.3.100-ci.main.733 ~~ Other changes ~~ * Workload manifest packages were renamed See: dotnet/installer#10538 See: dotnet/macios#11436 Co-authored-by: Jonathan Peppers <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context: https://github.com/dotnet/designs/pull/188/files#diff-8fcaa29d8e6f00b34b3cb1830d93f33e75f04424780a66a3c658c7021048e74fR125
Context: dotnet/android#5898
The
$(PackageId)of our workload.nupkgneeds to be:While the
$(PackageVersion)remains the same as before.The layout on disk will change to:
Note that
.Manifestand-6.0.100are not in the folder name on disk.At the same time, let's also update the
versioninWorkloadManifest.jsonso it contains the proper version for ourworkload. This used to not be possible because
versionwas along,but it now is a
stringwhere we can put our version.