[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' #20223
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}
…dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240816.3 - **Date Produced**: August 16, 2024 4:11:37 PM UTC - **Commit**: a9e1ba5cadc1a36be59c59dbb991e6475c91f347 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.134-servicing.24415.30 to 6.0.134-servicing.24416.3][12] - **Microsoft.NET.Sdk**: [from 6.0.134-servicing.24415.30 to 6.0.134-servicing.24416.3][12] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][13] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][13] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][13] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][13] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.33-servicing.24366.4 to 6.0.34-servicing.24415.3][14] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][13] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.33-servicing.24366.5 to 6.0.34-servicing.24415.6][15] [12]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC545b7dde3f8761587e5dae23dcda07a185ef5d3e&targetVersion=GCa9e1ba5cadc1a36be59c59dbb991e6475c91f347&_a=files [13]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC526b783fc75e702512a29ede591c4335dce62d6f&targetVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&_a=files [14]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC6a984c48f3489b60f25deb72ede6e5051bb130d4&targetVersion=GC43d5519b7b6f2093342515c04b054e88df71729e&_a=files [15]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb660c1e83039451abe9d9190a7aabe87c03fd7ae&targetVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) [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.WindowsDesktop.App.Ref**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7 (parent: Microso...
Fixes dotnet/source-build#4565 Update MsftToSbSdk.diff Coordinated in Servicing channel - got approval for this to go in. ---- #### AI description (iteration 1) #### PR Classification Code cleanup and update of baseline diff file. #### PR Summary This pull request updates the `MsftToSbSdk.diff` file to reflect recent changes in the SDK and package references. - `MsftToSbSdk.diff`: Removed several references to `.dll` and `.xml` files under `Microsoft.AspNetCore.App.Ref` and `Microsoft.NETCore.App.Host.portable-rid`. - `MsftToSbSdk.diff`: Added new references under `Microsoft.NETCore.App.Host.banana-rid`. - `MsftToSbSdk.diff`: Adjusted entries for `System.Formats.Asn1.dll` and `System.Security.AccessControl.dll` in the `FSharp` and `System` directories.
…dnceng/internal/dotnet-sdk 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.WindowsDesktop.App.Ref**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.34-servicing.24415.3 to 6.0.34-servicing.24417.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240819.22 - **Date Produced**: August 19, 2024 6:47:18 PM UTC - **Commit**: be7da2b93dad324ef6399a8f8049a064430ac3be - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.134-servicing.24417.7 to 6.0.134-servicing.24419.22][6] - **Microsoft.NET.Sdk**: [from 6.0.134-servicing.24417.7 to 6.0.134-servicing.24419.22][6] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][7] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][7] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][7] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][7] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.34-servicing.24415.3 to 6.0.34-servicing.24417.1][8] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][7] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2][9] [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC436bce461faaa2dbf929d7b4055fc3568bb41173&targetVersion=GC...
…otnet-sdk build 20240910.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.134-servicing.24419.22 -> To Version 6.0.135-servicing.24460.6 Dependency coherency updates Microsoft.Build From Version 17.0.3 -> To Version 17.0.4 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk 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.Build**: from 17.0.3 to 17.0.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240910.6 - **Date Produced**: September 10, 2024 5:31:35 PM UTC - **Commit**: 6e8de6c1f8a4e7f411709ebe03154a1a721b95ee - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.134-servicing.24419.22 to 6.0.135-servicing.24460.6][1] - **Microsoft.NET.Sdk**: [from 6.0.134-servicing.24419.22 to 6.0.135-servicing.24460.6][1] - **Microsoft.Build**: [from 17.0.3 to 17.0.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbe7da2b93dad324ef6399a8f8049a064430ac3be&targetVersion=GC6e8de6c1f8a4e7f411709ebe03154a1a721b95ee&_a=files [2]: dotnet/msbuild@d679d20...85d7107 [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
…otnet-sdk build 20240911.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24460.6 -> To Version 6.0.135-servicing.24461.11 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.34 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk 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.NETCore.App.Ref**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.34-servicing.24417.1 to 6.0.35-servicing.24454.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.34-servicing.24417.1 to 6.0.35-servicing.24454.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.34-servicing.24417.1 to 6.0.35-servicing.24454.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.34-servicing.24417.1 to 6.0.35-servicing.24454.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.34 to 6.0.35 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240911.11 - **Date Produced**: September 11, 2024 9:34:54 PM UTC - **Commit**: 715cbd3538e523200b3f06ff794f5c76ff14b52c - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.135-servicing.24460.6 to 6.0.135-servicing.24461.11][1] - **Microsoft.NET.Sdk**: [from 6.0.135-servicing.24460.6 to 6.0.135-servicing.24461.11][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.34 to 6.0.35][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.35][2] - **Microsoft.NETC...
…otnet-sdk build 20240912.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24461.11 -> To Version 6.0.135-servicing.24462.28 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.34 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk
[release/6.0.1xx] Update dependencies from dotnet/arcade
…dnceng/internal/dotnet-sdk 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.WindowsDesktop.App.Ref**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.34-servicing.24419.1 to 6.0.35-servicing.24462.8 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.34-servicing.24419.1 to 6.0.35-servicing.24462.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.35-servicing.24454.6 to 6.0.35-servicing.24462.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.35-servicing.24454.6 to 6.0.35-servicing.24462.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.35-servicing.24454.6 to 6.0.35-servicing.24462.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.35-servicing.24454.6 to 6.0.35-servicing.24462.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.34-servicing.24417.1 to 6.0.35-servicing.24461.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.34-servicing.24417.2 to 6.0.35-servicing.24462.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240912.28 - **Date Produced**: September 12, 2024 9:52:45 PM UTC - **Commit**: b534695f6db2baff61acfb1c6bdebe610784dc40 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.135-servicing.24461.11 to 6.0.135-servicing.24462.28][1] - **Microsoft.NET.Sdk**: [from 6.0.135-servicing.24461.11 to 6.0.135-servicing.24462.28][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.35][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicin...
…otnet-sdk build 20240913.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24462.28 -> To Version 6.0.135-servicing.24463.12 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.35 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk
Fixes dotnet/source-build#4604 Update MsftToSbSdk.diff ---- #### AI description (iteration 1) #### PR Classification Code cleanup to update the `MsftToSbSdk.diff` file. #### PR Summary This pull request updates the `MsftToSbSdk.diff` file to clean up and correct the list of SDK files. - `src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff`: Removed redundant entries and corrected the placement of `System.Text.Json.dll` and `System.Windows.Extensions.dll`.
…dnceng/internal/dotnet-sdk 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.AspNetCore.App.Ref**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240913.12 - **Date Produced**: September 13, 2024 7:19:36 PM UTC - **Commit**: fdf329d6a9732c1c30d644cfa98e0ed05351c08b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.135-servicing.24462.28 to 6.0.135-servicing.24463.12][1] - **Microsoft.NET.Sdk**: [from 6.0.135-servicing.24462.28 to 6.0.135-servicing.24463.12][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.35 to 6.0.35][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.35 to 6.0.35][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14][2] - **dotnet-dev-certs**: [from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14][2] - **dotnet-user-secrets**: [from 6.0.35-servicing.24462.3 to 6.0.35-servicing.24462.14][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb534695f6db2baff61acfb1c6bdebe610784dc40&targetVersion=GCfdf329d6a9732c1c30d644cfa98e0ed05351c08b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC1ad4097713d52a22315021099f2a185ae68abbe1&targetVersion=GC827b96040e62e5aa47d829bfa61c000d315d4f2e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
…otnet-sdk build 20240913.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24463.12 -> To Version 6.0.135-servicing.24463.29
…otnet-sdk build 20240913.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24463.29 -> To Version 6.0.135-servicing.24463.32 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.35 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk
…dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240913.32 - **Date Produced**: September 13, 2024 11:55:51 PM UTC - **Commit**: 040861c1545b11ae75ad0a86c40af20239913b49 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.135-servicing.24463.29 to 6.0.135-servicing.24463.32][2] - **Microsoft.NET.Sdk**: [from 6.0.135-servicing.24463.29 to 6.0.135-servicing.24463.32][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.35 to 6.0.35][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.35 to 6.0.35][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.35-servicing.24461.4 to 6.0.35-servicing.24462.9][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.35 to 6.0.35][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.35-servicing.24462.2 to 6.0.35-servicing.24462.14][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe96b946ceaed31f6c4b70216f9570bf2f9800614&targetVersion=GC040861c1545b11ae75ad0a86c40af20239913b49&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3&targetVersion=GCfc5b097885ceb7463eb7163477356a39a359846f&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1e8489e39e0709c40aa5540825b5e9e2c1c5a23b&targetVersion=GC9b5f402943986a66dfca2b6f4312cfca19d75c17&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe&targetVersion=GCc9e44425226553e639116ff82698cfd2808f7769&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) [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.WindowsDesktop.App.Ref**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Comm...
Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Code cleanup and script updates. #### PR Summary This pull request merges changes from the public repository, focusing on cleaning up and updating build and post-build scripts. - Added `nuget-verification.ps1` to verify Microsoft NuGet packages. - Removed `post-build-utils.ps1`, `trigger-subscriptions.ps1`, and `add-build-to-channel.ps1`. - Updated `publish-build-assets.yml` to use `AzureCLI@2` instead of `PowerShell@2`. - Updated `setup-maestro-vars.yml` to use `AzureCLI@2` instead of `PowerShell@2`. - Updated dependencies in `Version.Details.xml`.
…otnet-sdk build 20240916.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24463.32 -> To Version 6.0.135-servicing.24466.15 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.133 -> To Version 6.0.135 (parent: Microsoft.NET.Sdk
…otnet-sdk build 20240916.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24466.15 -> To Version 6.0.135-servicing.24466.24
…dnceng/internal/dotnet-sdk 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.DotNet.Common.ItemTemplates**: from 6.0.133 to 6.0.135 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.133-servicing.24417.2 to 6.0.135-servicing.24466.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.133 to 6.0.135 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240916.24 - **Date Produced**: September 16, 2024 10:45:48 PM UTC - **Commit**: 954f381d16c2d44b573890786ca2d071c217a433 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.135-servicing.24466.15 to 6.0.135-servicing.24466.24][3] - **Microsoft.NET.Sdk**: [from 6.0.135-servicing.24466.15 to 6.0.135-servicing.24466.24][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC01eda4dbc7ddd567ef7c4dbedf11fa206d8e7105&targetVersion=GC954f381d16c2d44b573890786ca2d071c217a433&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
[release/6.0.1xx] Update dependencies from dotnet/arcade
…-merge-6.0.1xx-2024-10-08-1027
Co-authored-by: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com>
…008.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24463.1 -> To Version 6.0.0-beta.24508.2
…into merge/release/6.0.1xx-to-release/6.0.4xx
…into merge/release/6.0.4xx-to-release/8.0.1xx
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…nals build 20241016.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24510.2 -> To Version 8.0.0-alpha.1.24516.2
…als (#20210) [release/8.0.3xx] Update dependencies from dotnet/source-build-externals
…into merge/release/8.0.1xx-to-release/8.0.3xx
[release/8.0.3xx] Update dependencies from dotnet/arcade
…into merge/release/8.0.3xx-to-release/8.0.4xx
MiYanni
approved these changes
Nov 7, 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.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.
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.