Add windows runtime packs as a workload #68981
Merged
Conversation
This file contains 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
At certain points in time internally, the sdk will rev its version and insert into VS. It's at this point the sdk version will be ahead of the runtime version as we have not published anything into nuget. In MAUI and WinUI scenarios, this creates a bit of a pickle as the sdk will try to download a new version of the windows runtime pack, but it will not be available. To get around this limitation, we are introducing a workload that will be inserted into VS where you can optionally install Windows runtime packs.
steveisok
requested review from
lewing,
jonathanpeppers,
marcpopMSFT,
dsplaisted and
eerhardt
src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
Outdated
Show resolved
Hide resolved
steveisok
force-pushed
the
add-win-manifest
branch
from
df80cd7
to
7e46731
Compare
|
Successful official build that contains the windows workload https://dev.azure.com/dnceng/internal/_build/results?buildId=1767472&view=results |
src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
Outdated
Show resolved
Hide resolved
lewing
approved these changes
May 12, 2022
|
/backport to release/6.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/2322894585 |
|
@steveisok backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Add windows runtime packs as a workload
Applying: Include all windows packs in workload
Applying: Fix names
Applying: Add windows as a component resource
Applying: Add runtime pack artifacts to be copied
Using index info to reconstruct a base tree...
M eng/pipelines/mono/templates/workloads-build.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/mono/templates/workloads-build.yml
CONFLICT (content): Merge conflict in eng/pipelines/mono/templates/workloads-build.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 Add runtime pack artifacts to be copied
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
steveisok
pushed a commit
to steveisok/runtime
that referenced
this pull request
May 16, 2022
Backport of dotnet#68981 At certain points in time internally, the sdk will rev its version and insert into VS. It's at this point the sdk version will be ahead of the runtime version as we have not published anything into nuget. In MAUI and WinUI scenarios, this creates a bit of a pickle as the sdk will try to download a new version of the windows runtime pack, but it will not be available. To get around this limitation, we are introducing a workload that will be inserted into VS where you can optionally install Windows runtime packs.
carlossanlop
pushed a commit
that referenced
this pull request
May 16, 2022
Backport of #68981 At certain points in time internally, the sdk will rev its version and insert into VS. It's at this point the sdk version will be ahead of the runtime version as we have not published anything into nuget. In MAUI and WinUI scenarios, this creates a bit of a pickle as the sdk will try to download a new version of the windows runtime pack, but it will not be available. To get around this limitation, we are introducing a workload that will be inserted into VS where you can optionally install Windows runtime packs. Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
At certain points in time internally, the sdk will rev its version and insert into VS. It's at this point the sdk version will be ahead of the runtime version as we have not published anything into nuget. In MAUI and WinUI scenarios, this creates a bit of a pickle as the sdk will try to download a new version of the windows runtime pack, but it will not be available.
To get around this limitation, we are introducing a workload that will be inserted into VS where you can optionally install Windows runtime packs.