From 24b3f328fc7a6d44c7c334392af8afc2df3f856a Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 16 Aug 2024 16:35:28 +0000 Subject: [PATCH] Merged PR 41519: [internal/release/6.0.1xx] Update dependencies from 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... --- NuGet.config | 33 ++++----------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++---------- 3 files changed, 76 insertions(+), 91 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5f91d1c22..f04c70a95 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,31 +7,22 @@ - + - - - - + - + - - - - + - - - - + @@ -52,23 +43,17 @@ - + - + - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df9d76345..0390e975d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 902d4b651242b37d952aedd9ef8b17b9ed766d09 + a9e1ba5cadc1a36be59c59dbb991e6475c91f347 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 902d4b651242b37d952aedd9ef8b17b9ed766d09 + a9e1ba5cadc1a36be59c59dbb991e6475c91f347 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6a984c48f3489b60f25deb72ede6e5051bb130d4 + 43d5519b7b6f2093342515c04b054e88df71729e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b660c1e83039451abe9d9190a7aabe87c03fd7ae + 5429ff1d84d93927157f54d620a0ad9ebf1f10b9 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 849e1a63a8319f9578b9e5f02da592d24d4aa2df + ec74ec8f24328a3e33feda7cc4d5064ef4565220 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 4a792cc04..792836b6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.33-servicing.24366.4 + 6.0.34-servicing.24415.3 - 6.0.33-servicing.24366.5 + 6.0.34-servicing.24415.6 @@ -43,20 +43,20 @@ - 6.0.33 - 6.0.33 - 6.0.33-servicing.24379.5 - 6.0.33-servicing.24379.5 - 6.0.33-servicing.24379.5 - 6.0.33-servicing.24379.5 + 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 0.2.0 - 6.0.133-servicing.24379.12 - 6.0.133-servicing.24379.12 + 6.0.134-servicing.24416.3 + 6.0.134-servicing.24416.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,20 +67,20 @@ - 6.0.33-servicing.24366.10 - 6.0.33-servicing.24366.10 - 6.0.33 - 6.0.33 - 6.0.33 - 6.0.33 + 6.0.34-servicing.24412.10 + 6.0.34-servicing.24412.10 + 6.0.34 + 6.0.34 + 6.0.34 + 6.0.34 2.1.0 - 6.0.33-servicing.24366.6 - 6.0.33-servicing.24366.6 - 6.0.33 - 6.0.33 + 6.0.34-servicing.24415.7 + 6.0.34-servicing.24415.7 + 6.0.34 + 6.0.34 @@ -155,7 +155,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.33 + 6.0.34 $(MicrosoftNETWorkloadEmscriptenManifest60100Version)