[release/10.0.1xx] Fix aspnetcoremodule signing for installers#2540
Merged
mmitche merged 6 commits intorelease/10.0.1xxfrom Sep 24, 2025
Merged
[release/10.0.1xx] Fix aspnetcoremodule signing for installers#2540mmitche merged 6 commits intorelease/10.0.1xxfrom
mmitche merged 6 commits intorelease/10.0.1xxfrom
Conversation
mmitche
reviewed
Sep 22, 2025
src/aspnetcore/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
Outdated
Show resolved
Hide resolved
mmitche
approved these changes
Sep 22, 2025
Member
|
/backport to release/10.0.1xx-rc2 |
Contributor
|
Started backporting to release/10.0.1xx-rc2: https://github.com/dotnet/dotnet/actions/runs/17949242908 |
Member
|
@wtgodbe The test run above didn't have dry-run signing enabled. I'm running another with that enabled, unless you're pretty confident that it will fix the issue. |
…pport' into wtgodbe/FixItUp
NikolaMilosavljevic
approved these changes
Sep 23, 2025
Member
|
I'll watch the build and merge later if it looks good. |
Member
|
/backport to release/10.0.1xx-rc2 |
Contributor
|
Started backporting to release/10.0.1xx-rc2: https://github.com/dotnet/dotnet/actions/runs/17979941232 |
Contributor
|
@mmitche backporting to "release/10.0.1xx-rc2" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix aspnetcoremodule signing for installers
Using index info to reconstruct a base tree...
M src/aspnetcore/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
M src/aspnetcore/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
Falling back to patching base and 3-way merge...
Auto-merging src/aspnetcore/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
CONFLICT (content): Merge conflict in src/aspnetcore/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix aspnetcoremodule signing for installers
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
mmitche
added a commit
to mmitche/dotnet
that referenced
this pull request
Sep 24, 2025
…t#2540) Co-authored-by: Matt Mitchell <[email protected]> Co-authored-by: Nikola Milosavljevic <[email protected]>
mmitche
added a commit
that referenced
this pull request
Sep 24, 2025
…2589) Co-authored-by: William Godbe <[email protected]> Co-authored-by: Nikola Milosavljevic <[email protected]>
Member
|
/backport to main |
Contributor
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Don't rename the ANCM .msi's