-
Notifications
You must be signed in to change notification settings - Fork 1k
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.3xx' => 'release/8.0.4xx' #40881
Closed
dotnet-maestro-bot
wants to merge
36
commits into
dotnet:release/8.0.4xx
from
dotnet-maestro-bot:merge/release/8.0.3xx-to-release/8.0.4xx
Closed
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' #40881
dotnet-maestro-bot
wants to merge
36
commits into
dotnet:release/8.0.4xx
from
dotnet-maestro-bot:merge/release/8.0.3xx-to-release/8.0.4xx
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…3 repositories This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.2 to 8.0.5 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:1adb2556-0120-43d1-c468-08dc11e32ec2) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 1adb2556-0120-43d1-c468-08dc11e32ec2 - **Build**: 20240417.5 - **Date Produced**: April 17, 2024 10:17:39 PM UTC - **Commit**: dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.2 to 8.0.5][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.2 to 8.0.5][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.2-servicing.24068.6 to 8.0.5-servicing.24217.5][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.2-servicing.24068.6 to 8.0.5-servicing.24217.5][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.2-servicing.24068.6 to 8.0.5-servicing.24217.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC593444ad8328a5a933c006c6564469666f45ad2e&targetVersion=GCdda23bbe00c4a4bfdd3732783f0cce37c11a4f40&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC472140dd926227876848e48f41cfc9acb9275492&targetVersion=GCb5af29a8f41f880f38fd015c6bcb7aeb816fcef6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1adb2556-0120-43d1-c468-08dc11e32ec2) [marker]: <> (Begin:911684f3-0faa-4fc9-de45-08dc11e85c3a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 911684f3-0faa-4fc9-de45-08dc11e85c3a - **Build**: 20240417.6 - **Date Produced**: April 17, 2024 10:32:21 PM UTC - **Commit**: 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6][3] - **dotnet-user-jwts**: [from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6][3] - **dotnet-user-secrets**: [from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6][3] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6][3] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.2 to 8.0.5][3] - **...
update runtime build dependencies to march release
update runtime build dependencies to april release
…3 repositories This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.4 to 8.0.5 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:1adb2556-0120-43d1-c468-08dc11e32ec2) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 1adb2556-0120-43d1-c468-08dc11e32ec2 - **Build**: 20240417.5 - **Date Produced**: April 17, 2024 10:17:39 PM UTC - **Commit**: dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.4 to 8.0.5][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.4 to 8.0.5][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.4-servicing.24169.24 to 8.0.5-servicing.24217.5][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.4-servicing.24169.24 to 8.0.5-servicing.24217.5][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.4-servicing.24169.10 to 8.0.5-servicing.24217.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC04094d116496e0bd1d376fd346397ec7900141f8&targetVersion=GCdda23bbe00c4a4bfdd3732783f0cce37c11a4f40&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCebbf01f54996755566db36e2e962ba6364da2ecc&targetVersion=GCb5af29a8f41f880f38fd015c6bcb7aeb816fcef6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1adb2556-0120-43d1-c468-08dc11e32ec2) [marker]: <> (Begin:911684f3-0faa-4fc9-de45-08dc11e85c3a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 911684f3-0faa-4fc9-de45-08dc11e85c3a - **Build**: 20240417.6 - **Date Produced**: April 17, 2024 10:32:21 PM UTC - **Commit**: 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24217.6][3] - **dotnet-user-jwts**: [from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24217.6][3] - **dotnet-user-secrets**: [from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24217.6][3] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.4-servicing.24170.14 to 8.0.5-servicing.24217.6][3] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.4 to 8.0.5][3] ...
Merge from public release/8.0.3xx to internal/release/8.0.3xx and resolve conflicts if necessary
… prior to merge from publ... Updated NuGet.config - revert format feeds to values prior to merge from public dd26694
…dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:911684f3-0faa-4fc9-de45-08dc11e85c3a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 911684f3-0faa-4fc9-de45-08dc11e85c3a - **Build**: 20240424.4 - **Date Produced**: April 24, 2024 8:13:40 PM UTC - **Commit**: c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][1] - **dotnet-user-jwts**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][1] - **dotnet-user-secrets**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][1] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.5 to 8.0.5][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.5 to 8.0.5][1] - **Microsoft.AspNetCore.Authorization**: [from 8.0.5 to 8.0.5][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][1] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.5 to 8.0.5][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][1] - **Microsoft.AspNetCore.TestHost**: [from 8.0.5 to 8.0.5][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.5 to 8.0.5][1] - **Microsoft.Extensions.ObjectPool**: [from 8.0.5 to 8.0.5][1] - **Microsoft.JSInterop**: [from 8.0.5 to 8.0.5][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2&targetVersion=GCc9e3996173cec136bc2e9f3b4ec45f2a323b1d63&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:911684f3-0faa-4fc9-de45-08dc11e85c3a)
…40701) [release/8.0.3xx] Update dependencies from dotnet/templating
…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
…nals build 20240506.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24216.1 -> To Version 8.0.0-alpha.1.24256.1
…507.2 dotnet-format From Version 8.0.512703 -> To Version 8.3.525702
…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
…509.10 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24230.3 -> To Version 4.10.0-3.24259.10
…0240508.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.301-servicing.24255.1 -> To Version 8.0.301-servicing.24258.1
…509.10 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24230.3 -> To Version 4.10.0-3.24259.10
…0240508.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.301-servicing.24255.1 -> To Version 8.0.301-servicing.24258.1
…509.10 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24230.3 -> To Version 4.10.0-3.24259.10
…0240508.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.301-servicing.24255.1 -> To Version 8.0.301-servicing.24258.1
…509.10 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24230.3 -> To Version 4.10.0-3.24259.10
…0240508.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.301-servicing.24255.1 -> To Version 8.0.301-servicing.24258.1
…509.10 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24230.3 -> To Version 4.10.0-3.24259.10
…0240508.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.301-servicing.24255.1 -> To Version 8.0.301-servicing.24258.1
…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
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
Request triage from a team member
labels
May 14, 2024
v-wuzhai
force-pushed
the
merge/release/8.0.3xx-to-release/8.0.4xx
branch
from
May 15, 2024 09:44
aef5941
to
4cb5ad0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/8.0.3xx branch which have not been merged yet to release/8.0.4xx. I'm a robot and am configured to help you automatically keep release/8.0.4xx up to date, so I've opened this PR.
This PR merges commits made on release/8.0.3xx by the following committers:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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.3xx-to-release/8.0.4xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
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.