Skip to content

Fix build.psm1 to find the required .NET SDK version when a higher version is installed#17299

Merged
daxian-dbw merged 2 commits intoPowerShell:masterfrom
daxian-dbw:dotnet
May 11, 2022
Merged

Fix build.psm1 to find the required .NET SDK version when a higher version is installed#17299
daxian-dbw merged 2 commits intoPowerShell:masterfrom
daxian-dbw:dotnet

Conversation

@daxian-dbw
Copy link
Copy Markdown
Member

@daxian-dbw daxian-dbw commented May 10, 2022 •
edited
Loading

PR Summary

Fix build.psm1 to find the required .NET SDK version when a higher version is installed.
Supersede #17203

PR Checklist

@ghost ghost assigned TravisEz13 May 10, 2022
@pull-request-quantifier-deprecated
Copy link
Copy Markdown

pull-request-quantifier-deprecated bot commented May 10, 2022

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

Quantification details 

Label      : Extra Small
Size       : +16 -10
Percentile : 10.4%

Total files changed: 1

Change summary by file extension:
.psm1 : +16 -10

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 detetcted.
  • 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.

@daxian-dbw daxian-dbw mentioned this pull request May 10, 2022
Closed
22 tasks
@daxian-dbw daxian-dbw assigned daxian-dbw and unassigned TravisEz13 May 11, 2022
@daxian-dbw daxian-dbw added the CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log label May 11, 2022
@daxian-dbw daxian-dbw merged commit 514d6f6 into PowerShell:master May 11, 2022
@daxian-dbw daxian-dbw deleted the dotnet branch May 11, 2022 16:49
@ghost
Copy link
Copy Markdown

ghost commented May 23, 2022

🎉v7.3.0-preview.4 has been released which incorporates this pull request.:tada:

Handy links:

@TravisEz13
Copy link
Copy Markdown
Member

TravisEz13 commented Oct 13, 2022

/backport to release/v7.2.7

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Oct 13, 2022

@TravisEz13 backporting to release/v7.2.7 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Update build.psm1 to handle scenario where newer SDK is installed
Using index info to reconstruct a base tree...
M	build.psm1
Falling back to patching base and 3-way merge...
Auto-merging build.psm1
CONFLICT (content): Merge conflict in 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 Update build.psm1 to handle scenario where newer SDK is installed
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 pushed a commit to TravisEz13/PowerShell that referenced this pull request Oct 13, 2022
@daxian-dbw @TravisEz13
Fix build.psm1 to find the required .NET SDK version when a higher …
edfa024 
…version is installed (PowerShell#17299)
@TravisEz13 TravisEz13 mentioned this pull request Oct 13, 2022
Merged
TravisEz13 added a commit that referenced this pull request Oct 13, 2022
@TravisEz13 @daxian-dbw
[release/v7.2.7] Fix build.psm1 to find the required .NET SDK versi…
e9bada7 
…on when a higher version is installed (#17299) (#18282)

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
@ghost
Copy link
Copy Markdown

ghost commented Oct 20, 2022

🎉v7.2.7 has been released which incorporates this pull request.:tada:

Handy links:

@TravisEz13 TravisEz13 mentioned this pull request Apr 16, 2024
Closed
@TravisEz13 TravisEz13 mentioned this pull request Jul 9, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iSazonov iSazonov iSazonov approved these changes

@TravisEz13 TravisEz13 Awaiting requested review from TravisEz13

@adityapatwardhan adityapatwardhan Awaiting requested review from adityapatwardhan

@anmenaga anmenaga Awaiting requested review from anmenaga

+1 more reviewer

@PaulHigin PaulHigin PaulHigin approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@daxian-dbw daxian-dbw

Labels

Backport-7.2.x-Done CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log Extra Small

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@daxian-dbw @TravisEz13 @PaulHigin @iSazonov @adityapatwardhan