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

Merging internal commits for release/9.0.2xx #46735

Conversation

vseanreesermsft
Copy link
Contributor

No description provided.

ProductConstructionServiceProd and others added 14 commits January 17, 2025 05:58
…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-9.0.100**: from 9.0.0 to 9.0.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
  - **Microsoft.SourceBuild.Intermediate.emsdk**: from 9.0.0-rtm.24528.2 to 9.0.2-servicing.25061.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:cad9b058-2c13-4353-bfb5-21802792cfae)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: cad9b058-2c13-4353-bfb5-21802792cfae
- **Build**: 20250116.10
- **Date Produced**: January 17, 2025 12:30:05 AM UTC
- **Commit**: 80aa709f5d919c6814726788dc6dabe23e79e672
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.Extensions.DependencyModel**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.Extensions.Logging**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.Extensions.Logging.Console**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.NET.HostModel**: [from 9.0.0-rtm.24528.9 to 9.0.2-servicing.25066.10][1]
  - **Microsoft.NET.ILLink.Tasks**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.NETCore.App.Ref**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.NETCore.Platforms**: [from 9.0.0-rtm.24528.9 to 9.0.2-servicing.25066.10][1]
  - **Microsoft.Win32.SystemEvents**: [from 9.0.0 to 9.0.2][1]
  - **System.CodeDom**: [from 9.0.0 to 9.0.2][1]
  - **System.Composition.AttributedModel**: [from 9.0.0 to 9.0.2][1]
  - **System.Composition.Convention**: [from 9.0.0 to 9.0.2][1]
  - **System.Composition.Hosting**: [from 9.0.0 to 9.0.2][1]
  - **System.Composition.Runtime**: [from 9.0.0 to 9.0.2][1]
  - **System.Composition.TypedParts**: [from 9.0.0 to 9.0.2][1]
  - **System.Configuration.ConfigurationManager**: [from 9.0.0 to 9.0.2][1]
  - **System.Formats.Asn1**: [from 9.0.0 to 9.0.2][1]
  - **System.Reflection.MetadataLoadContext**: [from 9.0.0 to 9.0.2][1]
  - **System.Resources.Extensions**: [from 9.0.0 to 9.0.2][1]
  - **System.Security.Cryptography.Pkcs**: [from 9.0.0 to 9.0.2][1]
  - **System.Security.Cryptography...
…dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-windowsdesktop

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 9.0.0-rtm.24529.2 to 9.0.2-rtm.25067.2 (parent: Microsoft.WindowsDesktop.App.Ref)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24529.1 to 9.0.2-servicing.25066.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.0-rtm.24529.2 to 9.0.2-rtm.25067.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:4b8e39ed-924c-4a3f-90dd-25c2af496092)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 4b8e39ed-924c-4a3f-90dd-25c2af496092
- **Build**: 20250117.4
- **Date Produced**: January 17, 2025 6:37:15 PM UTC
- **Commit**: f971ec245a9aa0e7677b2fe6a565e2979cc59fde
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.0 to 9.0.2][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.0 to 9.0.2][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24529.2 to 9.0.2-servicing.25067.4][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24529.2 to 9.0.2-servicing.25067.4][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.0-rtm.24529.2 to 9.0.2-rtm.25067.2][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.0-rtm.24529.1 to 9.0.2-servicing.25066.8][3]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.0-rtm.24529.2 to 9.0.2-rtm.25067.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC308dc7955704be60afc72ec00902cc18e028c3c2&targetVersion=GCf971ec245a9aa0e7677b2fe6a565e2979cc59fde&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCa04736acb8edb533756131d3d5fc55f15cd03d6a&targetVersion=GC6498db3ee0fbc2790831b28cd47a7b8ef500cb17&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC62ebdb4b0d5cc7e163b8dc9331dc196e576bf162&targetVersion=GCf15a0b2339942cc52d7c24cb82739d8401ead77f&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:4b8e39ed-924c-4a3f-90dd-25c2af496092)

[marker]: <> (Begin:272f8f99-ac31-4bb2-aa9f-c740a38c4313)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 272f8f99-ac31-4bb2-aa9f-c740a38c4313
- **Build**: 20250116.8
- **Date Produced**: January...
Merge from public release/9.0.2xx to internal/release/9.0.2xx and resolve conflicts if necessary

----
#### AI description  (iteration 1)
#### PR Classification
Code addition for framework package definitions.

#### PR Summary
This pull request adds a new file to define framework packages for .NETCoreApp, Version 2.0.
- Added `src/Tasks/Microsoft.NET.Build.Tasks/FrameworkPackages/FrameworkPackages.netcoreapp2.0.cs` to define and register framework packages for .NETCoreApp v2.0.
…otnet-aspnetcore build 20250117.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.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore
 From Version 9.0.2-rtm.25066.8 -> To Version 9.0.2-rtm.25067.4
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:272f8f99-ac31-4bb2-aa9f-c740a38c4313)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 272f8f99-ac31-4bb2-aa9f-c740a38c4313
- **Build**: 20250117.4
- **Date Produced**: January 17, 2025 10:08:58 PM UTC
- **Commit**: 704f7cb1d2cea33afb00c2097731216f121c2c73
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 9.0.2-rtm.25066.8 to 9.0.2-rtm.25067.4][1]
  - **dotnet-user-jwts**: [from 9.0.2-rtm.25066.8 to 9.0.2-rtm.25067.4][1]
  - **dotnet-user-secrets**: [from 9.0.2-rtm.25066.8 to 9.0.2-rtm.25067.4][1]
  - **Microsoft.AspNetCore.Analyzers**: [from 9.0.2-rtm.25066.8 to 9.0.2-rtm.25067.4][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 9.0.2 to 9.0.2][1]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 9.0.2-rtm.25066.8 to 9.0.2-rtm.25067.4][1]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 9.0.2 to 9.0.2][1]
  - **Microsoft.AspNetCore.Authorization**: [from 9.0.2 to 9.0.2][1]
  - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 9.0.2-rtm.25066.8 to 9.0.2-rtm.25067.4][1]
  - **Microsoft.AspNetCore.Components.Web**: [from 9.0.2 to 9.0.2][1]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 9.0.2-rtm.25066.8 to 9.0.2-rtm.25067.4][1]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 9.0.2-rtm.25066.8 to 9.0.2-rtm.25067.4][1]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 9.0.2-rtm.25066.8 to 9.0.2-rtm.25067.4][1]
  - **Microsoft.AspNetCore.TestHost**: [from 9.0.2 to 9.0.2][1]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 9.0.2 to 9.0.2][1]
  - **Microsoft.Extensions.ObjectPool**: [from 9.0.2 to 9.0.2][1]
  - **Microsoft.JSInterop**: [from 9.0.2 to 9.0.2][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0**: [from 9.0.2-rtm.25066.8 to 9.0.2-rtm.25067.4][1]
  - **Microsoft.SourceBuild.Intermediate.aspnetcore**: [from 9.0.2-rtm.25066.8 to 9.0.2-rtm.25067.4][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC1b477e6c45e3a9ffd21a858dbca35816d6042792&targetVersion=GC704f7cb1d2cea33afb00c2097731216f121c2c73&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:272f8f99-ac31-4bb2-aa9f-c740a38c4313)
Merge from public release/9.0.2xx to internal/release/9.0.2xx and resolve conflicts if necessary
Merge from public release/9.0.2xx to internal/release/9.0.2xx and resolve conflicts if necessary
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Feb 11, 2025
@nagilson nagilson enabled auto-merge February 11, 2025 21:14
@nagilson nagilson merged commit 1cbaff0 into dotnet:release/9.0.2xx Feb 11, 2025
29 of 30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants