-
Notifications
You must be signed in to change notification settings - Fork 1.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.1xx' => 'release/8.0.3xx' #45094
Merged
v-wuzhai
merged 27 commits into
release/8.0.3xx
from
merge/release/8.0.1xx-to-release/8.0.3xx
Nov 25, 2024
Merged
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #45094
v-wuzhai
merged 27 commits into
release/8.0.3xx
from
merge/release/8.0.1xx-to-release/8.0.3xx
Nov 25, 2024
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
…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.10 to 8.0.9 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:dd95552e-72fb-4363-9b59-08dbd5a5c3e7) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: dd95552e-72fb-4363-9b59-08dbd5a5c3e7 - **Build**: 20240924.4 - **Date Produced**: September 24, 2024 10:50:51 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][3] - **Microsoft.Extensions.Logging**: [from 8.0.1 to 8.0.1][3] - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.2 to 8.0.2][3] - **Microsoft.Extensions.Logging.Console**: [from 8.0.1 to 8.0.1][3] - **Microsoft.NET.HostModel**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.App.Ref**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.10 to 8.0.10][3] - **Microsoft.NETCore.Platforms**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **System.Configuration.ConfigurationManager**: [from 8.0.1 to 8.0.1][3] - **System.Diagnostics.EventLog**: [from 8.0.1 to 8.0.1][3] - **System.Reflection.MetadataLoadContext**: [from 8.0.1 to 8.0.1][3] - **System.Security.Cryptography.Pkcs**: [from 8.0.1 to 8.0.1][3] - **System.Security.Cryptography.Xml**: [from 8.0.2 to 8.0.2][3] - **System.ServiceProcess.ServiceController**: [from 8.0.1 to 8.0.1][3] - **System.Text.Json**: [from 8.0.5 to 8.0.5][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.10 to 8.0.9][4] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCdcf4a22cf8671c1abe880ebec4cfd906c99588bf&targetVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&_a=files [4]: https://git...
Merge from public release/8.0.1xx to internal/release/8.0.1xx and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Code enhancement and dependency updates. #### PR Summary This pull request introduces a new feature for device ID retrieval and updates several dependencies. - Added `src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs` to implement device ID retrieval and caching across different OS platforms. - Updated dependency versions in `eng/Version.Details.xml` for `Microsoft.Net.Compilers.Toolset`, `Microsoft.CodeAnalysis`, and other related packages. - Modified `NuGet.config` to include additional package sources and update existing ones.
…otnet-runtime build 20241017.7 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.10-servicing.24474.4 -> To Version 8.0.11-servicing.24517.7 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.9 -> To Version 8.0.11 (parent: Microsoft.NETCore.App.Runtime.win-x64
…otnet-aspnetcore build 20241018.1 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.24468.4 -> To Version 8.0.11-servicing.24518.1
…otnet-windowsdesktop build 20241018.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.10 -> To Version 8.0.11 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.10-servicing.24468.10 -> To Version 8.0.11-servicing.24518.4 (parent: Microsoft.WindowsDesktop.App.Ref
…otnet-aspnetcore build 20241018.14 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.11-servicing.24518.1 -> To Version 8.0.11-servicing.24518.14
…otnet-aspnetcore build 20241021.4 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.11-servicing.24518.14 -> To Version 8.0.11-servicing.24521.4
…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.Sdk.WindowsDesktop**: from 8.0.10-servicing.24468.10 to 8.0.11-servicing.24518.4 (parent: Microsoft.WindowsDesktop.App.Ref) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:dd95552e-72fb-4363-9b59-08dbd5a5c3e7) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: dd95552e-72fb-4363-9b59-08dbd5a5c3e7 - **Build**: 20241017.7 - **Date Produced**: October 17, 2024 11:26:32 PM UTC - **Commit**: 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 8.0.10-servicing.24474.4 to 8.0.11-servicing.24517.7][1] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.10 to 8.0.11][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.10 to 8.0.11][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.10 to 8.0.11][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.11][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.10 to 8.0.11][1] - **Microsoft.NETCore.Platforms**: [from 8.0.10-servicing.24474.4 to 8.0.11-servicing.24517.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.10-servicing.24474.4 to 8.0.11-servicing.24517.7][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.10-servicing.24474.4 to 8.0.11-servicing.24517.7][1] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.9 to 8.0.11][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&targetVersion=GC9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5&_a=files [2]: dotnet/emsdk@d667257...f623714 [DependencyUpdate]: <> (End) [marker]: <> (End:dd95552e-72fb-4363-9b59-08dbd5a5c3e7) [marker]: <> (Begin:5ae73aca-14b4-4570-17b0-08dbd53e3897) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 5ae73aca-14b4-4570-17b0-08dbd53e3897 - **Build**: 20241018.1 - **Date Produced**: October 18, 2024 9:36:47 AM UTC - **Commit**: fc878b7641ff2e87598c6425f1a736184deb6619 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.10-servicing.24468.4 to 8.0.11-servicing.24518.1][3] - **dotnet-user-jwts**: [from 8.0.10-servicing.24468.4 to 8.0.11-servicing.24518.1][3] -...
…otnet-aspnetcore build 20241021.16 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.11-servicing.24521.4 -> To Version 8.0.11-servicing.24521.16
…otnet-windowsdesktop build 20241021.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.11 -> To Version 8.0.11 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.11-servicing.24518.4 -> To Version 8.0.11-servicing.24521.7 (parent: Microsoft.WindowsDesktop.App.Ref
…dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:5ae73aca-14b4-4570-17b0-08dbd53e3897) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 5ae73aca-14b4-4570-17b0-08dbd53e3897 - **Build**: 20241021.16 - **Date Produced**: October 22, 2024 1:22:37 AM UTC - **Commit**: 47576478939fdd59b4400ad135f47938af486ab3 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **dotnet-user-jwts**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **dotnet-user-secrets**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.11 to 8.0.11][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.11][1] - **Microsoft.AspNetCore.Authorization**: [from 8.0.11 to 8.0.11][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.11 to 8.0.11][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] - **Microsoft.AspNetCore.TestHost**: [from 8.0.11 to 8.0.11][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.11 to 8.0.11][1] - **Microsoft.Extensions.ObjectPool**: [from 8.0.11 to 8.0.11][1] - **Microsoft.JSInterop**: [from 8.0.11 to 8.0.11][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24521.4 to 8.0.11-servicing.24521.16][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC8e8ededd851fffe2166dd41bf850caabf833d13a&targetVersion=GC47576478939fdd59b4400ad135f47938af486ab3&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5ae73aca-14b4-4570-17b0-08dbd53e3897) [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.24518.4 to 8.0.11-servicing.24521.7 (parent: Microsoft.Windows...
…-merge-8.0.1xx-2024-11-12-1242
…112.12 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12
…0241114.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.112-servicing.24555.9 -> To Version 8.0.112-servicing.24564.2
…15.13 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24052.1 -> To Version 7.0.0-preview.24565.13
…24.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24565.13 -> To Version 7.0.0-preview.24574.1
…124.2 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.8.0-7.24527.6 -> To Version 4.8.0-7.24574.2
github-actions
bot
force-pushed
the
merge/release/8.0.1xx-to-release/8.0.3xx
branch
from
November 24, 2024 18:24
546f42e
to
f93bb0c
Compare
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
Request triage from a team member
labels
Nov 24, 2024
…merge/release/8.0.1xx-to-release/8.0.3xx
v-wuzhai
approved these changes
Nov 25, 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.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:
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.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.
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.