Skip to content

[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' - #28858

Merged
v-wuzhai merged 88 commits into
dotnet:release/7.0.2xxfrom
dotnet-maestro-bot:merge/release/7.0.1xx-to-release/7.0.2xx
Nov 3, 2022
Merged

v-wuzhai merged 88 commits into
dotnet:release/7.0.2xxfrom
dotnet-maestro-bot:merge/release/7.0.1xx-to-release/7.0.2xx

Conversation

@dotnet-maestro-bot

Copy link
Copy Markdown
Contributor

I detected changes in the release/7.0.1xx branch which have not been merged yet to release/7.0.2xx. I'm a robot and am configured to help you automatically keep release/7.0.2xx up to date, so I've opened this PR.

This PR merges commits made on release/7.0.1xx by the following committers:

  • marcpopMSFT
  • dotnet-maestro[bot]
  • vseanreesermsft
  • v-wuzhai
  • mmitche
  • dotnet-bot
  • Forgind
  • nagilson

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/7.0.1xx
git pull --ff-only
git checkout release/7.0.2xx
git pull --ff-only
git merge --no-ff release/7.0.1xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/sdk HEAD:merge/release/7.0.1xx-to-release/7.0.2xx
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/7.0.1xx-to-release/7.0.2xx

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/7.0.1xx-to-release/7.0.2xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/7.0.1xx-to-release/7.0.2xx release/7.0.2xx
git pull https://github.com/dotnet-maestro-bot/sdk merge/release/7.0.1xx-to-release/7.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/sdk HEAD:merge/release/7.0.1xx-to-release/7.0.2xx
or if you are using SSH
git checkout -b merge/release/7.0.1xx-to-release/7.0.2xx release/7.0.2xx
git pull git@github.com:dotnet-maestro-bot/sdk merge/release/7.0.1xx-to-release/7.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/7.0.1xx-to-release/7.0.2xx

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

dotnet-bot and others added 30 commits August 26, 2022 11:18
…otnet-windowsdesktop build 20220907.10

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.9 -> To Version 6.0.10
NuGet binary insertion for MSRC servicing, planned for October 2022 Patch Tuesday.

MSRC 73498 - https://greymatter/MSRC/main.aspx?etc=112&id=ce925c1e-7d12-ed11-a867-000d3a6d3364&pagetype=entityrecord

Reference - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/pullrequest/22928
…dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 388a1e54-5d88-4052-3024-08da65ba4584
- **Build**: 20220907.10
- **Date Produced**: September 7, 2022 11:03:14 AM UTC
- **Commit**: 359e99c5711a3db71d621b77d7209514498620a5
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22457.10][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22457.10][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCf40e7ce&targetVersion=GC359e99c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
…otnet-windowsdesktop build 20220913.3

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.10 -> To Version 6.0.10
…dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 388a1e54-5d88-4052-3024-08da65ba4584
- **Build**: 20220913.3
- **Date Produced**: September 14, 2022 1:05:30 AM UTC
- **Commit**: c939db3de33a0c5f8e25bca227864fa08c21892d
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22457.10 to 6.0.10-servicing.22463.3][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22457.10 to 6.0.10-servicing.22463.3][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC359e99c&targetVersion=GCc939db3&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
…otnet-windowsdesktop build 20220914.6

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.10 -> To Version 6.0.10

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.9-servicing.22420.4 -> To Version 6.0.10-servicing.22456.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64
…otnet-windowsdesktop build 20220914.9

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.10 -> To Version 6.0.10

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.9-servicing.22420.4 -> To Version 6.0.10-servicing.22456.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64
…dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Sdk.WindowsDesktop**: from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 388a1e54-5d88-4052-3024-08da65ba4584
- **Build**: 20220914.9
- **Date Produced**: September 14, 2022 9:08:22 PM UTC
- **Commit**: e2b5cfb682bc53fc8f229f5bc403affe0c7bca70
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][3]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22463.3 to 6.0.10-servicing.22464.9][3]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22463.3 to 6.0.10-servicing.22464.9][3]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][4]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCc939db3&targetVersion=GCe2b5cfb&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCa97bb2a&targetVersion=GCee8dec2&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)
dotnet-maestro Bot and others added 24 commits October 21, 2022 19:46
…021.6

dotnet-format
 From Version 7.0.352001 -> To Version 7.0.352106
…79a8-7082-4ae8-bfde-e513c6bf02df

[release/7.0.1xx] Update dependencies from dotnet/razor-compiler
…uild 20221024.2

Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.3.4-beta1.22518.1 -> To Version 3.3.4-beta1.22524.2
…ld 20221025.1 (dotnet#28768)

[release/7.0.1xx] Update dependencies from dotnet/razor-compiler
…027.2

Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler
 From Version 7.0.0-beta.22513.10 -> To Version 7.0.0-beta.22527.2
…027.2

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.4.0-4.22520.11 -> To Version 4.4.0-4.22527.2
…027.6

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.4.0-4.22520.11 -> To Version 4.4.0-6.22527.6
…027.4

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.4.0-6.22527.6 -> To Version 4.4.0-4.22527.4
…028.2

Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler
 From Version 7.0.0-beta.22513.10 -> To Version 7.0.0-beta.22528.2
…uild 20221028.1

Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.3.4-beta1.22518.1 -> To Version 3.3.4-beta1.22528.1
…029.1

dotnet-format
 From Version 7.0.352001 -> To Version 7.0.352901
…029.2

dotnet-format
 From Version 7.0.352001 -> To Version 7.0.352902
…uild 20221028.3

Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.3.4-beta1.22518.1 -> To Version 3.3.4-beta1.22528.3
…uild 20221028.5

Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.3.4-beta1.22518.1 -> To Version 3.3.4-beta1.22528.5
…uild 20221028.6

Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.3.4-beta1.22518.1 -> To Version 3.3.4-beta1.22528.6
…uild 20221031.1

Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.3.4-beta1.22518.1 -> To Version 3.3.4-beta1.22531.1
…uild 20221101.1

Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers
 From Version 3.3.4-beta1.22518.1 -> To Version 3.3.4-beta1.22551.1
…-2022-10-27-0949

Update branding to 7.0.101
…1df3-00d1-43ce-83b1-a43e6c03eaab

[release/7.0.1xx] Update dependencies from dotnet/format
…92a3-0720-4a2c-8eb7-3229d9819c22

[release/7.0.1xx] Update dependencies from dotnet/roslyn-analyzers
…518c-4e39-4e5a-b41e-cdd952681e1e

[release/7.0.1xx] Update dependencies from dotnet/fsharp
…dd1d-0d73-4d3c-9d9a-6c97de7bf865

[release/7.0.1xx] Update dependencies from dotnet/roslyn
@dotnet-maestro-bot
dotnet-maestro-bot force-pushed the merge/release/7.0.1xx-to-release/7.0.2xx branch from ac19f6e to 6096614 Compare November 2, 2022 16:52
@ghost ghost added the Area-Infrastructure label Nov 2, 2022
@v-wuzhai
v-wuzhai force-pushed the merge/release/7.0.1xx-to-release/7.0.2xx branch from ed3736f to 407781c Compare November 3, 2022 05:42
@v-wuzhai
v-wuzhai merged commit d106252 into dotnet:release/7.0.2xx Nov 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants