[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' #46104
+151
−127
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}
…rther information regarding this change.
Create Subdirectory for Temp Deps.Json File. Please contact me for further information regarding this change. ---- #### AI description (iteration 1) #### PR Classification Code cleanup #### PR Summary This pull request refactors the creation of a temporary `deps.json` file by placing it in a subdirectory. - `src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs`: Changed the temporary file creation to use a subdirectory for better organization.
…dnceng/internal/dotnet-runtime 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.11 to 8.0.12 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:471db9b4-49ec-4921-de46-08dc11e85c3a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 471db9b4-49ec-4921-de46-08dc11e85c3a - **Build**: 20241203.5 - **Date Produced**: December 3, 2024 11:28:49 PM UTC - **Commit**: 89ef51c5d8f5239345127a1e282e11036e590c8b - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.11 to 8.0.12][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.11 to 8.0.12][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.11 to 8.0.12][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.12][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.11 to 8.0.12][1] - **Microsoft.NETCore.Platforms**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.11 to 8.0.12][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5&targetVersion=GC89ef51c5d8f5239345127a1e282e11036e590c8b&_a=files [2]: dotnet/emsdk@f623714...c458a76 [DependencyUpdate]: <> (End) [marker]: <> (End:471db9b4-49ec-4921-de46-08dc11e85c3a)
…dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-windowsdesktop 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**: 20241203.12 - **Date Produced**: December 4, 2024 7:28:32 AM UTC - **Commit**: 31d685b2d9a86ca1243014d175a3da813f78e428 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2] - **dotnet-user-jwts**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2] - **dotnet-user-secrets**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.11 to 8.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.12][2] - **Microsoft.AspNetCore.Authorization**: [from 8.0.11 to 8.0.12][2] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.11 to 8.0.12][2] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2] - **Microsoft.AspNetCore.TestHost**: [from 8.0.11 to 8.0.12][2] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.11 to 8.0.12][2] - **Microsoft.Extensions.ObjectPool**: [from 8.0.11 to 8.0.12][2] - **Microsoft.JSInterop**: [from 8.0.11 to 8.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.12][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC47576478939fdd59b4400ad135f47938af486ab3&targetVersion=GC31d685b2d9a86ca1243014d175a3da813f78e428&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:911684f3-0faa-4fc9-de45-08dc11e85c3a) [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.Sdk.WindowsDesktop**: from 8.0.11-servicing.24521.7 to 8.0.12-servicing.24603.5 (parent:...
…114.8 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.25056.12 -> To Version 4.10.0-3.25064.8
…merge/release/8.0.1xx-to-release/8.0.3xx
…114.11 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25064.11
…0250116.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.309-servicing.25062.11 -> To Version 8.0.309-servicing.25066.1
…116.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25064.11 -> To Version 8.0.0-beta.25066.6
github-actions
bot
force-pushed
the
merge/release/8.0.3xx-to-release/8.0.4xx
branch
from
2a09d37 to
a20aef7
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.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
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://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.