[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' #44035
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…3 repositories This pull request updates the following dependencies [marker]: <> (Begin:1ab2aba6-b648-40a9-9fe8-08dca2920c50) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 1ab2aba6-b648-40a9-9fe8-08dca2920c50 - **Build**: 20240816.3 - **Date Produced**: August 16, 2024 7:27:15 PM UTC - **Commit**: 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][11] - **dotnet-user-jwts**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][11] - **dotnet-user-secrets**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][11] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][11] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.9 to 8.0.9][11] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][11] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.9 to 8.0.9][11] - **Microsoft.AspNetCore.Authorization**: [from 8.0.9 to 8.0.9][11] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][11] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.9 to 8.0.9][11] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][11] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][11] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][11] - **Microsoft.AspNetCore.TestHost**: [from 8.0.9 to 8.0.9][11] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.9 to 8.0.9][11] - **Microsoft.Extensions.ObjectPool**: [from 8.0.9 to 8.0.9][11] - **Microsoft.JSInterop**: [from 8.0.9 to 8.0.9][11] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.9-servicing.24415.5 to 8.0.9-servicing.24416.3][11] [11]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC41f1ec2243c96ee6f316cf6a714bfb2c426ff9b3&targetVersion=GC23b93b402cc7df84a0a21b24d0f542a1dd3d96f2&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1ab2aba6-b648-40a9-9fe8-08dca2920c50) [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:/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 8.0.8-servicing.24366.7 to 8.0.9-servicing.24416.4 (parent: Microsoft.WindowsDesktop.App...
Add System.Diagnostics.EventLog to CPM Cherry-picked from commit `f423d4b6`. ---- #### AI description (iteration 1) #### PR Classification New feature: Added support for `System.Diagnostics.EventLog`. #### PR Summary This pull request adds the `System.Diagnostics.EventLog` package to the project dependencies. - Updated `/eng/Version.Details.xml` to include `System.Diagnostics.EventLog` version 8.0.0. - Modified `/Directory.Packages.props` to reference `System.Diagnostics.EventLog`. - Added `SystemDiagnosticsEventLogPackageVersion` to `/eng/Versions.props`.
…dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:82bc8158-ef88-4a27-3f7b-08dca299e604) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 82bc8158-ef88-4a27-3f7b-08dca299e604 - **Build**: 20240815.9 - **Date Produced**: August 16, 2024 2:25:38 AM UTC - **Commit**: 3c8202d88deea14a87c7665190286d2a67e464c0 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **System.Diagnostics.EventLog**: [from 8.0.0 to 8.0.1][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5535e31a712343a63f5d7d796cd874e563e5ac14&targetVersion=GC3c8202d88deea14a87c7665190286d2a67e464c0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:82bc8158-ef88-4a27-3f7b-08dca299e604)
Merge from public release/8.0.4xx to internal/release/8.0.4xx and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Code update to merge changes from the public repository into the internal release branch. #### PR Summary This pull request updates various dependencies and adds new functionality for handling Docker credentials. - Updated dependency versions in `/eng/Version.Details.xml`. - Added methods to `src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs` for retrieving Docker credentials from environment variables based on registry mode.
Merge from public release/8.0.4xx to internal/release/8.0.4xx and resolve conflicts if necessary
System.Reflection.Metadata 8.0.0 Microsoft.Extensions.DependencyInjection 8.0.0
…uiltBaseline.xml Updated SourceBuildPrebuiltBaseline.xml - add prebuilt System.Reflection.Metadata 8.0.0 Microsoft.Extensions.DependencyInjection 8.0.0 ---- #### AI description (iteration 1) #### PR Classification Documentation update. #### PR Summary Updated `SourceBuildPrebuiltBaseline.xml` to include additional usage patterns for specific package versions. - `eng/SourceBuildPrebuiltBaseline.xml`: Added usage patterns for `Microsoft.Extensions.DependencyInjection/*8.0.0*` and `System.Reflection.Metadata/*8.0.0*`.
…otnet-aspnetcore build 20240913.9 dotnet-dev-certs , dotnet-user-jwts , 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.SdkAnalyzers , 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.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.10-servicing.24462.15 -> To Version 8.0.10-servicing.24463.9
…dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:1ab2aba6-b648-40a9-9fe8-08dca2920c50) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 1ab2aba6-b648-40a9-9fe8-08dca2920c50 - **Build**: 20240913.9 - **Date Produced**: September 13, 2024 11:18:43 PM UTC - **Commit**: c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.10-servicing.24462.15 to 8.0.10-servicing.24463.9][1] - **dotnet-user-jwts**: [from 8.0.10-servicing.24462.15 to 8.0.10-servicing.24463.9][1] - **dotnet-user-secrets**: [from 8.0.10-servicing.24462.15 to 8.0.10-servicing.24463.9][1] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.10-servicing.24462.15 to 8.0.10-servicing.24463.9][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.10 to 8.0.10][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.10-servicing.24462.15 to 8.0.10-servicing.24463.9][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.10][1] - **Microsoft.AspNetCore.Authorization**: [from 8.0.10 to 8.0.10][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.10-servicing.24462.15 to 8.0.10-servicing.24463.9][1] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.10 to 8.0.10][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.10-servicing.24462.15 to 8.0.10-servicing.24463.9][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.10-servicing.24462.15 to 8.0.10-servicing.24463.9][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.10-servicing.24462.15 to 8.0.10-servicing.24463.9][1] - **Microsoft.AspNetCore.TestHost**: [from 8.0.10 to 8.0.10][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.10 to 8.0.10][1] - **Microsoft.Extensions.ObjectPool**: [from 8.0.10 to 8.0.10][1] - **Microsoft.JSInterop**: [from 8.0.10 to 8.0.10][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.10-servicing.24462.15 to 8.0.10-servicing.24463.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCdd48611ed11af2f989057ba2f69d94ddf2a1992d&targetVersion=GCc65d3350a9a305eec3162c2d18dc4b1d0cd267c7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1ab2aba6-b648-40a9-9fe8-08dca2920c50)
…ml - downgrade EventLog to rtm Updated Version.Details.xml - downgrade EventLog to rtm Cherry-picked from commit `48ef5a7c`. ---- #### AI description (iteration 1) #### PR Classification Dependency version update. #### PR Summary This pull request downgrades the `System.Diagnostics.EventLog` dependency to version 8.0.0 in preparation for the 8.0.4xx release. - Updated `System.Diagnostics.EventLog` version from 8.0.1 to 8.0.0 in `/eng/Version.Details.xml` - Adjusted the corresponding SHA to match the downgraded version.
…Updated Version.Details.x... Revert "Merged PR 42941: [internal/release/8.0.4xx] Updated Version.Details.xml - downgrade EventLog to rtm Updated Version.Details.xml - downgrade EventLog to rtm Cherry-picked from commit `48ef5a7c`. ---- #### AI description (iteration 1) #### PR Classification Revert of a previous version update. #### PR Summary This pull request reverts changes made in a previous PR that updated the version of `System.Diagnostics.EventLog`. - Reverted `System.Diagnostics.EventLog` version from `8.0.1` back to `8.0.0` in `/eng/Version.Details.xml`. - Reverted `SystemDiagnosticsEventLogPackageVersion` from `8.0.1` back to `8.0.0` in `/eng/Versions.props`.
Real build https://dev.azure.com/dnceng/internal/_build/results?buildId=2537419&view=results ---- #### AI description (iteration 1) #### PR Classification Dependency update. #### PR Summary This pull request updates the Roslyn dependencies to version 4.11.0-3.24462.14 to support STJ 8.0.5. - Updated Roslyn dependencies in `eng/Version.Details.xml`. - Updated Roslyn package versions in `eng/Versions.props`.
…3 repositories This pull request updates the following dependencies [marker]: <> (Begin:82bc8158-ef88-4a27-3f7b-08dca299e604) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 82bc8158-ef88-4a27-3f7b-08dca299e604 - **Build**: 20240916.10 - **Date Produced**: September 17, 2024 10:28:54 PM UTC - **Commit**: 81cabf2857a01351e5ab578947c7403a5b128ad1 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.DependencyModel**: [from 8.0.2 to 8.0.2][1] - **Microsoft.Extensions.Logging**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.2 to 8.0.2][1] - **Microsoft.Extensions.Logging.Console**: [from 8.0.1 to 8.0.1][1] - **Microsoft.NET.HostModel**: [from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10][1] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.Platforms**: [from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10][1] - **System.Configuration.ConfigurationManager**: [from 8.0.1 to 8.0.1][1] - **System.Diagnostics.EventLog**: [from 8.0.1 to 8.0.1][2] - **System.Reflection.MetadataLoadContext**: [from 8.0.1 to 8.0.1][1] - **System.Security.Cryptography.Pkcs**: [from 8.0.1 to 8.0.1][1] - **System.Security.Cryptography.Xml**: [from 8.0.2 to 8.0.2][1] - **System.ServiceProcess.ServiceController**: [from 8.0.1 to 8.0.1][1] - **System.Text.Json**: [from 8.0.5 to 8.0.5][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCa8108c906081c3c0198f250fb210c1dd275b2f01&targetVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC7dc1560dfb4ff946388512ef439fcb44f294b32a&targetVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:82bc8158-ef88-4a27-3f7b-08dca299e604) [marker]: <> (Begin:1ab2aba6-b648-40a9-9fe8-08dca2920c50) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 1ab2aba6-b648-40a9-9fe8-08dca2920c50 - **Build**: 20240917.7 - **Date Produced**: September 18, 2024 2:05:29 AM UTC - **Commit**: e21371388879fd8762e0043a825a1ab77901fe66 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.10-servicing.244...
Real build is https://dev.azure.com/dnceng/internal/_build/results?buildId=2541851&view=results Matching branch is `release/8.x` https:/dotnet/format @ release/8.x -> .NET 8 https:/dotnet/format (.NET 8) ==> 'https:/dotnet/sdk' ('release/8.0.4xx') ---- #### AI description (iteration 1) #### PR Classification Dependency update. #### PR Summary This pull request updates the version of the `dotnet-format` dependency to a newer version. - Updated `dotnet-format` version in `/eng/Version.Details.xml` from `8.3.545404` to `8.3.546805`. - Updated `dotnet-format` package source key in `/NuGet.config`. - Updated `dotnetformatVersion` property in `/eng/Versions.props` to `8.3.546805`.
Real build: https://dev.azure.com/dnceng/internal/_build/results?buildId=2542057&view=results Flow from https:/dotnet/roslyn (VS 17.11) ==> 'https:/dotnet/sdk' ('release/8.0.4xx') ---- #### AI description (iteration 1) #### PR Classification Dependency update. #### PR Summary This pull request updates the Roslyn dependencies to a newer version. - Updated Roslyn dependencies in `eng/Version.Details.xml` to version `4.11.0-3.24468.6`. - Updated Roslyn package versions in `eng/Versions.props` to version `4.11.0-3.24468.6`.
…004.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24504.2
…-merge-8.0.4xx-2024-10-08-1037
…0241008.6 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.403-servicing.24461.9 -> To Version 8.0.404-servicing.24508.6
…008.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.402-beta.24477.4 -> To Version 8.0.403-beta.24508.1
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
|
There were actually no changes after all the merge conflicts were resolved. @marcpopMSFT Was there some sort of change to this automated interbranch flow? I feel like it used to be better at cherry picking only the actual changes but maybe it's always been like this |
This was referenced Oct 10, 2024
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.4xx branch which have not been merged yet to release/9.0.1xx. I'm a robot and am configured to help you automatically keep release/9.0.1xx up to date, so I've opened this PR.
This PR merges commits made on release/8.0.4xx 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.4xx-to-release/9.0.1xx'. 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 (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https:/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.