From e45c24f81cb7c77408975b8d39ac12d2696e85b9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 7 Mar 2023 22:08:32 +0000 Subject: [PATCH 01/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.115-servicing.23126.1 -> To Version 6.0.116-servicing.23157.11 --- NuGet.config | 18 ++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index a118686fa..ce2a54a7b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,13 @@ + + + + @@ -18,14 +22,20 @@ + + + + + + @@ -48,20 +58,28 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e406a8031..65066d0fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7ffbda84d04cce61619440af4dc884437eb1998a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb0cd5e365a60fe2a02cb167f2f094e45a2dc2c8 + 0dcbc1aab9655ca4444f225a7245ac43cd9715aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb0cd5e365a60fe2a02cb167f2f094e45a2dc2c8 + 0dcbc1aab9655ca4444f225a7245ac43cd9715aa diff --git a/eng/Versions.props b/eng/Versions.props index 13223f90d..f340c4eb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.115-servicing.23126.1 - 6.0.115-servicing.23126.1 + 6.0.116-servicing.23157.11 + 6.0.116-servicing.23157.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 72715ce80770f7057b2b95c2b5b08ff2a8bca50b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 9 Mar 2023 00:44:09 +0000 Subject: [PATCH 02/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230308.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.116-servicing.23157.11 -> To Version 6.0.116-servicing.23158.33 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.15 -> To Version 6.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 22 ++++--------- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 66 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce2a54a7b..8f5c40d3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -24,13 +22,10 @@ + - - - - - + @@ -58,22 +53,17 @@ - - - + + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65066d0fb..1d2fc76cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 187b2c3d4f6f61198c63412bd5a9ea8987dce88d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 187b2c3d4f6f61198c63412bd5a9ea8987dce88d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 187b2c3d4f6f61198c63412bd5a9ea8987dce88d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 187b2c3d4f6f61198c63412bd5a9ea8987dce88d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 187b2c3d4f6f61198c63412bd5a9ea8987dce88d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 187b2c3d4f6f61198c63412bd5a9ea8987dce88d @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + e40b13eec17f01563033d479ab413aff6d723f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + e40b13eec17f01563033d479ab413aff6d723f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + e40b13eec17f01563033d479ab413aff6d723f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + e40b13eec17f01563033d479ab413aff6d723f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + e40b13eec17f01563033d479ab413aff6d723f46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + e40b13eec17f01563033d479ab413aff6d723f46 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7ffbda84d04cce61619440af4dc884437eb1998a + 428154234157d6a8cfd38116f66cbc71ee68a60d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7ffbda84d04cce61619440af4dc884437eb1998a + 428154234157d6a8cfd38116f66cbc71ee68a60d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 7ffbda84d04cce61619440af4dc884437eb1998a + 428154234157d6a8cfd38116f66cbc71ee68a60d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0dcbc1aab9655ca4444f225a7245ac43cd9715aa + ebb3e322bf7a5ffe291e96ec64008035741d0f91 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0dcbc1aab9655ca4444f225a7245ac43cd9715aa + ebb3e322bf7a5ffe291e96ec64008035741d0f91 diff --git a/eng/Versions.props b/eng/Versions.props index faebcadaa..63cda8590 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.115 + 6.0.116 @@ -44,20 +44,20 @@ - 6.0.15 - 6.0.15 - 6.0.15-servicing.23124.4 - 6.0.15-servicing.23124.4 - 6.0.15-servicing.23124.4 - 6.0.15-servicing.23124.4 + 6.0.16 + 6.0.16 + 6.0.16-servicing.23158.8 + 6.0.16-servicing.23158.8 + 6.0.16-servicing.23158.8 + 6.0.16-servicing.23158.8 0.2.0 - 6.0.116-servicing.23157.11 - 6.0.116-servicing.23157.11 + 6.0.116-servicing.23158.33 + 6.0.116-servicing.23158.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.15-servicing.23115.7 - 6.0.15-servicing.23115.7 - 6.0.15 - 6.0.15 - 6.0.15 - 6.0.15 + 6.0.16-servicing.23158.9 + 6.0.16-servicing.23158.9 + 6.0.16 + 6.0.16 + 6.0.16 + 6.0.16 2.1.0 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.115 + 6.0.116 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From f623c5a940a4d9ef54827c86b2c4fcd1313f1f49 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 9 Mar 2023 21:37:08 +0000 Subject: [PATCH 03/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230309.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.116-servicing.23157.11 -> To Version 6.0.116-servicing.23159.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.15 -> To Version 6.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8f5c40d3b..5aca7b2da 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,10 +19,10 @@ + - @@ -53,15 +53,15 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d2fc76cc..73e822d1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 187b2c3d4f6f61198c63412bd5a9ea8987dce88d + 6137b3cc317bdcc73f526baee723c2b79661cb1c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 187b2c3d4f6f61198c63412bd5a9ea8987dce88d + 6137b3cc317bdcc73f526baee723c2b79661cb1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 187b2c3d4f6f61198c63412bd5a9ea8987dce88d + 6137b3cc317bdcc73f526baee723c2b79661cb1c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 187b2c3d4f6f61198c63412bd5a9ea8987dce88d + 6137b3cc317bdcc73f526baee723c2b79661cb1c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 187b2c3d4f6f61198c63412bd5a9ea8987dce88d + 6137b3cc317bdcc73f526baee723c2b79661cb1c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 187b2c3d4f6f61198c63412bd5a9ea8987dce88d + 6137b3cc317bdcc73f526baee723c2b79661cb1c @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e40b13eec17f01563033d479ab413aff6d723f46 + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e40b13eec17f01563033d479ab413aff6d723f46 + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e40b13eec17f01563033d479ab413aff6d723f46 + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e40b13eec17f01563033d479ab413aff6d723f46 + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e40b13eec17f01563033d479ab413aff6d723f46 + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e40b13eec17f01563033d479ab413aff6d723f46 + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 428154234157d6a8cfd38116f66cbc71ee68a60d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebb3e322bf7a5ffe291e96ec64008035741d0f91 + fe68aaed4a348059c239389c2d391dc395bcc23e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebb3e322bf7a5ffe291e96ec64008035741d0f91 + fe68aaed4a348059c239389c2d391dc395bcc23e diff --git a/eng/Versions.props b/eng/Versions.props index 63cda8590..187bf8d07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23158.8 - 6.0.16-servicing.23158.8 - 6.0.16-servicing.23158.8 - 6.0.16-servicing.23158.8 + 6.0.16-servicing.23159.1 + 6.0.16-servicing.23159.1 + 6.0.16-servicing.23159.1 + 6.0.16-servicing.23159.1 0.2.0 - 6.0.116-servicing.23158.33 - 6.0.116-servicing.23158.33 + 6.0.116-servicing.23159.15 + 6.0.116-servicing.23159.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23158.9 - 6.0.16-servicing.23158.9 + 6.0.16-servicing.23158.23 + 6.0.16-servicing.23158.23 6.0.16 6.0.16 6.0.16 From 54d9eccda9c36226bba9d3abf2d3d0fd40bb43fe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 12 Mar 2023 07:08:05 +0000 Subject: [PATCH 04/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230311.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.116-servicing.23159.15 -> To Version 6.0.116-servicing.23161.4 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.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.16 -> To Version 6.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++++-------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++-------- 3 files changed, 37 insertions(+), 43 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5aca7b2da..9da6f2745 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,10 +19,7 @@ - - - - + @@ -53,15 +50,12 @@ - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73e822d1b..e375063ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + b4ba75bf386ec2f298aa0220852acac2e58f245f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + b4ba75bf386ec2f298aa0220852acac2e58f245f @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 56b0b4aad7b06c253e6d664929362efa7386bf8e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 56b0b4aad7b06c253e6d664929362efa7386bf8e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 428154234157d6a8cfd38116f66cbc71ee68a60d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe68aaed4a348059c239389c2d391dc395bcc23e + 9db20d2e3f5071e4148685fc9ef615f3b810503c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe68aaed4a348059c239389c2d391dc395bcc23e + 9db20d2e3f5071e4148685fc9ef615f3b810503c diff --git a/eng/Versions.props b/eng/Versions.props index 187bf8d07..b0738e9b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,30 +46,30 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23159.1 - 6.0.16-servicing.23159.1 - 6.0.16-servicing.23159.1 - 6.0.16-servicing.23159.1 + 6.0.16-servicing.23160.16 + 6.0.16-servicing.23160.16 + 6.0.16-servicing.23160.16 + 6.0.16-servicing.23160.16 0.2.0 - 6.0.116-servicing.23159.15 - 6.0.116-servicing.23159.15 + 6.0.116-servicing.23161.4 + 6.0.116-servicing.23161.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.8 + 6.0.9 - 6.0.16-servicing.23158.23 - 6.0.16-servicing.23158.23 + 6.0.16-servicing.23160.8 + 6.0.16-servicing.23160.8 6.0.16 6.0.16 6.0.16 From 9db06807098b629dbec1c51ef3cf6f4771de7a25 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 14 Mar 2023 19:38:08 +0000 Subject: [PATCH 05/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230314.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.116-servicing.23161.4 -> To Version 6.0.116-servicing.23164.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 e375063ea..0444d8b03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 428154234157d6a8cfd38116f66cbc71ee68a60d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9db20d2e3f5071e4148685fc9ef615f3b810503c + 546ce1cc8177b75c5119371c457cf94665e2dc39 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9db20d2e3f5071e4148685fc9ef615f3b810503c + 546ce1cc8177b75c5119371c457cf94665e2dc39 diff --git a/eng/Versions.props b/eng/Versions.props index b0738e9b1..b3c7cda83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.116-servicing.23161.4 - 6.0.116-servicing.23161.4 + 6.0.116-servicing.23164.12 + 6.0.116-servicing.23164.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d566281a372cafef28f3e209fa49b6de385b6097 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 Mar 2023 00:16:31 +0000 Subject: [PATCH 06/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230315.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.116-servicing.23161.4 -> To Version 6.0.116-servicing.23165.25 Dependency coherency updates 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.16 -> To Version 6.0.16 (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 9da6f2745..2717a24ac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -50,14 +50,14 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0444d8b03..7ff8e6f86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 732cd26e19e07ff83dacc7fe1ec25acee913eace https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 428154234157d6a8cfd38116f66cbc71ee68a60d + e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 428154234157d6a8cfd38116f66cbc71ee68a60d + e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 428154234157d6a8cfd38116f66cbc71ee68a60d + e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 546ce1cc8177b75c5119371c457cf94665e2dc39 + b590a503c965bb71620e7079262ff7757bc68ba5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 546ce1cc8177b75c5119371c457cf94665e2dc39 + b590a503c965bb71620e7079262ff7757bc68ba5 diff --git a/eng/Versions.props b/eng/Versions.props index b3c7cda83..61a33c66d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23160.16 - 6.0.16-servicing.23160.16 - 6.0.16-servicing.23160.16 - 6.0.16-servicing.23160.16 + 6.0.16-servicing.23164.13 + 6.0.16-servicing.23164.13 + 6.0.16-servicing.23164.13 + 6.0.16-servicing.23164.13 0.2.0 - 6.0.116-servicing.23164.12 - 6.0.116-servicing.23164.12 + 6.0.116-servicing.23165.25 + 6.0.116-servicing.23165.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 781f9953cf29cb8ccb196752f5cbb599c2ea7173 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 17 Mar 2023 20:18:46 +0000 Subject: [PATCH 07/17] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230317.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.116-servicing.23161.4 -> To Version 6.0.116-servicing.23167.7 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.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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.16 -> To Version 6.0.16 (parent: Microsoft.NET.Sdk --- NuGet.config | 23 ++++----------------- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2717a24ac..5e7f30663 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,19 @@ - + - - - - - - + - - - - - @@ -50,21 +40,16 @@ - + - + - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ff8e6f86..c10a8e3cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b4ba75bf386ec2f298aa0220852acac2e58f245f + 90ad458e8bbe50831ff4edb0f3a51699a4acf21c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 732cd26e19e07ff83dacc7fe1ec25acee913eace + 206b88efa734237274703a99f3b131e68a089767 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b590a503c965bb71620e7079262ff7757bc68ba5 + 9c1b30712e58ea4e2f480da354c71f7791e43aa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b590a503c965bb71620e7079262ff7757bc68ba5 + 9c1b30712e58ea4e2f480da354c71f7791e43aa2 diff --git a/eng/Versions.props b/eng/Versions.props index 61a33c66d..4d89dadef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23164.13 - 6.0.16-servicing.23164.13 - 6.0.16-servicing.23164.13 - 6.0.16-servicing.23164.13 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 0.2.0 - 6.0.116-servicing.23165.25 - 6.0.116-servicing.23165.25 + 6.0.116-servicing.23167.7 + 6.0.116-servicing.23167.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23160.8 - 6.0.16-servicing.23160.8 + 6.0.16-servicing.23166.11 + 6.0.16-servicing.23166.11 6.0.16 6.0.16 6.0.16 From 2ea84b981412e2ff6daa85b736275ad8c931811a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Mar 2023 15:54:00 +0000 Subject: [PATCH 08/17] Merged PR 30108: [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**: 20230320.13 - **Date Produced**: March 20, 2023 10:10:30 PM UTC - **Commit**: 4fa9c455ef782761a6d262894c14ba313c8e0174 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.116-servicing.23167.7 to 6.0.116-servicing.23170.13][1] - **Microsoft.NET.Sdk**: [from 6.0.116-servicing.23167.7 to 6.0.116-servicing.23170.13][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC9c1b307&targetVersion=GC4fa9c45&_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 aba1df8c6..5c0935320 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c1b30712e58ea4e2f480da354c71f7791e43aa2 + 4fa9c455ef782761a6d262894c14ba313c8e0174 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c1b30712e58ea4e2f480da354c71f7791e43aa2 + 4fa9c455ef782761a6d262894c14ba313c8e0174 diff --git a/eng/Versions.props b/eng/Versions.props index c75fbce8a..d26178750 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.116-servicing.23167.7 - 6.0.116-servicing.23167.7 + 6.0.116-servicing.23170.13 + 6.0.116-servicing.23170.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a4dc438ca3809010655d2091b4f9aded41f906d7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Mar 2023 23:59:44 +0000 Subject: [PATCH 09/17] Merged PR 30123: [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.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.116 to 6.0.116 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.116-servicing.23165.4 to 6.0.116-servicing.23171.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.116 to 6.0.116 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.15 to 6.0.15 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [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**: 20230321.9 - **Date Produced**: March 21, 2023 4:22:36 PM UTC - **Commit**: 56c6c6274b78ee84a90c31e3a9194b1f976fdd37 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.116-servic... --- NuGet.config | 13 +++++----- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------ 3 files changed, 43 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5e7f30663..222323e22 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,18 @@ - + + - + - + @@ -40,14 +41,14 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c0935320..8ac61c47c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 90ad458e8bbe50831ff4edb0f3a51699a4acf21c + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + 41a64905967d6579041b042c2295820c2cf38578 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0 + 66cb08941c7ebbcd58965e7c93505963d1c57abb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0 + 66cb08941c7ebbcd58965e7c93505963d1c57abb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e2ab2f3e70d016866890a66ff6aa0dd54e8ffbf0 + 66cb08941c7ebbcd58965e7c93505963d1c57abb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4fa9c455ef782761a6d262894c14ba313c8e0174 + 56c6c6274b78ee84a90c31e3a9194b1f976fdd37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4fa9c455ef782761a6d262894c14ba313c8e0174 + 56c6c6274b78ee84a90c31e3a9194b1f976fdd37 @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 0c39542771ca202430d0042f710622b5b916ff0a + 253a56aaea0d63f84cc277cef649834f4c1798c6 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index d26178750..f95fbcd28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 0.2.0 - 6.0.116-servicing.23170.13 - 6.0.116-servicing.23170.13 + 6.0.116-servicing.23171.9 + 6.0.116-servicing.23171.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23166.11 - 6.0.16-servicing.23166.11 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 6.0.16 6.0.16 6.0.16 From 3089a1d4b7551d312213743b832b50bfde7fbf2b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 16:06:47 +0000 Subject: [PATCH 10/17] Merged PR 30134: [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.23117.9 to 6.0.15-servicing.23171.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23117.9 to 6.0.15-servicing.23171.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.116 to 6.0.116 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.116-servicing.23171.5 to 6.0.116-servicing.23171.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.116 to 6.0.116 (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.15-servicing.23117.2 to 6.0.16-servicing.23171.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.15-servicing.23117.5 to 6.0.16-servicing.23171.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**: 20230321.33 - **Date Produced**: March 22, 2023 12:26:51 AM UTC - **Commit**: 81ea7867de3059aee7bc5fb314f8d6c386f0490e - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuil... --- NuGet.config | 10 +++++--- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 44 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 222323e22..4be8284c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,9 +18,10 @@ - + + @@ -41,16 +42,17 @@ - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ac61c47c..e901d56ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6b2fdd77613088f3c2ac2c52f7873098ee1d1860 + 8488fb31c8f0e9648730cf942a5ae868ddf975c2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 66cb08941c7ebbcd58965e7c93505963d1c57abb + 2e7bc15165c478deec1899a56c16cc26a3ebb5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 66cb08941c7ebbcd58965e7c93505963d1c57abb + 2e7bc15165c478deec1899a56c16cc26a3ebb5b2 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 66cb08941c7ebbcd58965e7c93505963d1c57abb + 2e7bc15165c478deec1899a56c16cc26a3ebb5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 56c6c6274b78ee84a90c31e3a9194b1f976fdd37 + 81ea7867de3059aee7bc5fb314f8d6c386f0490e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 56c6c6274b78ee84a90c31e3a9194b1f976fdd37 + 81ea7867de3059aee7bc5fb314f8d6c386f0490e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1808f3abeb2af5809325c218ec752ab185df6678 + 02e4f4f5bc2d6027944d5144a3458bad23daa2ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c68b021c8a031d8f1bf757dc16e44c10ed8c820e + 6021156ac38d10eee9ca9d17553366352d3e8408 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f95fbcd28..b6aafc611 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.15-servicing.23117.2 + 6.0.16-servicing.23171.2 - 6.0.15-servicing.23117.5 + 6.0.16-servicing.23171.3 @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 0.2.0 - 6.0.116-servicing.23171.9 - 6.0.116-servicing.23171.9 + 6.0.116-servicing.23171.33 + 6.0.116-servicing.23171.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.15-servicing.23117.9 - 6.0.15-servicing.23117.9 + 6.0.15-servicing.23171.6 + 6.0.15-servicing.23171.6 6.0.15 6.0.15 From 04bc2bc3fca8dce3713e6e6a63f2a08c11b65b56 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 18:45:10 +0000 Subject: [PATCH 11/17] Merged PR 30154: [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.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21 (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**: 20230322.9 - **Date Produced**: March 22, 2023 4:44:22 PM UTC - **Commit**: 37020e9cad5d0381f34e20a6209d94050afdfd8b - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.116-servicing.23171.33 to 6.0.116-servicing.23172.9][1] - **Microsoft.NET.Sdk**: [from 6.0.116-servicing.23171.33 to 6.0.116-servicing.23172.9][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.16 to 6.0.16][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] - **dotnet-dev-certs**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] - **dotnet-user-secrets**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23170.21][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC81ea786&targetVersion=GC37020e9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCbb8d881&targetVersion=GC41a6490&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- 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 4be8284c4..ea9b2dcb2 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 e901d56ec..08d38c159 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb8d881a95dba60e5fa392f8cb156f2ec39aed15 + 41a64905967d6579041b042c2295820c2cf38578 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2e7bc15165c478deec1899a56c16cc26a3ebb5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 81ea7867de3059aee7bc5fb314f8d6c386f0490e + 37020e9cad5d0381f34e20a6209d94050afdfd8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 81ea7867de3059aee7bc5fb314f8d6c386f0490e + 37020e9cad5d0381f34e20a6209d94050afdfd8b diff --git a/eng/Versions.props b/eng/Versions.props index b6aafc611..85950769d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 + 6.0.16-servicing.23170.21 0.2.0 - 6.0.116-servicing.23171.33 - 6.0.116-servicing.23171.33 + 6.0.116-servicing.23172.9 + 6.0.116-servicing.23172.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 341801858cafde1dfe92df449e3eeaaec153f0fa Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Mar 2023 13:57:19 +0000 Subject: [PATCH 12/17] Merged PR 30185: [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.NET.Test.Sdk**: from 17.0.0 to 17.0.1-release-20211109-01 (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**: 20230322.27 - **Date Produced**: March 23, 2023 2:54:22 AM UTC - **Commit**: 16844aaccabe0ea76106335d371e1acb07fec6e4 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.116-servicing.23172.9 to 6.0.116-servicing.23172.27][1] - **Microsoft.NET.Sdk**: [from 6.0.116-servicing.23172.9 to 6.0.116-servicing.23172.27][1] - **Microsoft.NET.Test.Sdk**: [from 17.0.0 to 17.0.1-release-20211109-01][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC37020e9cad&targetVersion=GC16844aacca&_a=files [2]: https://github.com/microsoft/vstest/compare/68bd10d3ae...742433312e [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08d38c159..c27e4b479 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2e7bc15165c478deec1899a56c16cc26a3ebb5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 37020e9cad5d0381f34e20a6209d94050afdfd8b + 16844aaccabe0ea76106335d371e1acb07fec6e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 37020e9cad5d0381f34e20a6209d94050afdfd8b + 16844aaccabe0ea76106335d371e1acb07fec6e4 @@ -130,9 +130,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 68bd10d3aee862a9fbb0bac8b3d474bc323024f3 + 742433312efff3e088b39c3d477c18a4ec5ee67b diff --git a/eng/Versions.props b/eng/Versions.props index 85950769d..a468bf833 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.116-servicing.23172.9 - 6.0.116-servicing.23172.9 + 6.0.116-servicing.23172.27 + 6.0.116-servicing.23172.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0 + 17.0.1-release-20211109-01 From 975a3553e2c7fec5637e85bc604447ea98400f18 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Mar 2023 19:29:21 +0000 Subject: [PATCH 13/17] Merged PR 30197: [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.NET.Test.Sdk**: from 17.0.1-release-20211109-01 to 17.0.2-release-20230323-12 (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**: 20230323.9 - **Date Produced**: March 23, 2023 6:56:56 PM UTC - **Commit**: 1bbe7d4db182986a8b5bb9e9052a4354fdb4fcb2 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.116-servicing.23172.27 to 6.0.116-servicing.23173.9][1] - **Microsoft.NET.Sdk**: [from 6.0.116-servicing.23172.27 to 6.0.116-servicing.23173.9][1] - **Microsoft.NET.Test.Sdk**: [from 17.0.1-release-20211109-01 to 17.0.2-release-20230323-12][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC16844aacca&targetVersion=GC1bbe7d4db1&_a=files [2]: https://github.com/microsoft/vstest/compare/742433312e...7778347509 [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c27e4b479..cb6c14fe3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2e7bc15165c478deec1899a56c16cc26a3ebb5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16844aaccabe0ea76106335d371e1acb07fec6e4 + 1bbe7d4db182986a8b5bb9e9052a4354fdb4fcb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16844aaccabe0ea76106335d371e1acb07fec6e4 + 1bbe7d4db182986a8b5bb9e9052a4354fdb4fcb2 @@ -130,9 +130,9 @@ 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - 742433312efff3e088b39c3d477c18a4ec5ee67b + 7778347509e70cdcaa14a09103939fe295a00bb3 diff --git a/eng/Versions.props b/eng/Versions.props index a468bf833..eed208969 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.116-servicing.23172.27 - 6.0.116-servicing.23172.27 + 6.0.116-servicing.23173.9 + 6.0.116-servicing.23173.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.1-release-20211109-01 + 17.0.2-release-20230323-12 From 08b77c3d6d661b7beaf925c6e1b7f03193494e33 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 16:14:02 +0000 Subject: [PATCH 14/17] Merged PR 30226: [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.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.15 to 6.0.16 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [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**: 20230324.11 - **Date Produced**: March 24, 2023 8:44:04 PM UTC - **Commit**: edba73512c2706caae68844328f90116d227e288 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.116-servicing.23173.9 to 6.0.116-servicing.23174.11][1] - **Microsoft.NET.Sdk**: [from 6.0.116-servicing.23173.9 to 6.0.116-servicing.23174.11][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.16][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.16 to 6.0.16][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.16 to 6.0.16][2] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.9][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.15 to 6.0.16][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1bbe7d4db1&targetVersion=GCedba73512c&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC567f... --- NuGet.config | 8 +++----- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index ea9b2dcb2..3e51c5361 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,18 +10,17 @@ - + - + - @@ -47,12 +46,11 @@ - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb6c14fe3..72d7ed084 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 8488fb31c8f0e9648730cf942a5ae868ddf975c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe @@ -50,7 +50,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2e7bc15165c478deec1899a56c16cc26a3ebb5b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bbe7d4db182986a8b5bb9e9052a4354fdb4fcb2 + edba73512c2706caae68844328f90116d227e288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bbe7d4db182986a8b5bb9e9052a4354fdb4fcb2 + edba73512c2706caae68844328f90116d227e288 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 253a56aaea0d63f84cc277cef649834f4c1798c6 + a243060cdb356f166664b5d0c3dad206299935e7 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index eed208969..c2fab0ae7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.116-servicing.23173.9 - 6.0.116-servicing.23173.9 + 6.0.116-servicing.23174.11 + 6.0.116-servicing.23174.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 + 6.0.16-servicing.23173.11 + 6.0.16-servicing.23173.11 6.0.16 6.0.16 6.0.16 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.15 + 6.0.16 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 73eb51231a2ff84ef61f0ddbc14beb9e5f4a98a9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 19:20:30 +0000 Subject: [PATCH 15/17] Merged PR 30243: [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.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.116 to 6.0.116 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.116-servicing.23171.9 to 6.0.116-servicing.23174.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.116 to 6.0.116 (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**: 20230325.1 - **Date Produced**: March 25, 2023 4:41:01 PM UTC - **Commit**: 38b338ff57b4f0f2c120fe26d4186ca6dbd7ad47 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.116-servicing.23174.11 to 6.0.116-servicing.23175.1][1] - **Microsoft.NET.Sdk**: [from 6.0.116-servicing.23174.11 to 6.0.116-servicing.23175.1][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.16 to 6.0.16][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **dotnet-dev-certs**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **dotnet-user-secrets**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.116 to 6.0.116][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.116-servicing.23171.9 to 6.0.116-servicing.23174.5][3] - **Mic... --- 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 3e51c5361..67e04a3d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -41,14 +41,14 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72d7ed084..a4edc81a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 41a64905967d6579041b042c2295820c2cf38578 + d6f154cca3863703cf87c8b840eea9cbe20229b2 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2e7bc15165c478deec1899a56c16cc26a3ebb5b2 + d3c2532d3f57ceb36692d9f4c13b696018f64ab6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2e7bc15165c478deec1899a56c16cc26a3ebb5b2 + d3c2532d3f57ceb36692d9f4c13b696018f64ab6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2e7bc15165c478deec1899a56c16cc26a3ebb5b2 + d3c2532d3f57ceb36692d9f4c13b696018f64ab6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edba73512c2706caae68844328f90116d227e288 + 38b338ff57b4f0f2c120fe26d4186ca6dbd7ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edba73512c2706caae68844328f90116d227e288 + 38b338ff57b4f0f2c120fe26d4186ca6dbd7ad47 diff --git a/eng/Versions.props b/eng/Versions.props index c2fab0ae7..5de869fc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 - 6.0.16-servicing.23170.21 + 6.0.16-servicing.23174.6 + 6.0.16-servicing.23174.6 + 6.0.16-servicing.23174.6 + 6.0.16-servicing.23174.6 0.2.0 - 6.0.116-servicing.23174.11 - 6.0.116-servicing.23174.11 + 6.0.116-servicing.23175.1 + 6.0.116-servicing.23175.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 169cb7c94b5466dbfc3219c7b923f1d3ac7a054a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 22:08:12 +0000 Subject: [PATCH 16/17] Merged PR 30256: [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.23171.6 to 6.0.15-servicing.23175.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23171.6 to 6.0.15-servicing.23175.3 (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.16-servicing.23171.2 to 6.0.16-servicing.23174.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.16-servicing.23171.3 to 6.0.16-servicing.23175.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**: 20230325.12 - **Date Produced**: March 25, 2023 8:18:17 PM UTC - **Commit**: bd232ed9f8c0ca978a8471889adb6c4fff1d8aaf - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.116-servicing.23175.1 to 6.0.116-servicing.23175.12][1] - **Microsoft.NET.Sdk**: [from 6.0.116-servicing.23175.1 to 6.0.116-servicing.23175.12][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.15 to 6.0.15][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23171.6 to 6.0.15-servicing.23175.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.15-servicing.23171.6 to 6.0.15-servicing.23175.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23171.2 to 6.0.16-servicing.23174.2][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.16-servicing.23171.3 to 6.0.16-servicing.23175.3][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC38b338ff57&targetVersion=GCbd232ed9f8&_a=files [2]: https://d... --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 67e04a3d0..2876f94bd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,6 +21,7 @@ + @@ -51,6 +52,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4edc81a0..cae70c935 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8488fb31c8f0e9648730cf942a5ae868ddf975c2 + 1b343fdc0950b4a59881538c9768e32b16a97ecf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d3c2532d3f57ceb36692d9f4c13b696018f64ab6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38b338ff57b4f0f2c120fe26d4186ca6dbd7ad47 + bd232ed9f8c0ca978a8471889adb6c4fff1d8aaf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38b338ff57b4f0f2c120fe26d4186ca6dbd7ad47 + bd232ed9f8c0ca978a8471889adb6c4fff1d8aaf - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 02e4f4f5bc2d6027944d5144a3458bad23daa2ec + 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6021156ac38d10eee9ca9d17553366352d3e8408 + 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5de869fc8..edbcc81eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.16-servicing.23171.2 + 6.0.16-servicing.23174.2 - 6.0.16-servicing.23171.3 + 6.0.16-servicing.23175.3 @@ -56,8 +56,8 @@ - 6.0.116-servicing.23175.1 - 6.0.116-servicing.23175.1 + 6.0.116-servicing.23175.12 + 6.0.116-servicing.23175.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.15-servicing.23171.6 - 6.0.15-servicing.23171.6 + 6.0.15-servicing.23175.3 + 6.0.15-servicing.23175.3 6.0.15 6.0.15 From b605cc131fcdef9956ddefe092069c57938a98db Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Mar 2023 22:59:25 +0000 Subject: [PATCH 17/17] Merged PR 30278: [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.16 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.16 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.15 to 6.0.16 (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**: 20230327.14 - **Date Produced**: March 27, 2023 9:05:02 PM UTC - **Commit**: fd373338fdfbf3c6aac707ae660e2121fe0c2b7a - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.116-servicing.23175.12 to 6.0.116-servicing.23177.14][1] - **Microsoft.NET.Sdk**: [from 6.0.116-servicing.23175.12 to 6.0.116-servicing.23177.14][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.15 to 6.0.16][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.15-servicing.23175.3 to 6.0.16-servicing.23177.4][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.16][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.15 to 6.0.16][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbd232ed9f8&targetVersion=GCfd373338fd&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC1b343fdc09&targetVersion=GCbde268e756&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2876f94bd..d589623e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,8 @@ - + + @@ -52,7 +53,8 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cae70c935..a50b0c49c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1b343fdc0950b4a59881538c9768e32b16a97ecf + bde268e756b9e5b8240cce27114a150e9f61967e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d3c2532d3f57ceb36692d9f4c13b696018f64ab6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bd232ed9f8c0ca978a8471889adb6c4fff1d8aaf + fd373338fdfbf3c6aac707ae660e2121fe0c2b7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bd232ed9f8c0ca978a8471889adb6c4fff1d8aaf + fd373338fdfbf3c6aac707ae660e2121fe0c2b7a diff --git a/eng/Versions.props b/eng/Versions.props index edbcc81eb..9ccff25a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.116-servicing.23175.12 - 6.0.116-servicing.23175.12 + 6.0.116-servicing.23177.14 + 6.0.116-servicing.23177.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.15-servicing.23175.3 - 6.0.15-servicing.23175.3 - 6.0.15 - 6.0.15 + 6.0.16-servicing.23177.4 + 6.0.16-servicing.23177.4 + 6.0.16 + 6.0.16