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

Open
wants to merge 133 commits into
base: release/8.0.3xx
Choose a base branch
from

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

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

  • marcpopMSFT
  • v-wuzhai
  • vseanreesermsft
  • dotnet-maestro[bot]
  • dotnet-bot
  • MiYanni
  • JL03-Yue

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.1xx
git pull --ff-only
git checkout release/8.0.3xx
git pull --ff-only
git merge --no-ff release/8.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/sdk HEAD:merge/release/8.0.1xx-to-release/8.0.3xx
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/8.0.1xx-to-release/8.0.3xx

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

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 March 6, 2024 00:09
…otnet-templating build 20240305.8

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.420 -> To Version 6.0.421
…otnet-aspnetcore build 20240305.4

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.28-servicing.24155.4
…otnet-aspnetcore build 20240305.11

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.28-servicing.24155.11
…otnet-aspnetcore build 20240305.18

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.28-servicing.24155.18
…otnet-windowsdesktop build 20240306.3

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.28 -> To Version 6.0.29
…otnet-aspnetcore build 20240306.10

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24156.10
…otnet-aspnetcore build 20240306.13

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24156.13
…otnet-windowsdesktop build 20240228.9

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.28 -> To Version 6.0.28
…otnet-windowsdesktop build 20240306.10

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.28 -> To Version 6.0.29
…otnet-windowsdesktop build 20240307.10

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.28 -> To Version 6.0.29
…otnet-windowsdesktop build 20240307.17

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.28 -> To Version 6.0.29
…otnet-windowsdesktop build 20240308.11

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.28 -> To Version 6.0.29
…otnet-aspnetcore build 20240311.15

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24161.15
…otnet-windowsdesktop build 20240311.9

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.28 -> To Version 6.0.29
…otnet-aspnetcore build 20240312.5

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24162.5
…otnet-windowsdesktop build 20240312.5

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.28 -> To Version 6.0.29
…otnet-aspnetcore build 20240312.12

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24162.12
…otnet-aspnetcore build 20240312.17

dotnet-dev-certs , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24162.17
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 6.0.0-beta.24113.1 -> To Version 6.0.0-beta.24162.4
…3 repositories

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**: 20240305.8
- **Date Produced**: March 5, 2024 11:39:12 PM UTC
- **Commit**: 7a4798275bca24fb3b6f7ca3bb369e92b9e10d58
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.420 to 6.0.421][1]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.420 to 6.0.421][1]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.420 to 6.0.421][1]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.420-rtm.24120.6 to 6.0.421-rtm.24155.8][1]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.420 to 6.0.421][1]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.420 to 6.0.421][1]
  - **Microsoft.TemplateSearch.Common**: [from 6.0.420 to 6.0.421][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:94677cab-622e-41c1-42a0-08da65ba5474)

[marker]: <> (Begin:1963f8a1-5df7-4929-7e1e-08da65ba3032)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1963f8a1-5df7-4929-7e1e-08da65ba3032
- **Build**: 20240312.17
- **Date Produced**: March 12, 2024 11:40:19 PM UTC
- **Commit**: dd340b191b388fd448494f70a126ce8db511bba4
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][10]
  - **dotnet-user-secrets**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][10]
  - **Microsoft.AspNetCore.Analyzers**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][10]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.28 to 6.0.29][10]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][10]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.28 to 6.0.29][10]
  - **Microsoft.AspNetCore.Authorization**: [from 6.0.28 to 6.0.29][10]
  - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.28 to 6.0.29][10]
  - **Microsoft.AspNetCore.Components.Web**: [from 6.0.28 to 6.0.29][10]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][10]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][10]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.28-servicing.24120.5 to 6.0.29-servicing.24162.17][10]
  - **Microsoft.AspNetCore.TestHost**: [from 6.0.28 to 6.0.29][10]
  - **Microsoft.Extensions.FileProviders.Embed...
Merge from public release/6.0.4xx to internal/release/6.0.4xx and resolve conflicts if necessary
[release/6.0.1xx] Update dependencies from dotnet/arcade
v-wuzhai and others added 24 commits May 6, 2024 23:36
…506.23

dotnet-format
 From Version 8.0.525608 -> To Version 8.0.525623
…507.1

dotnet-format
 From Version 8.0.525608 -> To Version 8.1.525701
…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
…0240507.1

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.106-servicing.24256.1 -> To Version 8.0.106-servicing.24257.1
…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
…0240508.3

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.106-servicing.24257.1 -> To Version 8.0.106-servicing.24258.3
…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
…0240513.1

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.106-servicing.24258.3 -> To Version 8.0.106-servicing.24263.1
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels May 16, 2024
Copy link
Member

@v-wuzhai v-wuzhai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Locked down

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants