Skip to content

Merging internal commits for release/6.0.1xx#42702

Merged
marcpopMSFT merged 16 commits intodotnet:release/6.0.1xxfrom
vseanreesermsft:internal-merge-6.0.1xx-2024-08-13-1101-0915dcb8-3e9e-47cc-8aa4-74b77876dda2
Aug 13, 2024
Merged

Merging internal commits for release/6.0.1xx#42702
marcpopMSFT merged 16 commits intodotnet:release/6.0.1xxfrom
vseanreesermsft:internal-merge-6.0.1xx-2024-08-13-1101-0915dcb8-3e9e-47cc-8aa4-74b77876dda2

Conversation

@vseanreesermsft
Copy link
Copy Markdown
Contributor

No description provided.

Mirroring and others added 16 commits July 2, 2024 20:01
…otnet-runtime build 20240716.10

Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0
 From Version 6.0.32-servicing.24314.7 -> To Version 6.0.33-servicing.24366.10
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:499cebc0-3291-4ec8-3a4f-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 499cebc0-3291-4ec8-3a4f-08d961c5a689
- **Build**: 20240716.10
- **Date Produced**: July 16, 2024 9:27:15 PM UTC
- **Commit**: 6c636980f730a30c3f5352cff80ce035ae53f016
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.HostModel**: [from 6.0.32-servicing.24314.7 to 6.0.33-servicing.24366.10][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.32 to 6.0.33][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.32-servicing.24314.7 to 6.0.33-servicing.24366.10][1]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.32-servicing.24314.7 to 6.0.33-servicing.24366.10][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe77011b31a3e5c47d931248a64b47f9b2d47853d&targetVersion=GC6c636980f730a30c3f5352cff80ce035ae53f016&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:499cebc0-3291-4ec8-3a4f-08d961c5a689)
…otnet-templating build 20240716.6

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common
 From Version 6.0.132 -> To Version 6.0.133
…dnceng/internal/dotnet-templating

This pull request updates the following dependencies

[marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689
- **Build**: 20240716.6
- **Date Produced**: July 16, 2024 10:51:55 PM UTC
- **Commit**: 2fdb78d36dc993a532bd80ee2682a2b534497413
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.132 to 6.0.133][1]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.132 to 6.0.133][1]
  - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.132 to 6.0.133][1]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.132-servicing.24314.6 to 6.0.133-servicing.24366.6][1]
  - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.132 to 6.0.133][1]
  - **Microsoft.TemplateEngine.Utils**: [from 6.0.132 to 6.0.133][1]
  - **Microsoft.TemplateSearch.Common**: [from 6.0.132 to 6.0.133][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCc86b7556cbdc3e9a5a5226547490713e2e948401&targetVersion=GC2fdb78d36dc993a532bd80ee2682a2b534497413&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689)
…otnet-windowsdesktop build 20240716.6

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0
 From Version 6.0.32 -> To Version 6.0.33

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.32-servicing.24314.4 -> To Version 6.0.33-servicing.24366.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64
…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 6.0.32-servicing.24314.4 to 6.0.33-servicing.24366.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81
- **Build**: 20240716.6
- **Date Produced**: July 17, 2024 3:06:14 AM UTC
- **Commit**: db4e5a36567b85765753af097e878d894a3552c9
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.32 to 6.0.33][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.32-servicing.24314.6 to 6.0.33-servicing.24366.6][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.32-servicing.24314.6 to 6.0.33-servicing.24366.6][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.32-servicing.24314.4 to 6.0.33-servicing.24366.5][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCef2ca68feb305bd9ebc3934b8488526caee3d118&targetVersion=GCdb4e5a36567b85765753af097e878d894a3552c9&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC798cc6d4922db482f84fb72a8244f0da898bc5d6&targetVersion=GCb660c1e83039451abe9d9190a7aabe87c03fd7ae&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81)
…otnet-aspnetcore build 20240718.7

dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0
 From Version 6.0.32-servicing.24314.5 -> To Version 6.0.33-servicing.24368.7
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689
- **Build**: 20240718.7
- **Date Produced**: July 18, 2024 6:10:29 PM UTC
- **Commit**: d917e14cc49f16d7190195501fd43fa4835d274f
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 6.0.32-servicing.24314.5 to 6.0.33-servicing.24368.7][1]
  - **dotnet-user-secrets**: [from 6.0.32-servicing.24314.5 to 6.0.33-servicing.24368.7][1]
  - **Microsoft.AspNetCore.Analyzers**: [from 6.0.32-servicing.24314.5 to 6.0.33-servicing.24368.7][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.32-servicing.24314.5 to 6.0.33-servicing.24368.7][1]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.AspNetCore.Authorization**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.AspNetCore.Components.Web**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.32-servicing.24314.5 to 6.0.33-servicing.24368.7][1]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.32-servicing.24314.5 to 6.0.33-servicing.24368.7][1]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.32-servicing.24314.5 to 6.0.33-servicing.24368.7][1]
  - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport**: [from 6.0.32-servicing.24314.5 to 6.0.33-servicing.24368.7][1]
  - **Microsoft.AspNetCore.Razor.Language**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.AspNetCore.TestHost**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.CodeAnalysis.Razor**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.32 to 6.0.33][1]
  - **Microsoft.JSInterop**: [from 6.0.32 to 6.0.33][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.32-servicing.24314.5 to 6.0.33-servicing.24368.7][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:ffa022ec-0654-4a20-3a4e-08d961c5a689)
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689
- **Build**: 20240729.5
- **Date Produced**: July 29, 2024 6:27:06 PM UTC
- **Commit**: f0f9de5692adf1c0576de062f93c6ab7b176433f
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][1]
  - **dotnet-user-secrets**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][1]
  - **Microsoft.AspNetCore.Analyzers**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.33 to 6.0.33][1]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][1]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.33 to 6.0.33][1]
  - **Microsoft.AspNetCore.Authorization**: [from 6.0.33 to 6.0.33][1]
  - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.33 to 6.0.33][1]
  - **Microsoft.AspNetCore.Components.Web**: [from 6.0.33 to 6.0.33][1]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][1]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][1]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][1]
  - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 6.0.33 to 6.0.33][1]
  - **Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][1]
  - **Microsoft.AspNetCore.Razor.Language**: [from 6.0.33 to 6.0.33][1]
  - **Microsoft.AspNetCore.TestHost**: [from 6.0.33 to 6.0.33][1]
  - **Microsoft.CodeAnalysis.Razor**: [from 6.0.33 to 6.0.33][1]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 6.0.33 to 6.0.33][1]
  - **Microsoft.JSInterop**: [from 6.0.33 to 6.0.33][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:ffa022ec-0654-4a20-3a4e-08d961c5a689)
…-merge-6.0.1xx-2024-08-13-1101-0915dcb8-3e9e-47cc-8aa4-74b77876dda2
@ghost ghost added Area-Infrastructure untriaged Request triage from a team member labels Aug 13, 2024
@marcpopMSFT marcpopMSFT merged commit 7a4cceb into dotnet:release/6.0.1xx Aug 13, 2024
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