[automated] Merge branch 'release/7.0.1xx' => 'main' by dotnet-maestro-bot · Pull Request #14394 · dotnet/installer

dotnet-maestro-bot · 2022-08-25T00:16:25Z

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
lbussell
dotnet-maestro[bot]
v-wuzhai
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.

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.

…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>

…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

…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)

…b112-4ffc-459d-a5c0-7b2c11657a62 [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages

…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

* 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.

…6a8d-92b6-4469-a94a-65c27bcf3263 [release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages

…/6.0.4xx-to-release/7.0.1xx [automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx'

* 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.

….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>

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

…f4e6-8295-4042-b38e-f8d421393b46 [release/7.0.1xx] Update dependencies from dotnet/sdk

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>

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

* 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>

…) (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

* 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

Submit the change request to prevent automatic merging

…acfc-4075-458f-9b9f-7f0db35080ca [release/7.0.1xx] Update dependencies to ensure coherency

[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)

…nals build 20220824.1 (dotnet#14401) [release/7.0.1xx] Update dependencies from dotnet/source-build-externals

…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>

Use -svc pool provider in release 7.0.1xx branches

v-wuzhai · 2022-08-25T05:43:42Z

eng/Version.Details.xml

      <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22418.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22415.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">


@crummel Are these downgrades expected?

This has now been updated to 1.0.0-beta.22420.1

dotnet-maestro bot and others added 19 commits August 15, 2022 13:27

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

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

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

Enable BlazorWasm source-build test (dotnet#14346)

475a85f

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

Merge branch 'release/6.0.4xx' into release/7.0.1xx

a0e31c9

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'

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

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

Use -svc pool provider in release branches

37e97fa

dotnet-maestro-bot requested a review from a team as a code owner August 25, 2022 00:16

dotnet-maestro-bot force-pushed the merge/release/7.0.1xx-to-main branch from 6864f83 to 332e1bc Compare August 25, 2022 00:16

crummel approved these changes Aug 25, 2022

View reviewed changes

v-wuzhai suggested changes Aug 25, 2022

View reviewed changes

v-wuzhai and others added 3 commits August 24, 2022 22:54

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

Remove XDT dependency and patch (dotnet#14395)

e9dbc0c

MichaelSimons approved these changes Aug 25, 2022

View reviewed changes

dotnet-maestro bot and others added 2 commits August 25, 2022 14:02

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

Update Versions.Details.xml source-build metadata (dotnet#14375)

f3c61d6

dotnet-maestro bot and others added 3 commits August 25, 2022 09:55

Merge pull request dotnet#14392 from MattGal/release/7.0.1xx

def895c

Use -svc pool provider in release 7.0.1xx branches

Update source-build-externals (dotnet#14405)

afd52f5

v-wuzhai force-pushed the merge/release/7.0.1xx-to-main branch from 3089342 to 826f850 Compare August 26, 2022 07:10

Merge branch 'release/7.0.1xx'

b31a8ba

v-wuzhai force-pushed the merge/release/7.0.1xx-to-main branch from 826f850 to b31a8ba Compare August 26, 2022 08:17

v-wuzhai approved these changes Aug 26, 2022

View reviewed changes

MichaelSimons merged commit 91953ec into dotnet:main Aug 26, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

[automated] Merge branch 'release/7.0.1xx' => 'main'#14394
MichaelSimons merged 29 commits intodotnet:mainfrom
dotnet-maestro-bot:merge/release/7.0.1xx-to-main

dotnet-maestro-bot commented Aug 25, 2022

Uh oh!

v-wuzhai left a comment

Uh oh!

v-wuzhai Aug 25, 2022

Uh oh!

MichaelSimons Aug 26, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

dotnet-maestro-bot commented Aug 25, 2022

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

v-wuzhai left a comment

Choose a reason for hiding this comment

Uh oh!

v-wuzhai Aug 25, 2022

Choose a reason for hiding this comment

Uh oh!

MichaelSimons Aug 26, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants