From 6230481164c5b13e7e9405a4a03602b4f9bce341 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jan 2023 19:59:21 +0000 Subject: [PATCH 01/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.113-servicing.22601.32 -> To Version 6.0.114-servicing.23055.18 --- NuGet.config | 14 ++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6534504cb..a306c873b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,13 @@ + + + + @@ -19,9 +23,13 @@ + + + + @@ -42,6 +50,8 @@ + + @@ -49,9 +59,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca15599a1..203e6ecdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 960df16f91babfcfa4276c84579d67d7af8bf542 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 386bb5e6412bd32d06d293c60c16d1ff49b9e686 + 5942dec60fa9e168e7fd5297f72265605124ea66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 386bb5e6412bd32d06d293c60c16d1ff49b9e686 + 5942dec60fa9e168e7fd5297f72265605124ea66 diff --git a/eng/Versions.props b/eng/Versions.props index 8c37d5e87..92995f1db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.113-servicing.22601.32 - 6.0.113-servicing.22601.32 + 6.0.114-servicing.23055.18 + 6.0.114-servicing.23055.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c1450fc792efcedc331e1900d086a964ef08bbd6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 6 Jan 2023 22:01:17 +0000 Subject: [PATCH 02/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230106.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.113-servicing.22601.32 -> To Version 6.0.114-servicing.23056.17 Dependency coherency updates NuGet.Build.Tasks From Version 6.0.3-rc.1 -> To Version 6.0.4-rc.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 203e6ecdf..79a449437 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 960df16f91babfcfa4276c84579d67d7af8bf542 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5942dec60fa9e168e7fd5297f72265605124ea66 + ec574baa3224491fe7ca8941fb5815dc8bf738ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5942dec60fa9e168e7fd5297f72265605124ea66 + ec574baa3224491fe7ca8941fb5815dc8bf738ff @@ -151,9 +151,9 @@ b177f8fa703370c80b2e56469208c2bb099efba0 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - c60eee85ec0109bdda894806b167bb4d55f75183 + + https://github.com/nuget/nuget.client + 822425710cec4e49c9344ada58c21c7d3223973b diff --git a/eng/Versions.props b/eng/Versions.props index 92995f1db..2a7c632f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23055.18 - 6.0.114-servicing.23055.18 + 6.0.114-servicing.23056.17 + 6.0.114-servicing.23056.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e03d74bf13b332f99d13edac2b4e798af6262352 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 19:49:07 +0000 Subject: [PATCH 03/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23056.17 -> To Version 6.0.114-servicing.23059.12 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79a449437..c8f4177fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 960df16f91babfcfa4276c84579d67d7af8bf542 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec574baa3224491fe7ca8941fb5815dc8bf738ff + 0bee5cce29cff87875df1e476847d51e8d98f7a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec574baa3224491fe7ca8941fb5815dc8bf738ff + 0bee5cce29cff87875df1e476847d51e8d98f7a8 diff --git a/eng/Versions.props b/eng/Versions.props index 2a7c632f2..aec0f5c5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23056.17 - 6.0.114-servicing.23056.17 + 6.0.114-servicing.23059.12 + 6.0.114-servicing.23059.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84dc3b63bf94a22f19f5d18fbaeae736d0e7dce4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 21:29:18 +0000 Subject: [PATCH 04/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23056.17 -> To Version 6.0.114-servicing.23059.15 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++++-------- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index a306c873b..45a6f9cab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -19,12 +17,10 @@ - + - - - + @@ -50,18 +46,14 @@ - - - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8f4177fa..a8d5ffdb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 397c48f9f7a86672e097f53155c255bc89068e8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1af80ba017f6f7644305e1781d8cc9845a92b5f8 + 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 50b7e9c661453874aa7a54a3985d5120564bb2e5 + 2ea0773859e661c388b39f94393dfb2fc3ea1aec https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 960df16f91babfcfa4276c84579d67d7af8bf542 + b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bee5cce29cff87875df1e476847d51e8d98f7a8 + 87d31f267ed4d8548b5b5744b97732bd06f4ee90 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bee5cce29cff87875df1e476847d51e8d98f7a8 + 87d31f267ed4d8548b5b5744b97732bd06f4ee90 diff --git a/eng/Versions.props b/eng/Versions.props index aec0f5c5e..2ad738733 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.113 + 6.0.114 @@ -44,20 +44,20 @@ - 6.0.13 - 6.0.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 - 6.0.13-servicing.22580.13 + 6.0.14 + 6.0.14 + 6.0.14-servicing.23056.13 + 6.0.14-servicing.23056.13 + 6.0.14-servicing.23056.13 + 6.0.14-servicing.23056.13 0.2.0 - 6.0.114-servicing.23059.12 - 6.0.114-servicing.23059.12 + 6.0.114-servicing.23059.15 + 6.0.114-servicing.23059.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.13-servicing.22580.9 - 6.0.13-servicing.22580.9 - 6.0.13 - 6.0.13 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23056.8 + 6.0.14-servicing.23056.8 + 6.0.14 + 6.0.14 + 6.0.14 + 6.0.14 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.113 + 6.0.114 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 3cda9235ed483273ffdb8cd757c9556ba28eb245 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 18:50:39 +0000 Subject: [PATCH 05/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23059.15 -> To Version 6.0.114-servicing.23060.9 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8d5ffdb8..5d692c16a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 87d31f267ed4d8548b5b5744b97732bd06f4ee90 + 7429970b7e3a68c9ad8a8e69cc75cd64009b7126 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 87d31f267ed4d8548b5b5744b97732bd06f4ee90 + 7429970b7e3a68c9ad8a8e69cc75cd64009b7126 diff --git a/eng/Versions.props b/eng/Versions.props index 2ad738733..5d2c211bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23059.15 - 6.0.114-servicing.23059.15 + 6.0.114-servicing.23060.9 + 6.0.114-servicing.23060.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f1d912b306aadb1e6e3c2c78a112bfb591acb792 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 01:41:10 +0000 Subject: [PATCH 06/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23059.15 -> To Version 6.0.114-servicing.23060.27 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++------ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 45a6f9cab..9a705d78a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,9 +23,7 @@ - - - + @@ -56,9 +54,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d692c16a..940746d41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + ed74e168a5ba990af94ab7a3f53d7caa2d620115 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7429970b7e3a68c9ad8a8e69cc75cd64009b7126 + 694cadf9950841c4715b9367e3b90d4e1ac005a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7429970b7e3a68c9ad8a8e69cc75cd64009b7126 + 694cadf9950841c4715b9367e3b90d4e1ac005a7 diff --git a/eng/Versions.props b/eng/Versions.props index 5d2c211bd..f133c7183 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23060.9 - 6.0.114-servicing.23060.9 + 6.0.114-servicing.23060.27 + 6.0.114-servicing.23060.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.13-servicing.22601.6 - 6.0.13-servicing.22601.6 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23060.8 + 6.0.14-servicing.23060.8 + 6.0.14 + 6.0.14 From f9524b68f8a9205ba9bd9df85a21a566f0f664d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 23:26:45 +0000 Subject: [PATCH 07/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23059.15 -> To Version 6.0.114-servicing.23061.28 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 940746d41..ce30dbcd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 694cadf9950841c4715b9367e3b90d4e1ac005a7 + f742606f3f2d608593cdd26bd478a42d3c96f827 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 694cadf9950841c4715b9367e3b90d4e1ac005a7 + f742606f3f2d608593cdd26bd478a42d3c96f827 diff --git a/eng/Versions.props b/eng/Versions.props index f133c7183..1af1db457 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23060.27 - 6.0.114-servicing.23060.27 + 6.0.114-servicing.23061.28 + 6.0.114-servicing.23061.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cb8e7a5a471eeb97d70ba630d96a1599b82e3071 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Jan 2023 04:14:28 +0000 Subject: [PATCH 08/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23059.15 -> To Version 6.0.114-servicing.23061.39 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce30dbcd9..420bf5238 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f742606f3f2d608593cdd26bd478a42d3c96f827 + f6b4f0b7231fcde3c66a526fdad80760cc52e74c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f742606f3f2d608593cdd26bd478a42d3c96f827 + f6b4f0b7231fcde3c66a526fdad80760cc52e74c diff --git a/eng/Versions.props b/eng/Versions.props index 1af1db457..04eb9b89d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23061.28 - 6.0.114-servicing.23061.28 + 6.0.114-servicing.23061.39 + 6.0.114-servicing.23061.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1b003439d3000f8e727c907c9a25daed11719e74 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 14 Jan 2023 05:01:17 +0000 Subject: [PATCH 09/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230113.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23061.39 -> To Version 6.0.114-servicing.23063.31 --- NuGet.config | 3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a705d78a..ba290bb3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 420bf5238..5b4980ff0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b8d092792ad6a1234cd59907cd39786723be8673 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6b4f0b7231fcde3c66a526fdad80760cc52e74c + 4e7199aefecf8653ee05202029c629ae00ce1ddd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6b4f0b7231fcde3c66a526fdad80760cc52e74c + 4e7199aefecf8653ee05202029c629ae00ce1ddd diff --git a/eng/Versions.props b/eng/Versions.props index 8a8b2f33f..f23bb7239 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23061.39 - 6.0.114-servicing.23061.39 + 6.0.114-servicing.23063.31 + 6.0.114-servicing.23063.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4a2c17a9d2511e569113eb4efe40d4e922996263 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Jan 2023 21:47:29 +0000 Subject: [PATCH 10/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230118.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23061.39 -> To Version 6.0.114-servicing.23068.11 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.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 17 ++++++----- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++------- 3 files changed, 54 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba290bb3a..36fb57f1e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,21 @@ - + + - + - + - + @@ -41,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b4980ff0..c076f9ad7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ed74e168a5ba990af94ab7a3f53d7caa2d620115 + 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b8d092792ad6a1234cd59907cd39786723be8673 + 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b8d092792ad6a1234cd59907cd39786723be8673 + 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b8d092792ad6a1234cd59907cd39786723be8673 + 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e7199aefecf8653ee05202029c629ae00ce1ddd + b4052aff9531aeb35d54ad2c6df8d17fd6acfc52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4e7199aefecf8653ee05202029c629ae00ce1ddd + b4052aff9531aeb35d54ad2c6df8d17fd6acfc52 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 14d64a811e8d4140438f9a8288abb139cb56d5de + 9f2e9f6ec690ad8f4aea16b33f4a4bcc11b3d2cb https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f23bb7239..6a9201d99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 - 6.0.14-servicing.23056.13 + 6.0.14-servicing.23067.14 + 6.0.14-servicing.23067.14 + 6.0.14-servicing.23067.14 + 6.0.14-servicing.23067.14 0.2.0 - 6.0.114-servicing.23063.31 - 6.0.114-servicing.23063.31 + 6.0.114-servicing.23068.11 + 6.0.114-servicing.23068.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23056.8 - 6.0.14-servicing.23056.8 + 6.0.14-servicing.23067.7 + 6.0.14-servicing.23067.7 6.0.14 6.0.14 6.0.14 @@ -78,8 +78,8 @@ - 6.0.14-servicing.23060.8 - 6.0.14-servicing.23060.8 + 6.0.14-servicing.23061.5 + 6.0.14-servicing.23061.5 6.0.14 6.0.14 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.13 + 6.0.14 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 022069599a1b93ad203de0621e6af98c524b50d0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 20 Jan 2023 10:15:02 -0800 Subject: [PATCH 11/27] Disable too more tests on linux portable for the known nuget issue. --- test/SdkTests/TestsToSkipPortableLinux.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/SdkTests/TestsToSkipPortableLinux.xml b/test/SdkTests/TestsToSkipPortableLinux.xml index f9fe2c166..734362867 100644 --- a/test/SdkTests/TestsToSkipPortableLinux.xml +++ b/test/SdkTests/TestsToSkipPortableLinux.xml @@ -7,5 +7,13 @@ + + + + From 788cbcfdba8a243bab2641623855034e4c3f2c9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Jan 2023 19:55:42 +0000 Subject: [PATCH 12/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230120.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23061.39 -> To Version 6.0.114-servicing.23070.9 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.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36fb57f1e..3cdc8dc2e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,14 +42,14 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c076f9ad7..afb4cb6c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a6ffdab62ce1f4ad3869346cf6c5c7887494e0ed + ed4052880569959106dff1c87fee61f86881f847 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce + 6b445bbe8207bbdd76a49e055bb8fe4db03327db - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce + 6b445bbe8207bbdd76a49e055bb8fe4db03327db https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 63b2e1db1f4ad2dbc81985c3129b61ad9dee04ce + 6b445bbe8207bbdd76a49e055bb8fe4db03327db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b4052aff9531aeb35d54ad2c6df8d17fd6acfc52 + 0a4ddf3d3fc8bdcf98f776f3a118fa76f820be0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b4052aff9531aeb35d54ad2c6df8d17fd6acfc52 + 0a4ddf3d3fc8bdcf98f776f3a118fa76f820be0e diff --git a/eng/Versions.props b/eng/Versions.props index 6a9201d99..c39af1667 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23067.14 - 6.0.14-servicing.23067.14 - 6.0.14-servicing.23067.14 - 6.0.14-servicing.23067.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 + 6.0.14-servicing.23068.14 0.2.0 - 6.0.114-servicing.23068.11 - 6.0.114-servicing.23068.11 + 6.0.114-servicing.23070.9 + 6.0.114-servicing.23070.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3a92ed451a0f6fb092c9a8d50c11a681704db76e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 Jan 2023 19:30:20 +0000 Subject: [PATCH 13/27] Merged PR 29046: [internal/release/6.0.1xx] 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.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23061.5 to 6.0.14-servicing.23072.1 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.114 to 6.0.114 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.114-servicing.23069.5 to 6.0.114-servicing.23070.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.114 to 6.0.114 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22601.1 to 6.0.14-servicing.23070.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.13-servicing.22601.5 to 6.0.14-servicing.23070.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3cdc8dc2e..0c9cb0a39 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 073db2f3b..8f8fdfe5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 + 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b445bbe8207bbdd76a49e055bb8fe4db03327db + b62a43a54b753d428d7243f4ec1058a991e369bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b445bbe8207bbdd76a49e055bb8fe4db03327db + b62a43a54b753d428d7243f4ec1058a991e369bc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6b445bbe8207bbdd76a49e055bb8fe4db03327db + b62a43a54b753d428d7243f4ec1058a991e369bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a4ddf3d3fc8bdcf98f776f3a118fa76f820be0e + 1abec7424beea61071d5469dafd56547a1c2c864 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a4ddf3d3fc8bdcf98f776f3a118fa76f820be0e + 1abec7424beea61071d5469dafd56547a1c2c864 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a262a681e41941ea7ef42f49c0ed3b27a05c259 + 18f3f47e1880fa6cea7648845ea73c74cf7a9857 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4ba96971b81698ec17061cbd6a59f752f5bfc3b5 + d40327ad15e6653d027e003749a3bf16fd603101 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 41bfa9043..8a43607bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.13-servicing.22601.1 + 6.0.14-servicing.23070.2 - 6.0.13-servicing.22601.5 + 6.0.14-servicing.23070.2 @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 0.2.0 - 6.0.114-servicing.23070.9 - 6.0.114-servicing.23070.9 + 6.0.114-servicing.23073.2 + 6.0.114-servicing.23073.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23067.7 - 6.0.14-servicing.23067.7 + 6.0.14-servicing.23070.4 + 6.0.14-servicing.23070.4 6.0.14 6.0.14 6.0.14 @@ -78,8 +78,8 @@ - 6.0.14-servicing.23061.5 - 6.0.14-servicing.23061.5 + 6.0.14-servicing.23072.1 + 6.0.14-servicing.23072.1 6.0.14 6.0.14 From 559aa795997d2925dc8a7a84fa71378609a26053 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 16:55:48 +0000 Subject: [PATCH 14/27] Merged PR 29136: [internal/release/6.0.1xx] 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.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230124.6 - **Date Produced**: January 24, 2023 3:52:55 PM UTC - **Commit**: 5005a736e2825036e50a04be9930769c03f93572 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.114-servicing.23073.2 to 6.0.114-servicing.23074.6][1] - **Microsoft.NET.Sdk**: [from 6.0.114-servicing.23073.2 to 6.0.114-servicing.23074.6][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1abec74&targetVersion=GC5005a73&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC51b4c94&targetVersion=GC2a90daa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0c9cb0a39..90404cfbf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f8fdfe5f..5ed463c2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 1312fabe6644dfaf40da8052d8960291e688dd86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b62a43a54b753d428d7243f4ec1058a991e369bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1abec7424beea61071d5469dafd56547a1c2c864 + 5005a736e2825036e50a04be9930769c03f93572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1abec7424beea61071d5469dafd56547a1c2c864 + 5005a736e2825036e50a04be9930769c03f93572 diff --git a/eng/Versions.props b/eng/Versions.props index 8a43607bb..b0b926e4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23073.2 - 6.0.114-servicing.23073.2 + 6.0.114-servicing.23074.6 + 6.0.114-servicing.23074.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23070.4 - 6.0.14-servicing.23070.4 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 6.0.14 6.0.14 6.0.14 From 5d7b9b0cf16dbccdb61543bcab334d194dfbeb7d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 18:20:24 +0000 Subject: [PATCH 15/27] Merged PR 29155: [internal/release/6.0.1xx] 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.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.114 to 6.0.114 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.114-servicing.23070.9 to 6.0.114-servicing.23074.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.114 to 6.0.114 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230124.15 - **Date Produced**: January 24, 2023 5:53:22 PM UTC - **Commit**: 70e268dcc55cdc08f9b2f46db120e1780b062f26 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.114-servicing.23074.6 to 6.0.114-servicing.23074.15][1] - **Microsoft.NET.Sdk**: [from 6.0.114-servicing.23074.6 to 6.0.114-servicing.23074.15][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-dev-certs**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **dotnet-user-secrets**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.114 to 6.0.114][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.114-servicing.23070.9 to 6.0.114-servicing.23074.4][3] - **... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 90404cfbf..ecce92288 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -42,14 +42,14 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ed463c2e..cefe0184a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1bfef7bb9b42d541075d352ba22e039d2e700eb + 54e8b61777d42d2b10744d1987438ee5b8c0b24d https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b62a43a54b753d428d7243f4ec1058a991e369bc + 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b62a43a54b753d428d7243f4ec1058a991e369bc + 629fc1a8b3d53b551ea512c4f0294062dcd30afe https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b62a43a54b753d428d7243f4ec1058a991e369bc + 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5005a736e2825036e50a04be9930769c03f93572 + 70e268dcc55cdc08f9b2f46db120e1780b062f26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5005a736e2825036e50a04be9930769c03f93572 + 70e268dcc55cdc08f9b2f46db120e1780b062f26 diff --git a/eng/Versions.props b/eng/Versions.props index b0b926e4f..db44d6a3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 - 6.0.14-servicing.23070.15 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 0.2.0 - 6.0.114-servicing.23074.6 - 6.0.114-servicing.23074.6 + 6.0.114-servicing.23074.15 + 6.0.114-servicing.23074.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 346c0065dd9540261ec07e938b808833446d2a9e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 20:30:11 +0000 Subject: [PATCH 16/27] Merged PR 29178: [internal/release/6.0.1xx] 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.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230124.26 - **Date Produced**: January 24, 2023 7:38:33 PM UTC - **Commit**: 9f111ce1a19301c2258920ba362206837c5ef8b0 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.114-servicing.23074.15 to 6.0.114-servicing.23074.26][1] - **Microsoft.NET.Sdk**: [from 6.0.114-servicing.23074.15 to 6.0.114-servicing.23074.26][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.14-servicing.23072.1 to 6.0.14-servicing.23074.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.3][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC70e268d&targetVersion=GC9f111ce&_a=files [2]: https://dev... --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index ecce92288..287683d61 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cefe0184a..68c4766c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1312fabe6644dfaf40da8052d8960291e688dd86 + c9ab6d88179966c84260fc580b27cdb719a7e918 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70e268dcc55cdc08f9b2f46db120e1780b062f26 + 9f111ce1a19301c2258920ba362206837c5ef8b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70e268dcc55cdc08f9b2f46db120e1780b062f26 + 9f111ce1a19301c2258920ba362206837c5ef8b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 18f3f47e1880fa6cea7648845ea73c74cf7a9857 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d40327ad15e6653d027e003749a3bf16fd603101 + 9e190e3d952203836d77bb0f1c42984524e1122d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index db44d6a3d..45c80ad97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.2 - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.3 @@ -56,8 +56,8 @@ - 6.0.114-servicing.23074.15 - 6.0.114-servicing.23074.15 + 6.0.114-servicing.23074.26 + 6.0.114-servicing.23074.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.14-servicing.23072.1 - 6.0.14-servicing.23072.1 + 6.0.14-servicing.23074.3 + 6.0.14-servicing.23074.3 6.0.14 6.0.14 From 9171b0004c7a606626dee424d9e2fb91832b1bc6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 7 Feb 2023 22:57:20 +0000 Subject: [PATCH 17/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230207.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23074.26 -> To Version 6.0.115-servicing.23107.14 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 287683d61..6e57719c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,29 @@ + + + + + + + + + @@ -42,16 +51,23 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68c4766c5..8b856879f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f111ce1a19301c2258920ba362206837c5ef8b0 + 853207eccdf934d96f6bc28f80e2594c512d150c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f111ce1a19301c2258920ba362206837c5ef8b0 + 853207eccdf934d96f6bc28f80e2594c512d150c diff --git a/eng/Versions.props b/eng/Versions.props index 0f6df721d..49e7ce937 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.114-servicing.23074.26 - 6.0.114-servicing.23074.26 + 6.0.115-servicing.23107.14 + 6.0.115-servicing.23107.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9ae99b3d9d3a4d4184b7643fe8d8d62a198f1898 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Feb 2023 01:28:49 +0000 Subject: [PATCH 18/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230207.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23074.26 -> To Version 6.0.115-servicing.23107.25 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b856879f..6f2082867 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 853207eccdf934d96f6bc28f80e2594c512d150c + ad93e74b65b509fe7ffbfa08017c7ff155b677d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 853207eccdf934d96f6bc28f80e2594c512d150c + ad93e74b65b509fe7ffbfa08017c7ff155b677d0 diff --git a/eng/Versions.props b/eng/Versions.props index 49e7ce937..4601760e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.115-servicing.23107.14 - 6.0.115-servicing.23107.14 + 6.0.115-servicing.23107.25 + 6.0.115-servicing.23107.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 01c5db31cec307b3c2e4e06ef4e21dc2097d435e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Feb 2023 03:23:43 +0000 Subject: [PATCH 19/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230207.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23074.26 -> To Version 6.0.115-servicing.23107.38 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f2082867..3c9b8934d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad93e74b65b509fe7ffbfa08017c7ff155b677d0 + 2bc99876b33894069dc3a1c62ef519b5ad0a4a49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ad93e74b65b509fe7ffbfa08017c7ff155b677d0 + 2bc99876b33894069dc3a1c62ef519b5ad0a4a49 diff --git a/eng/Versions.props b/eng/Versions.props index 4601760e5..a3bcca54d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.115-servicing.23107.25 - 6.0.115-servicing.23107.25 + 6.0.115-servicing.23107.38 + 6.0.115-servicing.23107.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a598fe9e316960ed0bba37c0ea928cb3a1f7febe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 13 Feb 2023 23:49:44 +0000 Subject: [PATCH 20/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230213.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23074.26 -> To Version 6.0.115-servicing.23113.20 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c9b8934d..886a88b9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2bc99876b33894069dc3a1c62ef519b5ad0a4a49 + f19fd7a42f9f609a169d0e509a5d192d3fc261c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2bc99876b33894069dc3a1c62ef519b5ad0a4a49 + f19fd7a42f9f609a169d0e509a5d192d3fc261c2 diff --git a/eng/Versions.props b/eng/Versions.props index a3bcca54d..75006a110 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.115-servicing.23107.38 - 6.0.115-servicing.23107.38 + 6.0.115-servicing.23113.20 + 6.0.115-servicing.23113.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 721a0805806a991d1b6509430a4b99dcf3447bb2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 14 Feb 2023 22:59:01 +0000 Subject: [PATCH 21/27] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230214.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.114-servicing.23074.26 -> To Version 6.0.115-servicing.23114.12 --- NuGet.config | 3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6e57719c6..5c5764a43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,9 +12,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 886a88b9d..4e35d502d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 629fc1a8b3d53b551ea512c4f0294062dcd30afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f19fd7a42f9f609a169d0e509a5d192d3fc261c2 + e4e740daa15030398b9359046a4724fbcb6542f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f19fd7a42f9f609a169d0e509a5d192d3fc261c2 + e4e740daa15030398b9359046a4724fbcb6542f3 diff --git a/eng/Versions.props b/eng/Versions.props index 75006a110..b398591da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.115-servicing.23113.20 - 6.0.115-servicing.23113.20 + 6.0.115-servicing.23114.12 + 6.0.115-servicing.23114.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 37e9919a75a7cb445a4099f2ea702ce7e2df86b6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Feb 2023 02:06:06 +0000 Subject: [PATCH 22/27] 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 23/27] 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 From ee8c1a42c43e46497c59aa6b83e3d5454df62de0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Feb 2023 17:47:23 +0000 Subject: [PATCH 24/27] Merged PR 29685: [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**: 20230216.18 - **Date Produced**: February 16, 2023 10:38:18 PM UTC - **Commit**: a44ab75d514605822a8b889033df94c1866dea03 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.115-servicing.23115.29 to 6.0.115-servicing.23116.18][1] - **Microsoft.NET.Sdk**: [from 6.0.115-servicing.23115.29 to 6.0.115-servicing.23116.18][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd59c808&targetVersion=GCa44ab75&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30b55f361..5bbc60497 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 46ea183f02224e86675f0936217d1a554f3c506c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d59c8088920f1956fd606cab7f40af52b747abdf + a44ab75d514605822a8b889033df94c1866dea03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d59c8088920f1956fd606cab7f40af52b747abdf + a44ab75d514605822a8b889033df94c1866dea03 diff --git a/eng/Versions.props b/eng/Versions.props index 8e527ee26..78b6082f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.115-servicing.23115.29 - 6.0.115-servicing.23115.29 + 6.0.115-servicing.23116.18 + 6.0.115-servicing.23116.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1ea08b8f5f46b03d411c45c746417aabac737aaa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 Feb 2023 23:39:20 +0000 Subject: [PATCH 25/27] Merged PR 29730: [internal/release/6.0.1xx] 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.NETCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.15-servicing.23114.15 to 6.0.15-servicing.23115.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23114.14 to 6.0.15-servicing.23116.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.115 to 6.0.115 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.115-servicing.23115.4 to 6.0.115-servicing.23117.8 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.115 to 6.0.115 (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... --- NuGet.config | 18 +++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d6950b95..ddb02c357 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,21 @@ - + - + - + - + - + @@ -42,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bbc60497..fe05582b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ 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 - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22da7ee62549733b6b9bbc954b07c218eb0be3a2 + 5edef4b20babd4c3ddac7460e536f86fd0f2d724 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a0e39d4200f68f564e1543d4df584ef9690fae47 + 0cf705087a78b4edc10d1cd881349b544ddb8055 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 46ea183f02224e86675f0936217d1a554f3c506c + 7ffbda84d04cce61619440af4dc884437eb1998a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 46ea183f02224e86675f0936217d1a554f3c506c + 7ffbda84d04cce61619440af4dc884437eb1998a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 46ea183f02224e86675f0936217d1a554f3c506c + 7ffbda84d04cce61619440af4dc884437eb1998a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a44ab75d514605822a8b889033df94c1866dea03 + 346efd6f9a844a885551741b31f9abd256b9016f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a44ab75d514605822a8b889033df94c1866dea03 + 346efd6f9a844a885551741b31f9abd256b9016f - + 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 @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 0d02a9fc71d6e5da74daac3a136042f3790283b2 + 0c39542771ca202430d0042f710622b5b916ff0a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 78b6082f4..0660bf742 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 @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23114.14 - 6.0.15-servicing.23114.14 - 6.0.15-servicing.23114.14 - 6.0.15-servicing.23114.14 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 + 6.0.15-servicing.23116.5 0.2.0 - 6.0.115-servicing.23116.18 - 6.0.115-servicing.23116.18 + 6.0.115-servicing.23118.1 + 6.0.115-servicing.23118.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.15-servicing.23114.15 - 6.0.15-servicing.23114.15 + 6.0.15-servicing.23115.7 + 6.0.15-servicing.23115.7 6.0.15 6.0.15 6.0.15 @@ -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 From e8d6c6cc1402b997745cef53105c73097af8edf2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Feb 2023 16:03:49 +0000 Subject: [PATCH 26/27] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.15-servicing.23116.5 to 6.0.15-servicing.23120.7 (parent: Microsoft.NET.Sdk) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index ddb02c357..ac5080f79 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe05582b5..734e2f51a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0cf705087a78b4edc10d1cd881349b544ddb8055 + b51b398707b287a3d765ce0338f4b3a213ce2ced https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7ffbda84d04cce61619440af4dc884437eb1998a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 346efd6f9a844a885551741b31f9abd256b9016f + fc573c39acc28d9287e7aa638bd837922777e1b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 346efd6f9a844a885551741b31f9abd256b9016f + fc573c39acc28d9287e7aa638bd837922777e1b0 diff --git a/eng/Versions.props b/eng/Versions.props index 0660bf742..5cab77811 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 - 6.0.15-servicing.23116.5 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 + 6.0.15-servicing.23120.7 0.2.0 - 6.0.115-servicing.23118.1 - 6.0.115-servicing.23118.1 + 6.0.115-servicing.23120.14 + 6.0.115-servicing.23120.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1d8c2d93c0415677f39802a8d47c8aae7c2215a3 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Feb 2023 00:45:00 +0000 Subject: [PATCH 27/27] Merged PR 29807: [internal/release/6.0.1xx] 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.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230226.1 - **Date Produced**: February 26, 2023 10:01:39 PM UTC - **Commit**: bb0cd5e365a60fe2a02cb167f2f094e45a2dc2c8 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.115-servicing.23120.14 to 6.0.115-servicing.23126.1][1] - **Microsoft.NET.Sdk**: [from 6.0.115-servicing.23120.14 to 6.0.115-servicing.23126.1][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-dev-certs**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] - **dotnet-user-secrets**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfc573c3&targetVersion=GCbb0cd5e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb51b398&targetVersion=GC6a6d775&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index ac5080f79..a118686fa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,12 @@ - + + + @@ -19,9 +21,13 @@ + + + + @@ -42,16 +48,20 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 734e2f51a..e406a8031 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b51b398707b287a3d765ce0338f4b3a213ce2ced + 6a6d775f49623bbd742c02f89d373630668547bb https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7ffbda84d04cce61619440af4dc884437eb1998a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc573c39acc28d9287e7aa638bd837922777e1b0 + bb0cd5e365a60fe2a02cb167f2f094e45a2dc2c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc573c39acc28d9287e7aa638bd837922777e1b0 + bb0cd5e365a60fe2a02cb167f2f094e45a2dc2c8 diff --git a/eng/Versions.props b/eng/Versions.props index 5cab77811..13223f90d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.15 6.0.15 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 - 6.0.15-servicing.23120.7 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 + 6.0.15-servicing.23124.4 0.2.0 - 6.0.115-servicing.23120.14 - 6.0.115-servicing.23120.14 + 6.0.115-servicing.23126.1 + 6.0.115-servicing.23126.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)