From 37e9919a75a7cb445a4099f2ea702ce7e2df86b6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Feb 2023 02:06:06 +0000 Subject: [PATCH 1/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230214.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.115-servicing.23114.12 -> To Version 6.0.115-servicing.23114.25 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.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.14 -> To Version 6.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 31 +++++---------- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 3 files changed, 74 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5c5764a43..3d233477a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,21 @@ - - - + + - - + - - - + - - - + @@ -48,24 +42,17 @@ - - - + - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e35d502d..0df6137f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 5113ad3cecdb59749fed3ff8691b70722133aae2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 5113ad3cecdb59749fed3ff8691b70722133aae2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 5113ad3cecdb59749fed3ff8691b70722133aae2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9ab6d88179966c84260fc580b27cdb719a7e918 + 5113ad3cecdb59749fed3ff8691b70722133aae2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2a90daa2cc41ae8f11a2c1519cb8b235f609251a + 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54e8b61777d42d2b10744d1987438ee5b8c0b24d + c6feacbc6a5f60f6195916b52da2f393ad633de5 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 629fc1a8b3d53b551ea512c4f0294062dcd30afe + 00c7c6fea7bbe254a7612a19f751bc271df05f68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 629fc1a8b3d53b551ea512c4f0294062dcd30afe + 00c7c6fea7bbe254a7612a19f751bc271df05f68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 629fc1a8b3d53b551ea512c4f0294062dcd30afe + 00c7c6fea7bbe254a7612a19f751bc271df05f68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4e740daa15030398b9359046a4724fbcb6542f3 + a50126e69a034f5a6e0663afad31ffc492da283c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e4e740daa15030398b9359046a4724fbcb6542f3 + a50126e69a034f5a6e0663afad31ffc492da283c @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 9f2e9f6ec690ad8f4aea16b33f4a4bcc11b3d2cb + 0d02a9fc71d6e5da74daac3a136042f3790283b2 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index b398591da..90ac6f215 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.114 + 6.0.115 @@ -44,20 +44,20 @@ - 6.0.14 - 6.0.14 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 + 6.0.15 + 6.0.15 + 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.6 0.2.0 - 6.0.115-servicing.23114.12 - 6.0.115-servicing.23114.12 + 6.0.115-servicing.23114.25 + 6.0.115-servicing.23114.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.14-servicing.23073.9 - 6.0.14-servicing.23073.9 - 6.0.14 - 6.0.14 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.6 + 6.0.15 + 6.0.15 + 6.0.15 + 6.0.15 2.1.0 - 6.0.14-servicing.23074.3 - 6.0.14-servicing.23074.3 - 6.0.14 - 6.0.14 + 6.0.15-servicing.23110.5 + 6.0.15-servicing.23110.5 + 6.0.15 + 6.0.15 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.114 + 6.0.115 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.14 + 6.0.15 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 5f707cf2b1cf29c7f187a370e9ca9662608b0f23 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Feb 2023 22:50:29 +0000 Subject: [PATCH 2/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230215.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.115-servicing.23114.12 -> To Version 6.0.115-servicing.23115.29 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.NETCore.Platforms,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.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.14 -> To Version 6.0.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++----- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++------- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d233477a..9d6950b95 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,13 +15,13 @@ - + - + - + @@ -42,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0df6137f5..7d7f39462 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5113ad3cecdb59749fed3ff8691b70722133aae2 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5113ad3cecdb59749fed3ff8691b70722133aae2 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5113ad3cecdb59749fed3ff8691b70722133aae2 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5113ad3cecdb59749fed3ff8691b70722133aae2 + 79ccf1ebf16044d92ecb268fac2ab9370385a9c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 + 22da7ee62549733b6b9bbc954b07c218eb0be3a2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c6feacbc6a5f60f6195916b52da2f393ad633de5 + a0e39d4200f68f564e1543d4df584ef9690fae47 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00c7c6fea7bbe254a7612a19f751bc271df05f68 + 46ea183f02224e86675f0936217d1a554f3c506c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00c7c6fea7bbe254a7612a19f751bc271df05f68 + 46ea183f02224e86675f0936217d1a554f3c506c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 00c7c6fea7bbe254a7612a19f751bc271df05f68 + 46ea183f02224e86675f0936217d1a554f3c506c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a50126e69a034f5a6e0663afad31ffc492da283c + d59c8088920f1956fd606cab7f40af52b747abdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a50126e69a034f5a6e0663afad31ffc492da283c + d59c8088920f1956fd606cab7f40af52b747abdf diff --git a/eng/Versions.props b/eng/Versions.props index 90ac6f215..69a0c826c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,30 +46,30 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23114.6 - 6.0.15-servicing.23114.6 - 6.0.15-servicing.23114.6 - 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.14 + 6.0.15-servicing.23114.14 + 6.0.15-servicing.23114.14 + 6.0.15-servicing.23114.14 0.2.0 - 6.0.115-servicing.23114.25 - 6.0.115-servicing.23114.25 + 6.0.115-servicing.23115.29 + 6.0.115-servicing.23115.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.7 + 6.0.8 - 6.0.15-servicing.23114.6 - 6.0.15-servicing.23114.6 + 6.0.15-servicing.23114.15 + 6.0.15-servicing.23114.15 6.0.15 6.0.15 6.0.15 @@ -78,8 +78,8 @@ - 6.0.15-servicing.23110.5 - 6.0.15-servicing.23110.5 + 6.0.15-servicing.23115.10 + 6.0.15-servicing.23115.10 6.0.15 6.0.15