From 72715ce80770f7057b2b95c2b5b08ff2a8bca50b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 9 Mar 2023 00:44:09 +0000 Subject: [PATCH 1/2] 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 2/2] 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