Skip to content

Bump to use internal .NET 7 GA build#18508

Merged
adityapatwardhan merged 4 commits intoPowerShell:masterfrom
TravisEz13:73ga-port-5
Nov 9, 2022
Merged

Bump to use internal .NET 7 GA build#18508
adityapatwardhan merged 4 commits intoPowerShell:masterfrom
TravisEz13:73ga-port-5

Conversation

@TravisEz13
Copy link
Copy Markdown
Member

@TravisEz13 TravisEz13 commented Nov 9, 2022

PR Summary

Bump to use internal .NET 7 GA build

PR Context

PR Checklist

@pull-request-quantifier-deprecated
Copy link
Copy Markdown

This PR has 141 quantified lines of changes. In general, a change size of upto 200 lines is ideal for the best PR experience!


Quantification details

Label      : Medium
Size       : +105 -36
Percentile : 48.2%

Total files changed: 25

Change summary by file extension:
.yml : +63 -3
.json : +4 -4
.wxs : +4 -4
.psm1 : +5 -3
.csproj : +29 -22

Change counts above are quantified counts, based on the PullRequestQuantifier customizations.

Why proper sizing of changes matters

Optimal pull request sizes drive a better predictable PR flow as they strike a
balance between between PR complexity and PR review overhead. PRs within the
optimal size (typical small, or medium sized PRs) mean:

  • Fast and predictable releases to production:
    • Optimal size changes are more likely to be reviewed faster with fewer
      iterations.
    • Similarity in low PR complexity drives similar review times.
  • Review quality is likely higher as complexity is lower:
    • Bugs are more likely to be detected.
    • Code inconsistencies are more likely to be detected.
  • Knowledge sharing is improved within the participants:
    • Small portions can be assimilated better.
  • Better engineering practices are exercised:
    • Solving big problems by dividing them in well contained, smaller problems.
    • Exercising separation of concerns within the code changes.

What can I do to optimize my changes

  • Use the PullRequestQuantifier to quantify your PR accurately
    • Create a context profile for your repo using the context generator
    • Exclude files that are not necessary to be reviewed or do not increase the review complexity. Example: Autogenerated code, docs, project IDE setting files, binaries, etc. Check out the Excluded section from your prquantifier.yaml context profile.
    • Understand your typical change complexity, drive towards the desired complexity by adjusting the label mapping in your prquantifier.yaml context profile.
    • Only use the labels that matter to you, see context specification to customize your prquantifier.yaml context profile.
  • Change your engineering behaviors
    • For PRs that fall outside of the desired spectrum, review the details and check if:
      • Your PR could be split in smaller, self-contained PRs instead
      • Your PR only solves one particular issue. (For example, don't refactor and code new features in the same PR).

How to interpret the change counts in git diff output

  • One line was added: +1 -0
  • One line was deleted: +0 -1
  • One line was modified: +1 -1 (git diff doesn't know about modified, it will
    interpret that line like one addition plus one deletion)
  • Change percentiles: Change characteristics (addition, deletion, modification)
    of this PR in relation to all other PRs within the repository.


Was this comment helpful? 👍  :ok_hand:  :thumbsdown: (Email)
Customize PullRequestQuantifier for this repository.

@adityapatwardhan adityapatwardhan enabled auto-merge (squash) November 9, 2022 22:39
@adityapatwardhan adityapatwardhan merged commit 665bf21 into PowerShell:master Nov 9, 2022
@TravisEz13
Copy link
Copy Markdown
Member Author

/backport to release/v7.3.1

@github-actions
Copy link
Copy Markdown
Contributor

@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 128

Please backport manually!

TravisEz13 added a commit that referenced this pull request Nov 21, 2022
TravisEz13 added a commit that referenced this pull request Nov 21, 2022
@adityapatwardhan adityapatwardhan added the CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log label Dec 20, 2022
@ghost
Copy link
Copy Markdown

ghost commented Dec 20, 2022

🎉v7.4.0-preview.1 has been released which incorporates this pull request.:tada:

Handy links:

demonnot referenced this pull request Jan 6, 2023
Add generated changelog for 7.3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log Medium

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants