Generate VS.Redist package for ANCM #39140
Merged
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
ghost
added
the
area-infrastructure
wtgodbe
commented
Dec 21, 2021
joeloff
reviewed
Dec 21, 2021
src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2Package.nuspec
Show resolved
Hide resolved
joeloff
approved these changes
Dec 21, 2021
Contributor
|
@wtgodbe do you plan to continue this work ? Is this PR blocked on anything? |
Member
Author
|
Yes, just haven't gotten around to doing the VS side of this yet |
Member
Author
|
Updated build w/ IISExpress package: https://dev.azure.com/dnceng/internal/_build/results?buildId=2005366&view=results |
dougbu
suggested changes
Sep 27, 2022
src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
Outdated
Show resolved
Hide resolved
src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
Outdated
Show resolved
Hide resolved
src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
Outdated
Show resolved
Hide resolved
src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
Outdated
Show resolved
Hide resolved
dougbu
approved these changes
Oct 4, 2022
Member
Author
|
/backport to release/7.0 |
Member
Author
|
/backport to release/6.0 |
Contributor
|
Started backporting to release/7.0: https://github.com/dotnet/aspnetcore/actions/runs/3185906881 |
Contributor
|
Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/3185907375 |
Contributor
|
@wtgodbe backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Generate VS.Redist package for ANCM
Applying: Fixup
Applying: Add package for IISExpress
Using index info to reconstruct a base tree...
M src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
Falling back to patching base and 3-way merge...
Auto-merging src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
CONFLICT (content): Merge conflict in src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Add package for IISExpress
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! |
11 tasks
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.
Resolves our half of #36513 - still need to figure out the changes to VS in order to consume this. Also still need to decide what to do about servicing branches - we technically only have "one" version of ANCM across branches, so we should decide if we want to backport this everywhere and have all branches insert their own ANCM into their respective VS branches, or just insert from the highest active servicing branch (except in cases of MSRCs in ANCM). I'm leaning towards the former, but am open to persuasion.
Test build: https://dev.azure.com/dnceng/internal/_build/results?buildId=1522957&view=results Produced
VS.Redist.Common.AspNetCore.AspNetCoreModuleV2.7.0.7.0.0-alpha.1.21621.3.nupkgwhich contains the .msi