Skip to content

Bump to .NET 7 to version 7.0.100-rc.2.22477.20#18286

Merged
adityapatwardhan merged 1 commit intoPowerShell:masterfrom
adityapatwardhan:updateNET7rc2
Oct 18, 2022
Merged

Bump to .NET 7 to version 7.0.100-rc.2.22477.20#18286
adityapatwardhan merged 1 commit intoPowerShell:masterfrom
adityapatwardhan:updateNET7rc2

Conversation

@adityapatwardhan
Copy link
Copy Markdown
Member

@adityapatwardhan adityapatwardhan commented Oct 13, 2022 •
edited
Loading

PR Summary

Update .NET 7 to version RC2 and update related packages

PR Context

PR Checklist

@ghost ghost assigned PaulHigin Oct 13, 2022
@daxian-dbw daxian-dbw mentioned this pull request Oct 18, 2022
Merged
13 tasks
@pull-request-quantifier-deprecated
Copy link
Copy Markdown

pull-request-quantifier-deprecated bot commented Oct 18, 2022

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

Quantification details 

Label      : Small
Size       : +29 -41
Percentile : 28%

Total files changed: 11

Change summary by file extension:
.json : +5 -5
.wxs : +4 -16
.csproj : +20 -20

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.

daxian-dbw
daxian-dbw approved these changes Oct 18, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@daxian-dbw daxian-dbw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@adityapatwardhan adityapatwardhan merged commit 028eeb0 into PowerShell:master Oct 18, 2022
@adityapatwardhan adityapatwardhan deleted the updateNET7rc2 branch October 18, 2022 23:49
@adityapatwardhan
Copy link
Copy Markdown
Member Author

adityapatwardhan commented Oct 18, 2022

/backport to release/v7.3.0-rc.1

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Oct 18, 2022

@adityapatwardhan backporting to release/v7.3.0-rc.1 failed, the patch most likely resulted in conflicts:

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

Applying: Bump to .NET 7 to version 7.0.100-rc.2.22477.20
Using index info to reconstruct a base tree...
M	assets/wix/files.wxs
M	src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
M	src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
M	src/System.Management.Automation/System.Management.Automation.csproj
M	test/tools/TestService/TestService.csproj
Falling back to patching base and 3-way merge...
Auto-merging test/tools/TestService/TestService.csproj
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 src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
CONFLICT (content): Merge conflict in src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
Auto-merging assets/wix/files.wxs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump to .NET 7 to version 7.0.100-rc.2.22477.20
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!

@iSazonov
Copy link
Copy Markdown
Collaborator

iSazonov commented Oct 19, 2022 •
edited by unfurl-links bot
Loading

I see:

Start-PSBuild -Clean
Cleaning your working directory. You can also do it with 'git clean -fdX --exclude .vs/PowerShell/v16/Server/sqlite3'
WARNING: The 'dotnet' in the current path can't find SDK version 7.0.100-rc.2.22477.20, prepending C:\Users\1\AppData\Local\Microsoft\dotnet to PATH.
WARNING: The currently installed .NET Command Line Tools is not the required version.

Installed version: 7.0.100-rc.2.22477.23
Required version: 7.0.100-rc.2.22477.20

Version 7.0.100-rc.2.22477.23 is official from https://dotnet.microsoft.com/en-us/download/dotnet/7.0

Microsoft
.NET 7.0 downloads for Linux, macOS, and Windows. .NET is a free, cross-platform, open-source developer platform for building many different types of applications.

@adityapatwardhan adityapatwardhan mentioned this pull request Oct 25, 2022
Merged
22 tasks
github-actions bot pushed a commit to adityapatwardhan/PowerShell that referenced this pull request Oct 25, 2022
@adityapatwardhan
Bump to .NET 7 to version 7.0.100-rc.2.22477.20 (PowerShell#18286)
e28c940
adityapatwardhan added a commit that referenced this pull request Oct 25, 2022
@adityapatwardhan
Bump to .NET 7 to version 7.0.100-rc.2.22477.20 (#18286) (#18378)
63281ec
@ghost
Copy link
Copy Markdown

ghost commented Oct 26, 2022

🎉v7.3.0-rc.1 has been released which incorporates this pull request.:tada:

Handy links:

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@daxian-dbw daxian-dbw daxian-dbw approved these changes

@TravisEz13 TravisEz13 Awaiting requested review from TravisEz13

@anmenaga anmenaga Awaiting requested review from anmenaga

@PaulHigin PaulHigin Awaiting requested review from PaulHigin

Assignees

@PaulHigin PaulHigin

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@adityapatwardhan @iSazonov @daxian-dbw @PaulHigin