From 10bec223c582cb2459376b28345ec9ceabcdc371 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Dec 2022 05:01:33 +0000 Subject: [PATCH 01/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221206.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.308-servicing.22606.14 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.308 -> To Version 6.0.308 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index f93da753d37d..6ba7b5cd57fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -17,10 +18,11 @@ - + + @@ -41,14 +43,16 @@ + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67f3f2b426f3..6cd227c0e468 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + 384bde1623ae79bbe6308f201c869d91f9f05569 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7e40218fedff9fad69162a8beab14468ac6c1cf3 + 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 873cc1a88b27554f9f12d378b91861fc4b82ee56 + 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 873cc1a88b27554f9f12d378b91861fc4b82ee56 + 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 diff --git a/eng/Versions.props b/eng/Versions.props index 9cf40a422dea..67599e13ad50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.308-servicing.22601.36 - 6.0.308-servicing.22601.36 + 6.0.308-servicing.22606.14 + 6.0.308-servicing.22606.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e417a061910ae4e58fac720932411934ddd26d7e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jan 2023 19:30:16 +0000 Subject: [PATCH 02/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230105.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23055.15 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.308 -> To Version 6.0.308 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ba7b5cd57fc..ce291f905660 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -22,6 +23,7 @@ + @@ -44,6 +46,7 @@ + @@ -53,6 +56,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cd227c0e468..61cbac664288 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 + 17fe98a9b1fe583fddaf7feae353873e323ed87a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a365a72e88efb41e0d2e2dec51ae7cad6475a48 + 17fe98a9b1fe583fddaf7feae353873e323ed87a diff --git a/eng/Versions.props b/eng/Versions.props index 67599e13ad50..e70e14a62a66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.308-servicing.22606.14 - 6.0.308-servicing.22606.14 + 6.0.309-servicing.23055.15 + 6.0.309-servicing.23055.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f58ac28d8dad0bb1466e989f2018f763c8168073 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 6 Jan 2023 21:05:21 +0000 Subject: [PATCH 03/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230106.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23056.14 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.308 -> To Version 6.0.308 (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 61cbac664288..cec84650b2e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17fe98a9b1fe583fddaf7feae353873e323ed87a + a601963a61278b7689b8aaf3ad540e4bdcfcff07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17fe98a9b1fe583fddaf7feae353873e323ed87a + a601963a61278b7689b8aaf3ad540e4bdcfcff07 @@ -151,9 +151,9 @@ 038f9bae9b34d1cca653360a46c5ce1eba4c2ac8 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 027ca8b8ef4b4dc94995f87b9c441d2bcf742c1d + + https://github.com/nuget/nuget.client + 51ca5ad938c742e6ff876ea1545b0712b130f9d1 diff --git a/eng/Versions.props b/eng/Versions.props index e70e14a62a66..475daf109ac1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23055.15 - 6.0.309-servicing.23055.15 + 6.0.309-servicing.23056.14 + 6.0.309-servicing.23056.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 172d5933acd3ee6dd0b5be61b02bb882629a603d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 7 Jan 2023 00:38:21 +0000 Subject: [PATCH 04/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230106.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23056.26 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.308 -> To Version 6.0.308 (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 cec84650b2e8..b029f20e17bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a601963a61278b7689b8aaf3ad540e4bdcfcff07 + d2cf2404b26dc01c9f52b716f936536a8cc01a7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a601963a61278b7689b8aaf3ad540e4bdcfcff07 + d2cf2404b26dc01c9f52b716f936536a8cc01a7b diff --git a/eng/Versions.props b/eng/Versions.props index 475daf109ac1..50e3606c66ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23056.14 - 6.0.309-servicing.23056.14 + 6.0.309-servicing.23056.26 + 6.0.309-servicing.23056.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d481cdf1c94b6b11e9c9d1dc3b9ec75a2f4110b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Jan 2023 20:07:01 +0000 Subject: [PATCH 05/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.308-servicing.22601.36 -> To Version 6.0.309-servicing.23059.13 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks From Version 6.0.308 -> To Version 6.0.308 (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 b029f20e17bc..08fffe6da6c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 384bde1623ae79bbe6308f201c869d91f9f05569 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2cf2404b26dc01c9f52b716f936536a8cc01a7b + 41bb21af4043f3ff38dbcb71b281c43209e25468 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d2cf2404b26dc01c9f52b716f936536a8cc01a7b + 41bb21af4043f3ff38dbcb71b281c43209e25468 diff --git a/eng/Versions.props b/eng/Versions.props index 50e3606c66ba..58ccee8a1836 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23056.26 - 6.0.309-servicing.23056.26 + 6.0.309-servicing.23059.13 + 6.0.309-servicing.23059.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48faeab6f17e8f13b897e5f21d3c56aea530fa54 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 02:00:03 +0000 Subject: [PATCH 06/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230109.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23059.27 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++-------- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 78 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce291f905660..323d67cf1379 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,20 @@ - - - + - + - + - - - + @@ -45,19 +41,15 @@ - - - + - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08fffe6da6c8..3ca411ef001c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 397c48f9f7a86672e097f53155c255bc89068e8a + 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e - + 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 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 384bde1623ae79bbe6308f201c869d91f9f05569 + 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 384bde1623ae79bbe6308f201c869d91f9f05569 + 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 384bde1623ae79bbe6308f201c869d91f9f05569 + 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41bb21af4043f3ff38dbcb71b281c43209e25468 + be3d8e9b00d2f16c32fc89b5316987e23642b027 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41bb21af4043f3ff38dbcb71b281c43209e25468 + be3d8e9b00d2f16c32fc89b5316987e23642b027 diff --git a/eng/Versions.props b/eng/Versions.props index a2ea1f623bfc..061bdeeeda88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.308 + 6.0.309 @@ -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.309-servicing.23059.13 - 6.0.309-servicing.23059.13 + 6.0.309-servicing.23059.27 + 6.0.309-servicing.23059.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 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 - 6.0.13-servicing.22601.6 - 6.0.13-servicing.22601.6 - 6.0.13 - 6.0.13 + 6.0.14-servicing.23059.3 + 6.0.14-servicing.23059.3 + 6.0.14 + 6.0.14 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.308 + 6.0.309 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From ccb1de1825704799ecdaa8eea98cd6ee2642fe34 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 10:17:54 +0000 Subject: [PATCH 07/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23060.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 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 3ca411ef001c..6aa39efeb95c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - be3d8e9b00d2f16c32fc89b5316987e23642b027 + 2a6be3c1062c59c8518de6f903fb624f1b643d56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - be3d8e9b00d2f16c32fc89b5316987e23642b027 + 2a6be3c1062c59c8518de6f903fb624f1b643d56 diff --git a/eng/Versions.props b/eng/Versions.props index 061bdeeeda88..59651d34d018 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23059.27 - 6.0.309-servicing.23059.27 + 6.0.309-servicing.23060.4 + 6.0.309-servicing.23060.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 60a8b19bee009491d23fe685c0fcb04c88dd2ee9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Jan 2023 22:50:37 +0000 Subject: [PATCH 08/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23060.22 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 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 6aa39efeb95c..bddb23236c06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a6be3c1062c59c8518de6f903fb624f1b643d56 + 53bb7252f25bf09920e5e168f099b580cc6919f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2a6be3c1062c59c8518de6f903fb624f1b643d56 + 53bb7252f25bf09920e5e168f099b580cc6919f3 diff --git a/eng/Versions.props b/eng/Versions.props index 59651d34d018..4572933feaa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23060.4 - 6.0.309-servicing.23060.4 + 6.0.309-servicing.23060.22 + 6.0.309-servicing.23060.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e3198ac87875523e4391dd39df84b05b3a287f45 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 01:41:36 +0000 Subject: [PATCH 09/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230110.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23060.26 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.13 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 323d67cf1379..3faa47218e1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bddb23236c06..6576f6cde38f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8eff1e5d0be8e6c7581fc03ae47c7f6fae422e8e + ed74e168a5ba990af94ab7a3f53d7caa2d620115 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53bb7252f25bf09920e5e168f099b580cc6919f3 + 1cf711fc9948e46181db8c649a253b8f623c6c99 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53bb7252f25bf09920e5e168f099b580cc6919f3 + 1cf711fc9948e46181db8c649a253b8f623c6c99 diff --git a/eng/Versions.props b/eng/Versions.props index 4572933feaa4..9b4a4d72d9c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23060.22 - 6.0.309-servicing.23060.22 + 6.0.309-servicing.23060.26 + 6.0.309-servicing.23060.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.14-servicing.23059.3 - 6.0.14-servicing.23059.3 + 6.0.14-servicing.23060.8 + 6.0.14-servicing.23060.8 6.0.14 6.0.14 From e78bc126266b514403a56a4443264efb05f25746 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jan 2023 11:05:36 +0000 Subject: [PATCH 10/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230111.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23059.13 -> To Version 6.0.309-servicing.23061.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 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 6576f6cde38f..b1b8937f4dab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 436cb705a436a4901325640148ab168bf8cf1cbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1cf711fc9948e46181db8c649a253b8f623c6c99 + 35d6bc1e3057789e828f15ddf7b73242d93f093e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1cf711fc9948e46181db8c649a253b8f623c6c99 + 35d6bc1e3057789e828f15ddf7b73242d93f093e diff --git a/eng/Versions.props b/eng/Versions.props index 9b4a4d72d9c0..69e04fa36102 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23060.26 - 6.0.309-servicing.23060.26 + 6.0.309-servicing.23061.3 + 6.0.309-servicing.23061.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1802f4164f9778a41439ae3cc016eb9fa772e42f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jan 2023 22:46:46 +0000 Subject: [PATCH 11/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230117.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23061.3 -> To Version 6.0.309-servicing.23067.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.14 -> To Version 6.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++------ eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3faa47218e1f..2268fdc4517f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55e4c7afdd30..7b0d78ab129b 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 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1e19f3aa7f4ce077ac789b69a44489ff2fbcff06 + b6518c6af8a11352fd9f0b4dc76149fedf666c3d @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2ea0773859e661c388b39f94393dfb2fc3ea1aec + 38c1c4bb218fdb9e1628db372d72babee098165e https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 436cb705a436a4901325640148ab168bf8cf1cbc + 4ad0133da19f7f6fd78a9de093085c380d03d078 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 436cb705a436a4901325640148ab168bf8cf1cbc + 4ad0133da19f7f6fd78a9de093085c380d03d078 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 436cb705a436a4901325640148ab168bf8cf1cbc + 4ad0133da19f7f6fd78a9de093085c380d03d078 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 35d6bc1e3057789e828f15ddf7b73242d93f093e + 906e24ca802a74b64e2a4e3951ef2e8736a12f7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 35d6bc1e3057789e828f15ddf7b73242d93f093e + 906e24ca802a74b64e2a4e3951ef2e8736a12f7c diff --git a/eng/Versions.props b/eng/Versions.props index b995442226e6..cbac3b8db12a 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.23062.15 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 + 6.0.14-servicing.23062.15 0.2.0 - 6.0.309-servicing.23061.3 - 6.0.309-servicing.23061.3 + 6.0.309-servicing.23067.13 + 6.0.309-servicing.23067.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23056.8 - 6.0.14-servicing.23056.8 + 6.0.14-servicing.23063.9 + 6.0.14-servicing.23063.9 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 From 567e0c97be08bfa22b2115ce7b0a7b3fae60bf4d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Jan 2023 03:30:38 +0000 Subject: [PATCH 12/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230118.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23067.13 -> To Version 6.0.309-servicing.23068.22 --- 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 7b0d78ab129b..ffafe85f3961 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 4ad0133da19f7f6fd78a9de093085c380d03d078 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 906e24ca802a74b64e2a4e3951ef2e8736a12f7c + b6c912387a5240eed88afe3327b00c2dec5fdadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 906e24ca802a74b64e2a4e3951ef2e8736a12f7c + b6c912387a5240eed88afe3327b00c2dec5fdadd diff --git a/eng/Versions.props b/eng/Versions.props index cbac3b8db12a..4bed1e33dcc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23067.13 - 6.0.309-servicing.23067.13 + 6.0.309-servicing.23068.22 + 6.0.309-servicing.23068.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cdfc1dac10a7a3802eceb689e5d2de18a2c4f234 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Jan 2023 23:20:04 +0000 Subject: [PATCH 13/18] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230119.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.309-servicing.23067.13 -> To Version 6.0.309-servicing.23069.19 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.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 From Version 6.0.14-servicing.23063.9 -> To Version 6.0.14-servicing.23067.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2268fdc4517f..db6858fe95e3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffafe85f3961..e866809c06e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6518c6af8a11352fd9f0b4dc76149fedf666c3d + 8515e4c5a352c94e65e742031a5079ca76fdb3e7 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 38c1c4bb218fdb9e1628db372d72babee098165e + ed4052880569959106dff1c87fee61f86881f847 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ad0133da19f7f6fd78a9de093085c380d03d078 + 1c704df539727afa2cb81b1904fe11bcf21a5b9a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ad0133da19f7f6fd78a9de093085c380d03d078 + 1c704df539727afa2cb81b1904fe11bcf21a5b9a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4ad0133da19f7f6fd78a9de093085c380d03d078 + 1c704df539727afa2cb81b1904fe11bcf21a5b9a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6c912387a5240eed88afe3327b00c2dec5fdadd + b0570a30cfbc5242f8eb3d628603bb9eaa00187c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b6c912387a5240eed88afe3327b00c2dec5fdadd + b0570a30cfbc5242f8eb3d628603bb9eaa00187c diff --git a/eng/Versions.props b/eng/Versions.props index 4bed1e33dcc7..a55556cb9a45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 - 6.0.14-servicing.23062.15 + 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.309-servicing.23068.22 - 6.0.309-servicing.23068.22 + 6.0.309-servicing.23069.19 + 6.0.309-servicing.23069.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23063.9 - 6.0.14-servicing.23063.9 + 6.0.14-servicing.23067.7 + 6.0.14-servicing.23067.7 6.0.14 6.0.14 6.0.14 From 8e99d20c5eeb2e076f4d33a3160615f83199bde0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 23 Jan 2023 19:30:32 +0000 Subject: [PATCH 14/18] Merged PR 29049: [internal/release/6.0.3xx] 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) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (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.309 to 6.0.309 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.309-servicing.23069.3 to 6.0.309-servicing.23070.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.309 to 6.0.309 (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) - **Microso... --- 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 db6858fe95e3..d0d3e025776b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e866809c06e0..b9fe53569c71 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 - 1c704df539727afa2cb81b1904fe11bcf21a5b9a + e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1c704df539727afa2cb81b1904fe11bcf21a5b9a + e455bc6fbb9d9ba5cad34f405fb2c278881f038a https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1c704df539727afa2cb81b1904fe11bcf21a5b9a + e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0570a30cfbc5242f8eb3d628603bb9eaa00187c + a444ef95fc29cb478922eac7d89adb215efb563b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0570a30cfbc5242f8eb3d628603bb9eaa00187c + a444ef95fc29cb478922eac7d89adb215efb563b - + 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 a55556cb9a45..e0550e5446c7 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.309-servicing.23069.19 - 6.0.309-servicing.23069.19 + 6.0.309-servicing.23073.3 + 6.0.309-servicing.23073.3 $(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 4520d0d9dd48edbe11f686439e0d773100250df4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 16:56:04 +0000 Subject: [PATCH 15/18] Merged PR 29134: [internal/release/6.0.3xx] 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**: - **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) - **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) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230124.7 - **Date Produced**: January 24, 2023 3:51:36 PM UTC - **Commit**: 757ae6a7afd4265ba90def3c570b46279d7f9adf - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23073.3 to 6.0.309-servicing.23074.7][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23073.3 to 6.0.309-servicing.23074.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **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] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa444ef9&targetVersion=GC757ae6a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC51b4c94&targetVersion=GC2a90daa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 d0d3e025776b..e7631a4a623a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9fe53569c71..76f13f63829a 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 e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a444ef95fc29cb478922eac7d89adb215efb563b + 757ae6a7afd4265ba90def3c570b46279d7f9adf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a444ef95fc29cb478922eac7d89adb215efb563b + 757ae6a7afd4265ba90def3c570b46279d7f9adf diff --git a/eng/Versions.props b/eng/Versions.props index e0550e5446c7..9a47ed58beef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23073.3 - 6.0.309-servicing.23073.3 + 6.0.309-servicing.23074.7 + 6.0.309-servicing.23074.7 $(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 c44327770741be8533549f59a8d89d4940c2076a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 18:21:00 +0000 Subject: [PATCH 16/18] Merged PR 29158: [internal/release/6.0.3xx] 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) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230124.16 - **Date Produced**: January 24, 2023 5:53:11 PM UTC - **Commit**: 19bf1b2c73b69a38ac637787c7833244156d2da0 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23074.7 to 6.0.309-servicing.23074.16][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23074.7 to 6.0.309-servicing.23074.16][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] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC757ae6a&targetVersion=GC19bf1b2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCa1bfef7&targetVersion=GC54e8b61&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 e7631a4a623a..5a99ba751d67 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76f13f63829a..c49b95b6b492 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 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 757ae6a7afd4265ba90def3c570b46279d7f9adf + 19bf1b2c73b69a38ac637787c7833244156d2da0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 757ae6a7afd4265ba90def3c570b46279d7f9adf + 19bf1b2c73b69a38ac637787c7833244156d2da0 diff --git a/eng/Versions.props b/eng/Versions.props index 9a47ed58beef..dda910d69529 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.309-servicing.23074.7 - 6.0.309-servicing.23074.7 + 6.0.309-servicing.23074.16 + 6.0.309-servicing.23074.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67ef69fc068a481a4d29c35106650979015d4033 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 20:30:15 +0000 Subject: [PATCH 17/18] Merged PR 29180: [internal/release/6.0.3xx] 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:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230124.27 - **Date Produced**: January 24, 2023 7:40:01 PM UTC - **Commit**: b814c7cbbf53a1fa23c050ab74d116693dbd58bc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23074.16 to 6.0.309-servicing.23074.27][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23074.16 to 6.0.309-servicing.23074.27][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=GC19bf1b2&targetVersion=GCb814c7c&_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 5a99ba751d67..e10226cfd2d4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c49b95b6b492..8f4247d74ea2 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 e455bc6fbb9d9ba5cad34f405fb2c278881f038a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19bf1b2c73b69a38ac637787c7833244156d2da0 + b814c7cbbf53a1fa23c050ab74d116693dbd58bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19bf1b2c73b69a38ac637787c7833244156d2da0 + b814c7cbbf53a1fa23c050ab74d116693dbd58bc - + 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 dda910d69529..7189aa8dfb60 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.309-servicing.23074.16 - 6.0.309-servicing.23074.16 + 6.0.309-servicing.23074.27 + 6.0.309-servicing.23074.27 $(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 f629b020f8d8d0a4b6870be21e76ad9c68f18151 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 21:21:26 +0000 Subject: [PATCH 18/18] Merged PR 29189: [internal/release/6.0.3xx] 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.DotNet.Common.ItemTemplates**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.309-servicing.23070.10 to 6.0.309-servicing.23074.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.309 to 6.0.309 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230124.34 - **Date Produced**: January 24, 2023 8:41:08 PM UTC - **Commit**: 54b8f37b145c05ddfe75705c6fd03cab42f2c532 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.309-servicing.23074.27 to 6.0.309-servicing.23074.34][1] - **Microsoft.NET.Sdk**: [from 6.0.309-servicing.23074.27 to 6.0.309-servicing.23074.34][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.309 to 6.0.309][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.309-servicing.23070.10 to 6.0.309-servicing.23074.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.309 to 6.0.309][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb814c7c&targetVersion=GC54b8f37&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe455bc6&targetVersion=GCffeddec&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index e10226cfd2d4..d32bdf112005 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f4247d74ea2..e92ec822ec53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e455bc6fbb9d9ba5cad34f405fb2c278881f038a + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e455bc6fbb9d9ba5cad34f405fb2c278881f038a + ffeddec3efcbb43f226550c3b8bfe8d11765f723 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e455bc6fbb9d9ba5cad34f405fb2c278881f038a + ffeddec3efcbb43f226550c3b8bfe8d11765f723 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b814c7cbbf53a1fa23c050ab74d116693dbd58bc + 54b8f37b145c05ddfe75705c6fd03cab42f2c532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b814c7cbbf53a1fa23c050ab74d116693dbd58bc + 54b8f37b145c05ddfe75705c6fd03cab42f2c532 diff --git a/eng/Versions.props b/eng/Versions.props index 7189aa8dfb60..21fe8f582952 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.309-servicing.23074.27 - 6.0.309-servicing.23074.27 + 6.0.309-servicing.23074.34 + 6.0.309-servicing.23074.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)