[automated] Merge branch 'release/8.0.2xx' => 'main' #7185

dotnet-maestro-bot · 2023-10-20T21:33:22Z

I detected changes in the release/8.0.2xx 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/8.0.2xx by the following committers:

MiYanni
dotnet-maestro[bot]
v-wuzhai
invalid-email-address
dependabot[bot]
marcpopMSFT
Forgind
JL03-Yue
vseanreesermsft
dkurepa
mmitche
joeloff
dotnet-bot

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/8.0.2xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.0.2xx

# 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/templating-1 HEAD:merge/release/8.0.2xx-to-main

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.2xx-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/8.0.2xx-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/8.0.2xx-to-main main
git pull https://github.com/dotnet-maestro-bot/templating-1 merge/release/8.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.2xx-to-main

or if you are using SSH

git checkout -b merge/release/8.0.2xx-to-main main
git pull [email protected]:dotnet-maestro-bot/templating-1 merge/release/8.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.2xx-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.

…e/8.0.1xx [release/8.0.1xx] Fix parameter in null/empty check

…0816.31 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.1.23414.1 -> To Version 8.0.0-rc.1.23416.31

…0817.4 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.1.23414.1 -> To Version 8.0.0-rc.2.23417.4

…nals build 20230817.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23414.2 -> To Version 8.0.0-alpha.1.23417.1

…0817.12 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.1.23414.1 -> To Version 8.0.0-rc.2.23417.12

…0817.23 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.1.23414.1 -> To Version 8.0.0-rc.2.23417.23

…otnet-runtime build 20230817.25 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.1.23414.1 -> To Version 8.0.0-rc.1.23417.25

…nals build 20230818.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23414.2 -> To Version 8.0.0-alpha.1.23418.1

…aae-a064-4573-8c62-3b2504af83d5 [release/8.0.1xx] Update dependencies from dotnet/runtime

…2ad-0ac1-4507-a6b9-8097cad18a00 [release/8.0.1xx] Update dependencies from dotnet/source-build-externals

…rom dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:9fb38d28-e4dd-4971-d129-08db9cf9ad5b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 9fb38d28-e4dd-4971-d129-08db9cf9ad5b - **Build**: 20230817.25 - **Date Produced**: August 18, 2023 7:18:28 AM UTC - **Commit**: 04ff472ef2623d2705f4d73d0e8dbe9a909a7875 - **Branch**: refs/heads/internal/release/8.0-rc1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NETCore.App.Ref**: [from 8.0.0-rc.1.23414.1 to 8.0.0-rc.1.23417.25][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.0-rc.1.23414.1 to 8.0.0-rc.1.23417.25][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC8986374ea7&targetVersion=GC04ff472ef2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:9fb38d28-e4dd-4971-d129-08db9cf9ad5b)

…817.3 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23414.5 -> To Version 8.0.0-beta.23417.3 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23412.1 -> To Version 1.0.0-beta.23416.1 (parent: Microsoft.DotNet.Arcade.Sdk

…ence-packages build 20230814.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23408.2 -> To Version 8.0.0-alpha.1.23414.1

…7f6-13da-43dd-99ee-511015fac674 [release/8.0.1xx] Update dependencies from dotnet/arcade

…0818.14 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.2.23417.23 -> To Version 8.0.0-rc.2.23418.14

…rom dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:9fb38d28-e4dd-4971-d129-08db9cf9ad5b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 9fb38d28-e4dd-4971-d129-08db9cf9ad5b - **Build**: 20230818.9 - **Date Produced**: August 19, 2023 1:09:04 AM UTC - **Commit**: 13854cd67a8f7fc2f3e9968d187ad5e7df044d35 - **Branch**: refs/heads/internal/release/8.0-rc1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NETCore.App.Ref**: [from 8.0.0-rc.1.23417.25 to 8.0.0-rc.1.23418.9][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.0-rc.1.23417.25 to 8.0.0-rc.1.23418.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC04ff472ef2&targetVersion=GC13854cd67a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:9fb38d28-e4dd-4971-d129-08db9cf9ad5b)

…rom dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:9fb38d28-e4dd-4971-d129-08db9cf9ad5b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 9fb38d28-e4dd-4971-d129-08db9cf9ad5b - **Build**: 20230818.20 - **Date Produced**: August 19, 2023 7:07:51 AM UTC - **Commit**: 4bdeb72b63f3471c15235768478883743d82696d - **Branch**: refs/heads/internal/release/8.0-rc1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NETCore.App.Ref**: [from 8.0.0-rc.1.23418.9 to 8.0.0-rc.1.23418.20][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.0-rc.1.23418.9 to 8.0.0-rc.1.23418.20][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC13854cd67a&targetVersion=GC4bdeb72b63&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:9fb38d28-e4dd-4971-d129-08db9cf9ad5b)

…819.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23417.3 -> To Version 8.0.0-beta.23419.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23416.1 -> To Version 1.0.0-beta.23418.1 (parent: Microsoft.DotNet.Arcade.Sdk

…rom dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:9fb38d28-e4dd-4971-d129-08db9cf9ad5b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 9fb38d28-e4dd-4971-d129-08db9cf9ad5b - **Build**: 20230819.4 - **Date Produced**: August 19, 2023 9:13:13 PM UTC - **Commit**: 92959931a32a37a19d8e1b1684edc6db0857d7de - **Branch**: refs/heads/internal/release/8.0-rc1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NETCore.App.Ref**: [from 8.0.0-rc.1.23418.20 to 8.0.0-rc.1.23419.4][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.0-rc.1.23418.20 to 8.0.0-rc.1.23419.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4bdeb72b63&targetVersion=GC92959931a3&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:9fb38d28-e4dd-4971-d129-08db9cf9ad5b)

…nals build 20230821.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23418.1 -> To Version 8.0.0-alpha.1.23421.1

…ence-packages build 20230821.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23408.2 -> To Version 8.0.0-alpha.1.23421.1

…822.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23417.3 -> To Version 8.0.0-beta.23422.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23416.1 -> To Version 1.0.0-beta.23418.1 (parent: Microsoft.DotNet.Arcade.Sdk

…85f-3124-4a31-8783-79898942e826 [release/8.0.1xx] Update dependencies from dotnet/source-build-externals

…9b6-400b-4699-a61f-0ea09f75ae74 [release/8.0.1xx] Update dependencies from dotnet/runtime

…4cd-18c9-4f3f-a0b0-6e2586ba5dab [release/8.0.1xx] Update dependencies from dotnet/arcade

…c1c-6270-42b8-9a75-05eb25a4ead1 [release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages

…0823.11 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.2.23418.14 -> To Version 8.0.0-rc.2.23423.11

…71c-fb7e-4710-9073-b8c7a0d5abb5 [release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages

…2c3-ca02-45c4-941e-cc8dda0f519b [release/8.0.1xx] Update dependencies from dotnet/runtime

…1017.16 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23517.12 -> To Version 8.0.0-rtm.23517.16

…ae2-5c24-4148-9045-73c631542b0a [release/8.0.1xx] Update dependencies from dotnet/runtime

…nals build 20231018.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23502.1 -> To Version 8.0.0-alpha.1.23518.1

…1018.7 (dotnet#7170) [release/8.0.1xx] Update dependencies from dotnet/runtime

[release/8.0.1xx] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23426.1 to 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk) - Fix dotnet_diagnostic.xUnit2020.severity errors. - Fix dotnet_diagnostic.xUnit2013.severity errors. - Fix dotnet_diagnostic.xUnit1031.severity errors. - Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-539d509e-f9a1-42a6-8c50-e5594f1ebea4 # Conflicts: # .editorconfig

…1018.12 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23518.7 -> To Version 8.0.0-rtm.23518.12

…e23-8042-4d1d-9e5b-da36635b6508 [release/8.0.1xx] Update dependencies from dotnet/source-build-externals

…d54-ba71-45a3-b1f4-0c0d462c0f71 [release/8.0.1xx] Update dependencies from dotnet/runtime

…into dependabot/nuget/eng/dependabot/release/8.0.1xx/Verify.XUnit-22.1.3

…1018.26 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23518.12 -> To Version 8.0.0-rtm.23518.26

…f1a-aded-4ca1-95fe-c63dab4dd102 [release/8.0.1xx] Update dependencies from dotnet/runtime

…dabot/release/8.0.1xx/Verify.XUnit-22.1.3 Bump Verify.XUnit from 20.4.0 to 22.1.3 in /eng/dependabot

…018.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23516.5 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23509.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk

…c71-86ba-42e5-aa9e-0c0be6a62844

…et/eng/dependabot/release/8.0.1xx/Verify.XUnit-22.1.3

…016.4 (dotnet#7180) Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23518.2 -> To Version 8.0.0-beta.23516.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23516.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

…1019.13 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23518.26 -> To Version 8.0.0-rtm.23519.13

…7f5-251e-4bb9-a56f-c5fc55453b97

…8.0.1xx-to-release/8.0.2xx

# Conflicts: # eng/Version.Details.xml # eng/Versions.props # eng/dependabot/Packages.props # global.json # test/Directory.Build.targets

marcpopMSFT and others added 30 commits August 15, 2023 09:54

Updated branding

8615f3c

Fix parameter in null/empty check

bbe710b

Merge pull request dotnet#6962 from dotnet/backport/pr-6961-to-releas…

540efcc

…e/8.0.1xx [release/8.0.1xx] Fix parameter in null/empty check

Update dependencies from https://github.com/dotnet/runtime build 2023…

f872c4b

…0816.31 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.1.23414.1 -> To Version 8.0.0-rc.1.23416.31

Update dependencies from https://github.com/dotnet/runtime build 2023…

3d88baf

…0817.4 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.1.23414.1 -> To Version 8.0.0-rc.2.23417.4

Update dependencies from https://github.com/dotnet/source-build-exter…

a61fdde

…nals build 20230817.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23414.2 -> To Version 8.0.0-alpha.1.23417.1

Update dependencies from https://github.com/dotnet/runtime build 2023…

0a0bdfd

…0817.12 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.1.23414.1 -> To Version 8.0.0-rc.2.23417.12

Update dependencies from https://github.com/dotnet/runtime build 2023…

66d55df

…0817.23 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.1.23414.1 -> To Version 8.0.0-rc.2.23417.23

Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…

d7085c7

…otnet-runtime build 20230817.25 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.1.23414.1 -> To Version 8.0.0-rc.1.23417.25

Update dependencies from https://github.com/dotnet/source-build-exter…

1dbc731

…nals build 20230818.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23414.2 -> To Version 8.0.0-alpha.1.23418.1

Update arcade

acd851b

Merge pull request dotnet#6963 from dotnet/darc-release/8.0.1xx-05ab9…

828970f

…aae-a064-4573-8c62-3b2504af83d5 [release/8.0.1xx] Update dependencies from dotnet/runtime

Merge pull request dotnet#6964 from dotnet/darc-release/8.0.1xx-e4894…

02471ed

…2ad-0ac1-4507-a6b9-8097cad18a00 [release/8.0.1xx] Update dependencies from dotnet/source-build-externals

Update dependencies from https://github.com/dotnet/source-build-refer…

d2baa0f

…ence-packages build 20230814.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23408.2 -> To Version 8.0.0-alpha.1.23414.1

Merge pull request dotnet#6966 from dotnet/darc-release/8.0.1xx-e9763…

3fb74c9

…7f6-13da-43dd-99ee-511015fac674 [release/8.0.1xx] Update dependencies from dotnet/arcade

Update dependencies from https://github.com/dotnet/runtime build 2023…

46aebff

…0818.14 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.2.23417.23 -> To Version 8.0.0-rc.2.23418.14

Update dependencies from https://github.com/dotnet/source-build-exter…

27f5827

…nals build 20230821.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23418.1 -> To Version 8.0.0-alpha.1.23421.1

Update dependencies from https://github.com/dotnet/source-build-refer…

9c99815

…ence-packages build 20230821.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23408.2 -> To Version 8.0.0-alpha.1.23421.1

Merge pull request dotnet#6976 from dotnet/darc-release/8.0.1xx-a8d22…

bc0c502

…85f-3124-4a31-8783-79898942e826 [release/8.0.1xx] Update dependencies from dotnet/source-build-externals

Merge pull request dotnet#6968 from dotnet/darc-release/8.0.1xx-ab91b…

307b583

…9b6-400b-4699-a61f-0ea09f75ae74 [release/8.0.1xx] Update dependencies from dotnet/runtime

Merge pull request dotnet#6970 from dotnet/darc-release/8.0.1xx-cb496…

bdf3c44

…4cd-18c9-4f3f-a0b0-6e2586ba5dab [release/8.0.1xx] Update dependencies from dotnet/arcade

Merge pull request dotnet#6967 from dotnet/darc-release/8.0.1xx-24ca4…

f2e7475

…c1c-6270-42b8-9a75-05eb25a4ead1 [release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages

Update dependencies from https://github.com/dotnet/runtime build 2023…

47e629e

…0823.11 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-rc.2.23418.14 -> To Version 8.0.0-rc.2.23423.11

v-wuzhai and others added 24 commits October 17, 2023 19:43

Merge pull request dotnet#7154 from dotnet/darc-release/8.0.1xx-b2a22…

8322c54

…71c-fb7e-4710-9073-b8c7a0d5abb5 [release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages

Merge pull request dotnet#7156 from dotnet/darc-release/8.0.1xx-a2d10…

aea1bfc

…2c3-ca02-45c4-941e-cc8dda0f519b [release/8.0.1xx] Update dependencies from dotnet/runtime

Update dependencies from https://github.com/dotnet/runtime build 2023…

2b4516b

…1017.16 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23517.12 -> To Version 8.0.0-rtm.23517.16

Merge pull request dotnet#7157 from dotnet/darc-release/8.0.1xx-87e15…

9a3fe84

…ae2-5c24-4148-9045-73c631542b0a [release/8.0.1xx] Update dependencies from dotnet/runtime

Try to fix the errors

0cbaa38

Update dependencies from https://github.com/dotnet/source-build-exter…

71facb8

…nals build 20231018.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23502.1 -> To Version 8.0.0-alpha.1.23518.1

Update dependencies from https://github.com/dotnet/runtime build 2023…

3f56ae9

…1018.7 (dotnet#7170) [release/8.0.1xx] Update dependencies from dotnet/runtime

Merge pull request dotnet#7149 from dotnet/Jason/Fixes#7121

9b57714

Update dependencies from https://github.com/dotnet/runtime build 2023…

e4ca4a3

…1018.12 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23518.7 -> To Version 8.0.0-rtm.23518.12

Merge pull request dotnet#7163 from dotnet/darc-release/8.0.1xx-b6717…

4597743

…e23-8042-4d1d-9e5b-da36635b6508 [release/8.0.1xx] Update dependencies from dotnet/source-build-externals

Merge pull request dotnet#7171 from dotnet/darc-release/8.0.1xx-58af5…

efc7bd4

…d54-ba71-45a3-b1f4-0c0d462c0f71 [release/8.0.1xx] Update dependencies from dotnet/runtime

Merge branch 'release/8.0.1xx' of https://github.com/dotnet/templating …

c9b8686

…into dependabot/nuget/eng/dependabot/release/8.0.1xx/Verify.XUnit-22.1.3

Update dependencies from https://github.com/dotnet/runtime build 2023…

aa8b42e

…1018.26 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23518.12 -> To Version 8.0.0-rtm.23518.26

Merge pull request dotnet#7172 from dotnet/darc-release/8.0.1xx-fcc6c…

c6bd4eb

…f1a-aded-4ca1-95fe-c63dab4dd102 [release/8.0.1xx] Update dependencies from dotnet/runtime

Merge pull request dotnet#7145 from dotnet/dependabot/nuget/eng/depen…

a6f0106

…dabot/release/8.0.1xx/Verify.XUnit-22.1.3 Bump Verify.XUnit from 20.4.0 to 22.1.3 in /eng/dependabot

Revert "Bump Verify.XUnit from 20.4.0 to 22.1.3 in /eng/dependabot"

39e8d80

Merge pull request dotnet#7175 from dotnet/darc-release/8.0.1xx-cfa0a…

534b31f

…c71-86ba-42e5-aa9e-0c0be6a62844

Merge pull request dotnet#7177 from dotnet/revert-7145-dependabot/nug…

6c62814

…et/eng/dependabot/release/8.0.1xx/Verify.XUnit-22.1.3

Update dependencies from https://github.com/dotnet/runtime build 2023…

9e2bb69

…1019.13 Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23518.26 -> To Version 8.0.0-rtm.23519.13

Merge pull request dotnet#7183 from dotnet/darc-release/8.0.1xx-6fd8c…

be30400

…7f5-251e-4bb9-a56f-c5fc55453b97

Merge pull request dotnet#7184 from dotnet-maestro-bot/merge/release/…

98fd40c

…8.0.1xx-to-release/8.0.2xx

dotnet-maestro-bot requested review from GangWang01 and a team as code owners October 20, 2023 21:33

MiYanni added 2 commits October 20, 2023 15:02

Merge branch 'main' into merge/release/8.0.2xx-to-main

52ab65d

# Conflicts: # eng/Version.Details.xml # eng/Versions.props # eng/dependabot/Packages.props # global.json # test/Directory.Build.targets

Fix merge issues.

2007eb8

MiYanni approved these changes Oct 20, 2023

View reviewed changes

MiYanni merged commit 29326cd into dotnet:main Oct 20, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'release/8.0.2xx' => 'main' #7185

[automated] Merge branch 'release/8.0.2xx' => 'main' #7185

dotnet-maestro-bot commented Oct 20, 2023

[automated] Merge branch 'release/8.0.2xx' => 'main' #7185

[automated] Merge branch 'release/8.0.2xx' => 'main' #7185

Conversation

dotnet-maestro-bot commented Oct 20, 2023

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request