From ac49a5f38a5afb454a7f09203e7022e3a573437c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:25:43 +0000 Subject: [PATCH] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.47 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.122-servicing.23416.47 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.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 30 ++++--------- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 80 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index a5401b038..362628a5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,21 @@ - - - + - - - + + - - - + - - - + @@ -49,22 +42,17 @@ - - - + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5581ce16f..1d976fb5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + 4a4636ef3830ce86442952f41f84e4e2a4578c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + 4a4636ef3830ce86442952f41f84e4e2a4578c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + 4a4636ef3830ce86442952f41f84e4e2a4578c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + 7c13ea1f7860cc61a744327e65c18b7b8e25e9f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + 7c13ea1f7860cc61a744327e65c18b7b8e25e9f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0db2312765488a8a77ba6cef692fa53c636a47e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 6e6b474ef5222e55160a289e666bc156f4718f66 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 60d640a5c1025d1e9e89188cabe41e692d0f5468 + f9eee071e6e1ff0d19d2c98306221b63ae1d05a0 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 98528e76f..f39d309eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23416.4 - 6.0.21-servicing.23364.5 + 6.0.22-servicing.23416.8 - 6.0.121 + 6.0.122 @@ -44,20 +44,20 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.22 + 6.0.22 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 0.2.0 - 6.0.121-servicing.23367.13 - 6.0.121-servicing.23367.13 + 6.0.122-servicing.23416.47 + 6.0.122-servicing.23416.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23415.11 + 6.0.22-servicing.23415.11 + 6.0.22 + 6.0.22 + 6.0.22 + 6.0.22 2.1.0 - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23416.7 + 6.0.22-servicing.23416.7 + 6.0.22 + 6.0.22 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.121 + 6.0.122 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.21 + 6.0.22 $(MicrosoftNETWorkloadEmscriptenManifest60100Version)