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.

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

[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' #7990

Conversation

dotnet-maestro-bot
Copy link

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

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

  • marcpopMSFT
  • dotnet-maestro[bot]
  • vseanreesermsft
  • joeloff
  • dotnet-bot
  • MiYanni
  • v-wuzhai
  • JL03-Yue
  • MilenaHristova
  • invalid-email-address
  • mmitche
  • dkurepa
  • wtgodbe
  • YuliiaKovalova
  • vlada-shubina
  • JanKrivanek
  • bekir-ozturk
  • DavidKarlas

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

# 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/6.0.4xx-to-release/8.0.1xx
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/templating-1 HEAD:merge/release/6.0.4xx-to-release/8.0.1xx

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/6.0.4xx-to-release/8.0.1xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0.4xx-to-release/8.0.1xx release/8.0.1xx
git pull https://github.com/dotnet-maestro-bot/templating-1 merge/release/6.0.4xx-to-release/8.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/templating-1 HEAD:merge/release/6.0.4xx-to-release/8.0.1xx
or if you are using SSH
git checkout -b merge/release/6.0.4xx-to-release/8.0.1xx release/8.0.1xx
git pull [email protected]:dotnet-maestro-bot/templating-1 merge/release/6.0.4xx-to-release/8.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/templating-1 HEAD:merge/release/6.0.4xx-to-release/8.0.1xx

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 May 22, 2023 14:30
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:70d54415-c34e-4f74-2860-08da603c32b5)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 70d54415-c34e-4f74-2860-08da603c32b5
- **Build**: 20230519.7
- **Date Produced**: May 19, 2023 10:57:54 PM UTC
- **Commit**: c76ac565499f3e7c657126d46c00b67a0d74832c
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.Logging.Abstractions**: [from 6.0.4 to 6.0.4][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC320aeb73d8&targetVersion=GCc76ac56549&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:70d54415-c34e-4f74-2860-08da603c32b5)
…otnet-runtime build 20230522.16

Microsoft.Extensions.Logging.Abstractions , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.4 -> To Version 6.0.4
I think this is causing some performance problems figuring out the dependency graph. The installer dependency should not exist, and clicommandlineparser should have a sha.
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:70d54415-c34e-4f74-2860-08da603c32b5)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 70d54415-c34e-4f74-2860-08da603c32b5
- **Build**: 20230522.16
- **Date Produced**: May 23, 2023 3:19:44 AM UTC
- **Commit**: bb9f3c3cee21b449c6a2348eecf316d05b274389
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.Logging.Abstractions**: [from 6.0.4 to 6.0.4][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23269.7 to 6.0.18-servicing.23272.16][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc76ac56549&targetVersion=GCbb9f3c3cee&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:70d54415-c34e-4f74-2860-08da603c32b5)
…524.5 (dotnet#6653)

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.23254.1 -> To Version 6.0.0-beta.23274.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…601.1 (dotnet#6667)

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.23274.5 -> To Version 6.0.0-beta.23301.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…2023-06-06-1303

Update branding to 6.0.411
…otnet-runtime build 20230608.13

Microsoft.Extensions.Logging.Abstractions , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.4 -> To Version 6.0.4
…otnet-runtime build 20230612.9

Microsoft.Extensions.Logging.Abstractions , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.4 -> To Version 6.0.4
…0.4xx-2023-06-13-1017

Merging internal commits for release/6.0.4xx
…otnet-runtime build 20230613.13

Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.18 -> To Version 6.0.19
…otnet-runtime build 20230613.25

Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.18 -> To Version 6.0.19
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:70d54415-c34e-4f74-2860-08da603c32b5)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 70d54415-c34e-4f74-2860-08da603c32b5
- **Build**: 20230613.25
- **Date Produced**: June 14, 2023 2:04:14 AM UTC
- **Commit**: fcf11495c6989362aa1012dc0d303ce619413624
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.19][4]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.19][4]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23272.16 to 6.0.19-servicing.23313.25][4]

[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCbb9f3c3cee&targetVersion=GCfcf11495c6&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:70d54415-c34e-4f74-2860-08da603c32b5)
* Update dependencies from https://github.com/dotnet/arcade build 20230613.5

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.23301.1 -> To Version 6.0.0-beta.23313.5

* Fix test with non-existent package name

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <[email protected]>
Merge from public release/6.0.4xx to internal/release/6.0.4xx and resolve conflicts if necessary
…2023-06-19-1027

Update branding to 6.0.412
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:70d54415-c34e-4f74-2860-08da603c32b5)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 70d54415-c34e-4f74-2860-08da603c32b5
- **Build**: 20230620.17
- **Date Produced**: June 20, 2023 10:06:09 PM UTC
- **Commit**: a08d9ce2caf02455c0b825bcdc32974bdf769a80
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.19 to 6.0.20][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.19 to 6.0.20][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCfcf11495c6&targetVersion=GCa08d9ce2ca&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:70d54415-c34e-4f74-2860-08da603c32b5)
…2023-07-05-1427

Update branding to 6.0.413
dotnet-bot and others added 26 commits April 3, 2024 20:20
…404.4

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.24201.2 -> To Version 6.0.0-beta.24204.4
…a77-58ab-43fe-839e-1f7d61bc5b57

[release/6.0.4xx] Update dependencies from dotnet/arcade
…0.4xx-2024-04-09-1225

Merging internal commits for release/6.0.4xx
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:70d54415-c34e-4f74-2860-08da603c32b5)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 70d54415-c34e-4f74-2860-08da603c32b5
- **Build**: 20240415.25
- **Date Produced**: April 16, 2024 9:04:59 PM UTC
- **Commit**: 97d8f4cade971b93794a3805e7d72ee388f14c9b
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.30][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.30][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC189fbbd88d97dd6d65515ba2da05b62eab4e5039&targetVersion=GC97d8f4cade971b93794a3805e7d72ee388f14c9b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:70d54415-c34e-4f74-2860-08da603c32b5)
…417.3

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.24204.4 -> To Version 6.0.0-beta.24217.3
…0de-e92a-4797-87e9-d97645e32ae1

[release/6.0.4xx] Update dependencies from dotnet/arcade
Merge from public release/6.0.4xx to internal/release/6.0.4xx and resolve conflicts if necessary
…418.1

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.24217.3 -> To Version 6.0.0-beta.24218.1
…813-863f-4905-93b9-1836c2c871b7

[release/6.0.4xx] Update dependencies from dotnet/arcade
…2024-05-01-1437

Update branding to 6.0.423
…0.4xx-2024-05-14-1033

Merging internal commits for release/6.0.4xx
…515.2

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.24218.1 -> To Version 6.0.0-beta.24265.2
…516.4

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.24218.1 -> To Version 6.0.0-beta.24266.4
…2024-05-16-1732

Update branding to 6.0.424
…f59-6e06-40a2-9e99-8eb7ce044db3

[release/6.0.4xx] Update dependencies from dotnet/arcade
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet