From e07c6667fcf27f1bfe5386419d23ff7e3cef9cdf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:57:33 +0000 Subject: [PATCH] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 +++++------ eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 3 files changed, 74 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index 23ba19292..ff90ea0d7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,21 @@ + - - - + + - - - + - - - + @@ -46,19 +42,17 @@ + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e888d0d48..eccf1968a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d6c86fd918b96350521dc48dc996b6231616f0f + 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d6c86fd918b96350521dc48dc996b6231616f0f + 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d6c86fd918b96350521dc48dc996b6231616f0f + 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 06dd1875ed36ef4e2f4a51d5f3b2e8bb41c94fd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + 4c9c993698c298801739cd2dc25efa7ffe700bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f501934867fd4723518c1c7b03c6033c2e52ecad + 823450756bc26a13c44a96ea190c46a77c526e04 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + f472bde6484a7b860c6647cf2ac64fd2870853e0 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 9c963fe06..790254759 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.22-servicing.23424.7 + 6.0.23-servicing.23463.14 - 6.0.22-servicing.23425.2 + 6.0.23-servicing.23463.7 - 6.0.122 + 6.0.123 @@ -44,12 +44,12 @@ - 6.0.22 - 6.0.22 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 0.2.0 @@ -68,20 +68,20 @@ - 6.0.22-servicing.23424.25 - 6.0.22-servicing.23424.25 - 6.0.22 - 6.0.22 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.4 + 6.0.23-servicing.23463.4 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 - 6.0.22-servicing.23425.2 - 6.0.22-servicing.23425.2 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.6 + 6.0.23-servicing.23463.6 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.122 + 6.0.123 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.22 + 6.0.23 $(MicrosoftNETWorkloadEmscriptenManifest60100Version)