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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 10 commits into from
May 16, 2024
Merged

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

merged 10 commits into from
May 16, 2024

Conversation

dotnet-maestro-bot
Copy link
Contributor

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
  • vseanreesermsft
  • 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.

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/sdk HEAD:merge/release/6.0.4xx-to-release/8.0.1xx
or if you are using SSH 
git push [email protected]:dotnet-maestro-bot/sdk 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/sdk 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/sdk 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/sdk 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/sdk 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 9 commits April 16, 2024 22:50
@dotnet-bot @vseanreesermsft
Merged PR 38990: [internal/release/6.0.4xx] Update dependencies from …
2f8fe57 
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:a80f4faa-cecd-4d15-c1ec-08da65ba3b2f)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: a80f4faa-cecd-4d15-c1ec-08da65ba3b2f
- **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.NET.HostModel**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.29 to 6.0.30][1]
  - **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]
  - **Microsoft.NETCore.DotNetHostResolver**: [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]
  - **VS.Redist.Common.NetCore.TargetingPack.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:a80f4faa-cecd-4d15-c1ec-08da65ba3b2f)
@dotnet-bot @vseanreesermsft
Merged PR 39004: [internal/release/6.0.4xx] Update dependencies from …
83a874d 
…3 repositories

This pull request updates the following dependencies

[marker]: <> (Begin:1963f8a1-5df7-4929-7e1e-08da65ba3032)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1963f8a1-5df7-4929-7e1e-08da65ba3032
- **Build**: 20240416.19
- **Date Produced**: April 16, 2024 11:39:24 PM UTC
- **Commit**: 1d696053fcd6735aaac1902afdb0b92edbf43e71
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][1]
  - **dotnet-user-secrets**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][1]
  - **Microsoft.AspNetCore.Analyzers**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.29 to 6.0.30][1]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][1]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.30][1]
  - **Microsoft.AspNetCore.Authorization**: [from 6.0.29 to 6.0.30][1]
  - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.29 to 6.0.30][1]
  - **Microsoft.AspNetCore.Components.Web**: [from 6.0.29 to 6.0.30][1]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][1]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][1]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][1]
  - **Microsoft.AspNetCore.TestHost**: [from 6.0.29 to 6.0.30][1]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.29 to 6.0.30][1]
  - **Microsoft.JSInterop**: [from 6.0.29 to 6.0.30][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCc83354d42e63d2bb07e6b24b7c67ef91e434f359&targetVersion=GC1d696053fcd6735aaac1902afdb0b92edbf43e71&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1963f8a1-5df7-4929-7e1e-08da65ba3032)

[marker]: <> (Begin:94677cab-622e-41c1-42a0-08da65ba5474)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: 94677cab-622e-41c1-42a0-08da65ba5474
- **Build**: 20240416.16
- **Date Produced**: April 17, 2024 12:05:06 AM UTC
- **Commit**: 13683233bef71ad1d048e6481966879d52e1ccd5
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.421 to 6.0.422][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.421 to 6.0.422][2]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.421 to 6.0.422][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.421-rtm.24171.7 to 6.0.422-rtm.24216.16][2]
  - **Microsoft.Templat...
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
12ad76c 
…otnet-templating build 20240418.5

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common
 From Version 6.0.422 -> To Version 6.0.422
@dotnet-bot @vseanreesermsft
Merged PR 39067: [internal/release/6.0.4xx] Update dependencies from …
2633fcf 
…dnceng/internal/dotnet-templating

This pull request updates the following dependencies

[marker]: <> (Begin:94677cab-622e-41c1-42a0-08da65ba5474)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: 94677cab-622e-41c1-42a0-08da65ba5474
- **Build**: 20240418.5
- **Date Produced**: April 18, 2024 7:18:56 PM UTC
- **Commit**: ef00e74f0a21b8a8192c1c409c154070ef39b95e
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24216.16 to 6.0.422-rtm.24218.5][1]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateSearch.Common**: [from 6.0.422 to 6.0.422][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC13683233bef71ad1d048e6481966879d52e1ccd5&targetVersion=GCef00e74f0a21b8a8192c1c409c154070ef39b95e&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:94677cab-622e-41c1-42a0-08da65ba5474)
@dotnet-bot @vseanreesermsft
Merged PR 39105: [internal/release/6.0.4xx] Update dependencies from …
8cf6c33 
…dnceng/internal/dotnet-templating

This pull request updates the following dependencies

[marker]: <> (Begin:94677cab-622e-41c1-42a0-08da65ba5474)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: 94677cab-622e-41c1-42a0-08da65ba5474
- **Build**: 20240419.4
- **Date Produced**: April 19, 2024 10:08:41 PM UTC
- **Commit**: effe0d00ab994d57a5e1334667dec144f9f2a9e9
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24218.5 to 6.0.422-rtm.24219.4][1]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateSearch.Common**: [from 6.0.422 to 6.0.422][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCef00e74f0a21b8a8192c1c409c154070ef39b95e&targetVersion=GCeffe0d00ab994d57a5e1334667dec144f9f2a9e9&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:94677cab-622e-41c1-42a0-08da65ba5474)
@dotnet-bot @marcpopMSFT
Merged PR 39286: [internal/release/6.0.4xx] Update dependencies from …
b47e9d3 
…dnceng/internal/dotnet-templating

This pull request updates the following dependencies

[marker]: <> (Begin:94677cab-622e-41c1-42a0-08da65ba5474)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: 94677cab-622e-41c1-42a0-08da65ba5474
- **Build**: 20240429.7
- **Date Produced**: April 29, 2024 9:13:40 PM UTC
- **Commit**: 086db5520af132ac32dcf8cce8ad4d561b868363
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24219.4 to 6.0.422-rtm.24229.7][1]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.422 to 6.0.422][1]
  - **Microsoft.TemplateSearch.Common**: [from 6.0.422 to 6.0.422][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCeffe0d00ab994d57a5e1334667dec144f9f2a9e9&targetVersion=GC086db5520af132ac32dcf8cce8ad4d561b868363&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:94677cab-622e-41c1-42a0-08da65ba5474)
@vseanreesermsft
Merge commit 'b47e9d314726020921851f007797b479a5f6905e' into internal…
9c440f3 
…-merge-6.0.4xx-2024-05-14-1033
@marcpopMSFT
simplify the globaljson test logic
1a5090e
@marcpopMSFT
Merging internal commits for release/6.0.4xx (dotnet#40876)
7ac4eeb
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/6.0.4xx-to-release/8.0.1xx branch from 1837646 to 7ac4eeb Compare May 14, 2024 23:05
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels May 14, 2024
@build-analysis build-analysis bot mentioned this pull request May 15, 2024
Closed
@v-wuzhai v-wuzhai requested a review from marcpopMSFT May 15, 2024 09:37
@v-wuzhai
Copy link
Member

@marcpopMSFT, could you merge this PR? The failed check is a known issue. Thanks.

@marcpopMSFT marcpopMSFT merged commit 787548c into dotnet:release/8.0.1xx May 16, 2024
14 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcpopMSFT marcpopMSFT Awaiting requested review from marcpopMSFT

Assignees
No one assigned
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dotnet-maestro-bot @v-wuzhai @marcpopMSFT @dotnet-bot @vseanreesermsft