Bump to use internal .NET 7 GA build#18508
Bump to use internal .NET 7 GA build#18508adityapatwardhan merged 4 commits intoPowerShell:masterfrom
Conversation
# Conflicts: # assets/wix/files.wxs
|
This PR has Quantification details
Why proper sizing of changes matters
Optimal pull request sizes drive a better predictable PR flow as they strike a
What can I do to optimize my changes
How to interpret the change counts in git diff output
Was this comment helpful? 👍 :ok_hand: :thumbsdown: (Email) |
|
/backport to release/v7.3.1 |
|
@TravisEz13 backporting to release/v7.3.1 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Merged PR 23096: Bump to use internal .NET 7 GA build
Using index info to reconstruct a base tree...
M DotnetRuntimeMetadata.json
M build.psm1
M global.json
M src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
M src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
M src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
M src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
M src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
M src/System.Management.Automation/System.Management.Automation.csproj
M test/tools/TestService/TestService.csproj
M test/tools/WebListener/WebListener.csproj
M tools/releaseBuild/azureDevOps/templates/compliance/apiscan.yml
M tools/releaseBuild/azureDevOps/templates/linux-authenticode-sign.yml
M tools/releaseBuild/azureDevOps/templates/linux-packaging.yml
M tools/releaseBuild/azureDevOps/templates/linux.yml
M tools/releaseBuild/azureDevOps/templates/mac-package-build.yml
M tools/releaseBuild/azureDevOps/templates/mac.yml
M tools/releaseBuild/azureDevOps/templates/nuget.yml
M tools/releaseBuild/azureDevOps/templates/release-GlobalToolTest.yml
M tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
M tools/releaseBuild/azureDevOps/templates/testartifacts.yml
M tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
M tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
Falling back to patching base and 3-way merge...
Auto-merging tools/releaseBuild/azureDevOps/templates/testartifacts.yml
Auto-merging src/System.Management.Automation/System.Management.Automation.csproj
Auto-merging src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
CONFLICT (content): Merge conflict in src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
Auto-merging build.psm1
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Merged PR 23096: Bump to use internal .NET 7 GA build
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! |
|
🎉 Handy links: |
PR Summary
Bump to use internal .NET 7 GA build
PR Context
PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright headerWIP:or[ WIP ]to the beginning of the title (theWIPbot will keep its status check atPendingwhile the prefix is present) and remove the prefix when the PR is ready.(which runs in a different PS Host).