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.1xx' => 'release/6.0.4xx' #7989

Conversation

dotnet-maestro-bot
Copy link

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

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

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

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.1xx
git pull --ff-only
git checkout release/6.0.4xx
git pull --ff-only
git merge --no-ff release/6.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/templating-1 HEAD:merge/release/6.0.1xx-to-release/6.0.4xx
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/templating-1 HEAD:merge/release/6.0.1xx-to-release/6.0.4xx

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

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 January 16, 2023 08:54
…otnet-runtime build 20230113.9

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

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **Build**: 20230113.9
- **Date Produced**: January 14, 2023 1:53:56 AM UTC
- **Commit**: b6518c6af8a11352fd9f0b4dc76149fedf666c3d
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][7]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][7]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23062.15 to 6.0.14-servicing.23063.9][7]

[7]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCb42db92&targetVersion=GCb6518c6&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…otnet-runtime build 20230117.7

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

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **Build**: 20230117.7
- **Date Produced**: January 17, 2023 11:02:02 PM UTC
- **Commit**: 8515e4c5a352c94e65e742031a5079ca76fdb3e7
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23063.9 to 6.0.14-servicing.23067.7][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **Build**: 20230120.4
- **Date Produced**: January 20, 2023 9:19:25 PM UTC
- **Commit**: 51b4c949feae0e7d5980ac6b3c52ed68628be4c1
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **Build**: 20230123.9
- **Date Produced**: January 24, 2023 8:46:18 AM UTC
- **Commit**: 2a90daa2cc41ae8f11a2c1519cb8b235f609251a
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…otnet-runtime build 20230207.9

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

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **Build**: 20230207.9
- **Date Produced**: February 8, 2023 5:36:15 AM UTC
- **Commit**: 54bb24fa48e7736f8653410760f84c842031388b
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.15][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.15][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23107.9][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…0.1xx-2023-02-14-1046

Merging internal commits for release/6.0.1xx
…214.5 (dotnet#6109)

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.23060.6 -> To Version 6.0.0-beta.23114.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **Build**: 20230211.4
- **Date Produced**: February 11, 2023 5:28:28 PM UTC
- **Commit**: d4a7595bf1d03a706941f13ece20c9ae0c216abc
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.15 to 6.0.15][9]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][9]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23110.13 to 6.0.15-servicing.23111.4][9]

[9]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC3a8c500&targetVersion=GCd4a7595&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **Build**: 20230215.7
- **Date Produced**: February 16, 2023 3:54:41 AM UTC
- **Commit**: 5edef4b20babd4c3ddac7460e536f86fd0f2d724
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.15 to 6.0.15][5]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][5]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23114.15 to 6.0.15-servicing.23115.7][5]

[5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC22da7ee&targetVersion=GC5edef4b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…otnet-runtime build 20230308.9

Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.15 -> To Version 6.0.16
…0.1xx-2023-03-14-1016

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

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **Build**: 20230308.9
- **Date Produced**: March 8, 2023 8:32:02 PM UTC
- **Commit**: 187b2c3d4f6f61198c63412bd5a9ea8987dce88d
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Ref**: [from 6.0.15 to 6.0.16][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.16][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23158.9][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…otnet-runtime build 20230308.13

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

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

Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.16 -> To Version 6.0.16
dotnet-bot and others added 28 commits March 15, 2024 20:02
…otnet-runtime build

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

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **Build**:
- **Date Produced**: March 15, 2024 7:38:30 PM UTC
- **Commit**: 01f15d4879bd19d518e5bfe146af3b85ccf43076
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…otnet-runtime build

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

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **Build**:
- **Date Produced**: March 20, 2024 12:59:32 AM UTC
- **Commit**: c95b68327d40062beb0c9d4cd08295a85d86bd27
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **Build**:
- **Date Produced**: March 21, 2024 7:40:21 PM UTC
- **Commit**: 189fbbd88d97dd6d65515ba2da05b62eab4e5039
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…2024-04-02-1141

Update branding to 6.0.130
* Port 1ES changes

* Fix OS mapping

* Fix yml

* Turn of integration tests
…326.9 (dotnet#7790)

[release/6.0.1xx] Update dependencies from dotnet/arcade
…0.1xx-2024-04-09-1226

Merging internal commits for release/6.0.1xx
…404.4

Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.24176.9 -> To Version 6.0.0-beta.24204.4
…e45-7a2b-44fd-b37f-6adc53e9d19c

[release/6.0.1xx] Update dependencies from dotnet/arcade
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:e76125ef-9daa-4a1e-3a50-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: e76125ef-9daa-4a1e-3a50-08d961c5a689
- **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:e76125ef-9daa-4a1e-3a50-08d961c5a689)
…2024-05-01-1437

Update branding to 6.0.131
…0.1xx-2024-05-14-1031

Merging internal commits for release/6.0.1xx
…2024-05-16-1732

Update branding to 6.0.132
@dotnet-maestro-bot dotnet-maestro-bot requested a review from a team as a code owner May 17, 2024 19:22
@v-wuzhai v-wuzhai closed this May 20, 2024
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