Build VS installers for WebAssembly and Mobile workloads #55769
Conversation
This reverts commit 3d7307c. # Conflicts: # eng/pipelines/mono/templates/workloads-build.yml
|
I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label. |
|
Current versioning story is, on an Official Build, the directory the JSON gets shoved in looks official-ish (6.0.21.27502 from my usual example OfficialBuildId of 20210525.2). Inspecting an MSI with Orca has a ProductVersion of 6.0.0 and a PackageVersion of 6.0.0-preview.7.21365.21. |
That's good for pack installers. We should check the generated VS authoring next. |
|
Latest private build, with version numbered artifacts to check, is https://dev.azure.com/dnceng/internal/_build/results?buildId=1248191&view=results wixpack.zip are in the |
directhex
changed the title
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <ManifestTeamProject Condition="'$(ManifestTeamProject)' == ''">dotnet</ManifestTeamProject> |
There was a problem hiding this comment.
I think we should add a couple of props here to control the name of the top level .vsman file that is generated, something like:
<TargetName>Microsoft.NET.Workload.Runtime</TargetName>
<ManifestName>$(TargetName)</ManifestName>There was a problem hiding this comment.
The vsman file rename will work as well, feel free to mark this as resolved.
| @@ -109,7 +109,8 @@ | |||
| <SubsetName Include="Mono.Packages" Description="The projects that produce NuGet packages for the Mono runtime." /> | |||
| <SubsetName Include="Mono.WasmRuntime" Description="The WebAssembly runtime." /> | |||
| <SubsetName Include="Mono.MsCorDbi" Description="The implementation of ICorDebug interface." /> | |||
|
|
|||
| <SubsetName Include="Mono.Workloads" OnDemand="true" Description="Builds the installers and the insertion metadata for Blazor workloads." /> | |||
There was a problem hiding this comment.
Description needs updated in a follow up.
|
/backport to release/6.0-preview7 |
|
Started backporting to release/6.0-preview7: https://github.com/dotnet/runtime/actions/runs/1054608563 |
|
@steveisok backporting to release/6.0-preview7 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Adding workloads subset
.git/rebase-apply/patch:52: trailing whitespace.
.git/rebase-apply/patch:61: trailing whitespace.
.git/rebase-apply/patch:69: trailing whitespace.
.git/rebase-apply/patch:83: trailing whitespace.
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M Directory.Build.props
M eng/Subsets.props
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/Subsets.props
Auto-merging Directory.Build.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Adding workloads subset
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! |
In order to support generating installers, this change adds the mono.workloads subset and the associated yml.
ghost
locked as resolved and limited conversation to collaborators
This is a continuation of work by @bekir-ozturk in https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/pullrequest/16294
Last private run (since it touches runtime-official.yml) at https://dev.azure.com/dnceng/internal/_build/results?buildId=1240576&view=results - it's still failing in Icon.png, which is supposed to be fixed by dotnet/arcade#7614 but I'm having issues getting the correct version picked up locally whilst the wholesale update from maestro is still up in the air. Will keep iterating on it, but wanted to open up to wider review.