Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[automated] Merge branch 'release/7.0.1xx' => 'main' #14422

Merged
merged 37 commits into from
Sep 1, 2022
Merged

[automated] Merge branch 'release/7.0.1xx' => 'main' #14422

merged 37 commits into from
Sep 1, 2022

Conversation

dotnet-maestro-bot
Copy link

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

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

  • MichaelSimons
  • v-wuzhai
  • dotnet-maestro[bot]
  • MattGal
  • NikolaMilosavljevic
  • lbussell
  • crummel
  • marcpopMSFT

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 main
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/core-sdk HEAD:merge/release/7.0.1xx-to-main
or if you are using SSH 
git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/7.0.1xx-to-main

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-main'. 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-main main
git pull https://github.com/dotnet-maestro-bot/core-sdk merge/release/7.0.1xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/core-sdk HEAD:merge/release/7.0.1xx-to-main
or if you are using SSH 
git checkout -b merge/release/7.0.1xx-to-main main
git pull git@github.com:dotnet-maestro-bot/core-sdk merge/release/7.0.1xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/core-sdk HEAD:merge/release/7.0.1xx-to-main

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-maestro bot and others added 30 commits August 15, 2022 13:27
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
ab13fb5 
…812.2 (dotnet#14326)

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22412.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/source-build-refer…
8c233f6 
…ence-packages build 20220819.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22413.1 -> To Version 6.0.0-servicing.22419.1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
6313657 
…818.4 (dotnet#14354)

[release/7.0.1xx] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.2.0-beta-22410-01 to 1.2.0-beta-22416-01 (parent: Microsoft.DotNet.Arcade.Sdk)
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.22409.1 to 1.0.0-beta.22415.3 (parent: Microsoft.DotNet.Arcade.Sdk)
@marcpopMSFT
Merge pull request dotnet#14350 from dotnet/darc-release/6.0.4xx-b793…
b989289 
…b112-4ffc-459d-a5c0-7b2c11657a62

[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
@dotnet-maestro
Update dependencies from https://github.com/dotnet/source-build-refer…
44bbcef 
…ence-packages build 20220819.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22419.1 -> To Version 6.0.0-servicing.22419.2
@MichaelSimons
Enable BlazorWasm source-build test (dotnet#14346)
475a85f
@crummel
Add llvm-project to source-build. (dotnet#14184) (dotnet#14314)
84d26a0 
* Add llvm-project to source-build.

* Add repo references to llvm-project.

* Add source-build metadata.

* Upgrade CI to CentOS Stream 8.

* Fix the image name in the right place.

* Patch llvm to use an MS.Build.Traversal that we have.

* Add backport PR to patch.

* Revert "Upgrade CI to CentOS Stream 8."

This reverts commit 6bc2754.

* Update to avoid new MSBuild warning that causes build failure.

* We use code out of the LLVM directory.  Copy the license file from there to the root to satisfy the license checker.

* Add SourceBuild.props to llvm.

* Update patches with backport PR pointers.
@v-wuzhai
Merge pull request dotnet#14358 from dotnet/darc-release/6.0.4xx-a4d9…
139aa59 
…6a8d-92b6-4469-a94a-65c27bcf3263

[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
@v-wuzhai
Merge branch 'release/6.0.4xx' into release/7.0.1xx
a0e31c9
@v-wuzhai
Merge pull request dotnet#14356 from dotnet-maestro-bot/merge/release…
b3b7f58 
…/6.0.4xx-to-release/7.0.1xx

[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx'
@crummel
Update poison baseline. (dotnet#14345)
58d9018 
* Update poison baseline.

* Fix RIDs by replacing with placeholders.

* Exclude a few more non-binary file types from poison checking.

* Ignore empty files when checking for poison.

* Update baseline with new exclusions.

* Poison report can have both portable and non-portable RIDs in it, remove both.
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20220823…
14391da 
….8 (dotnet#14371)

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22416.39 -> To Version 7.0.100-rc.2.22423.8

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-rc.1.22379.3 -> To Version 7.0.0-rc.2.22422.9 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20220823.25
25b7bfe 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.13 -> To Version 7.0.100-rc.2.22423.25

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.0-rc.2.22422.9 -> To Version 7.0.0-rc.2.22423.4 (parent: Microsoft.NET.Sdk
@v-wuzhai
Merge pull request dotnet#14380 from dotnet/darc-release/7.0.1xx-35ee…
0cfaa23 
…f4e6-8295-4042-b38e-f8d421393b46

[release/7.0.1xx] Update dependencies from dotnet/sdk
@dotnet-maestro
Dependency coherency updates (dotnet#14365)
d46d4e7 
runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter
 From Version 1.0.0-alpha.1.22364.1 -> To Version 1.0.0-alpha.1.22364.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Dependency coherency updates
a8bdb19 
runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64
@lbussell @crummel
Update source-build build images (dotnet#14321)
9802532 
* Fix aspnetcore offline build when nodejs is installed

* Remove centos7 and 8, replace with stream 8

* Change Fedora 33 container to Fedora 36

* Revert "Change Fedora 33 container to Fedora 36"

* Remove unused debian container definition

* Add extra packages needed for bootstrapping arm64

* Use PackageDownloads for bootstrapping PSB artifacts and update prebuilts version

Co-authored-by: Chris Rummel <crummel@microsoft.com>
@MichaelSimons
Prevent System.Memory package downgrade in razor-compiler (dotnet#14384…
332e1bc 
…) (dotnet#14391)

* Revert "Add razor-compiler patch to fix bootstrap build (dotnet#14379)"

This reverts commit 1ebb3eb.

* Add razor-compiler patch to prevent System.Memory downgrades

* Add roslyn patch to lift System.Memory version
@MattGal
Use -svc pool provider in release branches
37e97fa
@dotnet-maestro @MichaelSimons
[release/7.0.1xx] Update dependencies from dotnet/sdk (dotnet#14381)
f19ccb9 
* Update dependencies from https://github.com/dotnet/sdk build 20220823.30

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.25 -> To Version 7.0.100-rc.2.22423.30

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

* Update dependencies from https://github.com/dotnet/sdk build 20220823.32

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.25 -> To Version 7.0.100-rc.2.22423.32

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

* Update dependencies from https://github.com/dotnet/sdk build 20220824.4

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.25 -> To Version 7.0.100-rc.2.22424.4

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

* Update dependencies from https://github.com/dotnet/sdk build 20220824.9

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.25 -> To Version 7.0.100-rc.2.22424.9

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

* Update dependencies from https://github.com/dotnet/sdk build 20220824.14

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22423.25 -> To Version 7.0.100-rc.2.22424.14

Dependency coherency updates

runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset
 From Version 1.0.0-alpha.1.22411.1 -> To Version 1.0.0-alpha.1.22411.1 (parent: Microsoft.NETCore.App.Runtime.win-x64

* Resolve llvm source-build patch conflict

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
@v-wuzhai
Merge pull request dotnet#14386 from dotnet/darc-release/7.0.1xx-0936…
c2b46c5 
…acfc-4075-458f-9b9f-7f0db35080ca

[release/7.0.1xx] Update dependencies to ensure coherency
@NikolaMilosavljevic
Remove XDT dependency and patch (dotnet#14395)
e9dbc0c
@dotnet-maestro
[release/7.0.1xx] Update dependencies from dotnet/sdk (dotnet#14396)
6b26938 
[release/7.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-rc.2.22423.4 to 7.0.0-rc.2.22424.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rc.2.22423.4 to 7.0.0-rc.2.22424.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rc.2.22423.4 to 7.0.0-rc.2.22424.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-rc.2.22423.16 to 7.0.0-rc.2.22424.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rc.2.22423.4 to 7.0.0-rc.2.22424.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rc.2.22423.3 to 7.0.0-rc.2.22424.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rc.2.22423.4 to 7.0.0-rc.2.22424.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rc.2.22423.2 to 7.0.0-rc.2.22424.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.4.0-2.22423.18 to 4.4.0-2.22424.9 (parent: Microsoft.NET.Sdk)
@dotnet-maestro
Update dependencies from https://github.com/dotnet/source-build-exter…
5982b2b 
…nals build 20220824.1 (dotnet#14401)

[release/7.0.1xx] Update dependencies from dotnet/source-build-externals
@MichaelSimons
Update Versions.Details.xml source-build metadata (dotnet#14375)
f3c61d6
@dotnet-maestro
Update dependencies from https://github.com/dotnet/test-templates bui…
5b65760 
…ld 20220825.1 (dotnet#14400)

Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.0.2-beta4.22409.1 -> To Version 1.0.2-beta4.22425.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@MattGal
Merge pull request dotnet#14392 from MattGal/release/7.0.1xx
def895c 
Use -svc pool provider in release 7.0.1xx branches
@MichaelSimons
Update source-build-externals (dotnet#14405)
afd52f5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/source-build-exter…
2d1a4de 
…nals build 20220825.2 (dotnet#14408)

[release/7.0.1xx] Update dependencies from dotnet/source-build-externals
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20220826.5
6041c17 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22425.6 -> To Version 7.0.100-rc.2.22426.5
dotnet-maestro bot and others added 6 commits August 27, 2022 06:51
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20220826.23
d92f280 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22426.5 -> To Version 7.0.100-rc.2.22426.23
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20220826.27
8570a0c 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22426.23 -> To Version 7.0.100-rc.2.22426.27
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20220826.31
6b80eae 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rc.2.22426.27 -> To Version 7.0.100-rc.2.22426.31
@dotnet-maestro
Dependency coherency updates
cab6af8 
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-rc.2.22424.8 -> To Version 7.0.0-rc.2.22426.1 (parent: Microsoft.NET.Sdk
@v-wuzhai
Merge pull request dotnet#14410 from dotnet/darc-release/7.0.1xx-9659…
2e3ca4e 
…13a2-7c2c-4615-8800-a5ebd512e371

[release/7.0.1xx] Update dependencies from dotnet/sdk
@MichaelSimons
Move RemoveVersions logic of SdkContentTests to before the file diff (d…
dcf24f7 
…otnet#14420)
@dotnet-maestro-bot dotnet-maestro-bot requested a review from a team as a code owner August 31, 2022 17:59
@marcpopMSFT marcpopMSFT merged commit ada4488 into dotnet:main Sep 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcpopMSFT marcpopMSFT marcpopMSFT approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@dotnet-maestro-bot @marcpopMSFT @MichaelSimons @crummel @v-wuzhai @lbussell @MattGal @NikolaMilosavljevic