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/8.0.4xx' => 'main' #8262

Merged
merged 72 commits into from
Aug 7, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 6, 2024

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

  • vseanreesermsft

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/8.0.4xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.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/templating HEAD:merge/release/8.0.4xx-to-main
or if you are using SSH
git push [email protected]:dotnet/templating HEAD:merge/release/8.0.4xx-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.4xx-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.4xx-to-main main
git pull https://github.com/dotnet/templating merge/release/8.0.4xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/templating HEAD:merge/release/8.0.4xx-to-main
or if you are using SSH
git checkout -b merge/release/8.0.4xx-to-main main
git pull [email protected]:dotnet/templating merge/release/8.0.4xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/templating HEAD:merge/release/8.0.4xx-to-main

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

dotnet-maestro bot and others added 30 commits May 7, 2024 12:43
…ence-packages build 20240506.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24251.1 -> To Version 8.0.0-alpha.1.24256.1
…11-4899-8894-54c4a95e0930

[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages
…ence-packages build 20240507.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24256.1 -> To Version 8.0.0-alpha.1.24257.2
…bb-45d8-955b-3d17c7a59f9e

[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages
…nals build 20240513.1

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24256.1 -> To Version 8.0.0-alpha.1.24263.1
…6b-47ec-8cbc-937c7fb8925f

[release/8.0.1xx] Update dependencies from dotnet/source-build-externals
…516.3 (#7997)

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24266.3

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

[release/8.0.1xx] Update dependencies from dotnet/source-build-externals


 - Remove redundant equality

 - Remove unused parameter 'cancellationToken'

 - Remove unused parameter 'additionalNuGetSource'
…uild 20240624.2

System.CommandLine
 From Version 2.0.0-beta4.24209.3 -> To Version 2.0.0-beta4.24324.2
…uild 20240624.3

System.CommandLine
 From Version 2.0.0-beta4.24209.3 -> To Version 2.0.0-beta4.24324.3
* Update arcade

* Remove internal runtime args
…5a-4a45-bfcc-3b1e285e9a6f

[release/8.0.1xx] Update dependencies from dotnet/command-line-api
[release/8.0.1xx] Onboard new inter-branch merge flow [Workflow]
…710.5

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24352.1 -> To Version 8.0.0-beta.24360.5
[release/8.0.3xx] Update dependencies from dotnet/arcade
…33-4ff1-b851-5ceec47d438f

[release/8.0.1xx] Update dependencies from dotnet/arcade
…nals build 20240711.1 (#8222)

[release/8.0.1xx] Update dependencies from dotnet/source-build-externals
…ence-packages build 20240715.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24365.2
…ence-packages build 20240716.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24366.1
…716.7

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24366.7
…ence-packages build 20240717.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24367.1
…717.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24367.1
…ence-packages build 20240717.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24367.1
…717.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24367.1
…ence-packages build 20240717.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24367.1
…717.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24367.1
dotnet-maestro bot and others added 15 commits July 29, 2024 13:14
…726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1
…ence-packages build 20240722.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3
…726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1
…ence-packages build 20240722.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3
…726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1
…ence-packages build 20240722.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3
…726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1
…ence-packages build 20240722.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3
…726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1
…ence-packages build 20240722.3

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3
…726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1
…726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1
@github-actions github-actions bot force-pushed the merge/release/8.0.4xx-to-main branch from 268204d to 2f65951 Compare August 6, 2024 20:30
@github-actions github-actions bot requested a review from a team as a code owner August 6, 2024 20:30
dotnet-maestro bot and others added 10 commits August 6, 2024 13:31
…als (#8239)

* Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24372.2

* Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24361.1 -> To Version 8.0.0-alpha.1.24379.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/arcade build 20240716.7

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24366.7

* Update dependencies from https://github.com/dotnet/arcade build 20240717.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24367.1

* Update dependencies from https://github.com/dotnet/arcade build 20240717.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24367.1

* Update dependencies from https://github.com/dotnet/arcade build 20240717.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24367.1

* Update dependencies from https://github.com/dotnet/arcade build 20240717.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24367.1

* Update dependencies from https://github.com/dotnet/arcade build 20240717.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24367.1

* Update dependencies from https://github.com/dotnet/arcade build 20240722.3

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24372.3

* Update dependencies from https://github.com/dotnet/arcade build 20240722.3

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24372.3

* Update dependencies from https://github.com/dotnet/arcade build 20240726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1

* Update dependencies from https://github.com/dotnet/arcade build 20240726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1

* Update dependencies from https://github.com/dotnet/arcade build 20240726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1

* Update dependencies from https://github.com/dotnet/arcade build 20240726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1

* Update dependencies from https://github.com/dotnet/arcade build 20240726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1

* Update dependencies from https://github.com/dotnet/arcade build 20240726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1

* Update dependencies from https://github.com/dotnet/arcade build 20240726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1

* Update dependencies from https://github.com/dotnet/arcade build 20240726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1

* Update dependencies from https://github.com/dotnet/arcade build 20240726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1

* Update dependencies from https://github.com/dotnet/arcade build 20240726.1

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24360.5 -> To Version 8.0.0-beta.24376.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…7a-422d-bb2e-18dc446c9f0f

[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages
…61-40c1-90f5-e3c9314f6b52

[release/8.0.4xx] Update dependencies from dotnet/arcade
…/8.0.3xx

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx'
…/8.0.4xx

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx'
@Forgind Forgind merged commit 27755b4 into main Aug 7, 2024
11 checks passed
@Forgind Forgind deleted the merge/release/8.0.4xx-to-main branch August 7, 2024 17:09
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.

8 participants