From f0a82614777ab0a55a514221757b775d1bfcb128 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 Feb 2023 19:15:28 +0000 Subject: [PATCH] Merged PR 29731: [internal/release/6.0.4xx] 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.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23117.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23117.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230218.3 - **Date Produced**: February 18, 2023 5:55:20 PM UTC - **Commit**: 4b16338ed0bf771a31b2ecad1f7d342b94148615 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.407-servicing.23117.4 to 6.0.407-servicing.23118.3][1] - **Microsoft.NET.Sdk**: [from 6.0.407-servicing.23117.4 to 6.0.407-servicing.23118.3][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.15-servicing.23115.10 to 6.0.15-servicing.23117.9][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23074.2 to 6.0.15-servicing.23117.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.14-servicing.23074.3 to 6.0.15-servicing.23117.5][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC62fcdba&targetVersion=GC4b16338&_a=files [2]: https://dev... --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index bfd18eeea..f6f29d76e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,12 +17,9 @@ - - - - + @@ -49,12 +46,9 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e4a1bf4a..ee6a74782 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 + 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62fcdba42952b2e66c959c1dd513de609c40d84b + 4b16338ed0bf771a31b2ecad1f7d342b94148615 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 62fcdba42952b2e66c959c1dd513de609c40d84b + 4b16338ed0bf771a31b2ecad1f7d342b94148615 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 + 1808f3abeb2af5809325c218ec752ab185df6678 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9e190e3d952203836d77bb0f1c42984524e1122d + c68b021c8a031d8f1bf757dc16e44c10ed8c820e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8450953cc..13723ff18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.14-servicing.23074.2 + 6.0.15-servicing.23117.2 - 6.0.14-servicing.23074.3 + 6.0.15-servicing.23117.5 @@ -56,8 +56,8 @@ - 6.0.407-servicing.23117.4 - 6.0.407-servicing.23117.4 + 6.0.407-servicing.23118.3 + 6.0.407-servicing.23118.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.15-servicing.23115.10 - 6.0.15-servicing.23115.10 + 6.0.15-servicing.23117.9 + 6.0.15-servicing.23117.9 6.0.15 6.0.15