From 78a9d66cc130a9249628d2abcc190ccd987b05c7 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 20 Aug 2024 16:35:24 +0000 Subject: [PATCH] Merged PR 41824: [internal/release/6.0.1xx] Update dependencies from 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... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index f04c70a95..ec9d5a504 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,13 +16,13 @@ - + - + - + @@ -43,17 +43,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0390e975d..1910c7046 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a9e1ba5cadc1a36be59c59dbb991e6475c91f347 + be7da2b93dad324ef6399a8f8049a064430ac3be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a9e1ba5cadc1a36be59c59dbb991e6475c91f347 + be7da2b93dad324ef6399a8f8049a064430ac3be - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 43d5519b7b6f2093342515c04b054e88df71729e + a625f79930686c2e7598d0cb0a6ba715ef176e4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5429ff1d84d93927157f54d620a0ad9ebf1f10b9 + 0716b4331761db24b6c5f2f52e8bcd32b6bd065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 792836b6d..b6d8288e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.34-servicing.24415.3 + 6.0.34-servicing.24417.1 - 6.0.34-servicing.24415.6 + 6.0.34-servicing.24417.2 @@ -45,18 +45,18 @@ 6.0.34 6.0.34 - 6.0.34-servicing.24415.2 - 6.0.34-servicing.24415.2 - 6.0.34-servicing.24415.2 - 6.0.34-servicing.24415.2 + 6.0.34-servicing.24417.1 + 6.0.34-servicing.24417.1 + 6.0.34-servicing.24417.1 + 6.0.34-servicing.24417.1 0.2.0 - 6.0.134-servicing.24416.3 - 6.0.134-servicing.24416.3 + 6.0.134-servicing.24419.22 + 6.0.134-servicing.24419.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,8 +67,8 @@ - 6.0.34-servicing.24412.10 - 6.0.34-servicing.24412.10 + 6.0.34-servicing.24416.23 + 6.0.34-servicing.24416.23 6.0.34 6.0.34 6.0.34 @@ -77,8 +77,8 @@ - 6.0.34-servicing.24415.7 - 6.0.34-servicing.24415.7 + 6.0.34-servicing.24419.1 + 6.0.34-servicing.24419.1 6.0.34 6.0.34