From d5b7bcb55a147fe912225bf849d61c7b180dabfc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 7 Mar 2023 20:37:58 +0000 Subject: [PATCH 01/13] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.407-servicing.23126.3 -> To Version 6.0.408-servicing.23157.8 --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index bbd67aded..698834a3d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,11 +17,15 @@ + + + + @@ -42,9 +48,13 @@ + + + + @@ -52,6 +62,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e926e9ad0..52df3b49a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f7588fcd6922febeacca723a71b403edb9f4bdf + d6300a418ed4214d2010351d37521147bd27693f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f7588fcd6922febeacca723a71b403edb9f4bdf + d6300a418ed4214d2010351d37521147bd27693f diff --git a/eng/Versions.props b/eng/Versions.props index 2272bba06..7d2b36c8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.407-servicing.23126.3 - 6.0.407-servicing.23126.3 + 6.0.408-servicing.23157.8 + 6.0.408-servicing.23157.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 05d6ddeec6b2fd7dd5051eb61999e93da71f618e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Mar 2023 01:45:45 +0000 Subject: [PATCH 02/13] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.407-servicing.23126.3 -> To Version 6.0.408-servicing.23157.26 --- 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 52df3b49a..c2f9353fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6300a418ed4214d2010351d37521147bd27693f + 7b3112fca55adde458b1f129757508cac1eccf0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d6300a418ed4214d2010351d37521147bd27693f + 7b3112fca55adde458b1f129757508cac1eccf0f diff --git a/eng/Versions.props b/eng/Versions.props index 7d2b36c8f..be1ab5d01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.408-servicing.23157.8 - 6.0.408-servicing.23157.8 + 6.0.408-servicing.23157.26 + 6.0.408-servicing.23157.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 725dbe49aec80696390e9766b9fb51d3937566cc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 9 Mar 2023 21:33:13 +0000 Subject: [PATCH 03/13] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230309.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.408-servicing.23157.26 -> To Version 6.0.408-servicing.23159.16 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 From Version 6.0.15-servicing.23115.7 -> To Version 6.0.16-servicing.23158.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++----- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 3 files changed, 46 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 698834a3d..4e09bbbb1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,14 @@ - - - + + @@ -48,14 +47,13 @@ - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2f9353fa..f43f3e20b 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 + 6137b3cc317bdcc73f526baee723c2b79661cb1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 6137b3cc317bdcc73f526baee723c2b79661cb1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 6137b3cc317bdcc73f526baee723c2b79661cb1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 6137b3cc317bdcc73f526baee723c2b79661cb1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 6137b3cc317bdcc73f526baee723c2b79661cb1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 6137b3cc317bdcc73f526baee723c2b79661cb1c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a6d775f49623bbd742c02f89d373630668547bb + 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7b3112fca55adde458b1f129757508cac1eccf0f + 8ce45d15c6b4ee90b2e16c4ebe3feeb0dc3c2b33 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7b3112fca55adde458b1f129757508cac1eccf0f + 8ce45d15c6b4ee90b2e16c4ebe3feeb0dc3c2b33 diff --git a/eng/Versions.props b/eng/Versions.props index 38f357e2f..390ff4df1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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.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.408-servicing.23157.26 - 6.0.408-servicing.23157.26 + 6.0.408-servicing.23159.16 + 6.0.408-servicing.23159.16 $(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.23 + 6.0.16-servicing.23158.23 + 6.0.16 + 6.0.16 + 6.0.16 + 6.0.16 2.1.0 From 0d89344f12a83a73e19c0cdb26ec6d64a5063c7d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 10 Mar 2023 23:07:45 +0000 Subject: [PATCH 04/13] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230310.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.408-servicing.23157.26 -> To Version 6.0.408-servicing.23160.20 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.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 From Version 6.0.15-servicing.23115.7 -> To Version 6.0.16-servicing.23159.13 (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 4e09bbbb1..22ab5e1f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,14 @@ - + - - - - + @@ -47,13 +44,10 @@ - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f43f3e20b..7e5650668 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 + 964350a9d183cff60d800229c203ee8210a0a96e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + 964350a9d183cff60d800229c203ee8210a0a96e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + 964350a9d183cff60d800229c203ee8210a0a96e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + 964350a9d183cff60d800229c203ee8210a0a96e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + 964350a9d183cff60d800229c203ee8210a0a96e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6137b3cc317bdcc73f526baee723c2b79661cb1c + 964350a9d183cff60d800229c203ee8210a0a96e @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 964350a9d183cff60d800229c203ee8210a0a96e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23cbd6b5d1c5e3fe9e40e62045ea6981d0b5fbf7 + 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce45d15c6b4ee90b2e16c4ebe3feeb0dc3c2b33 + baf96e743f8a54782ff4a8f109a9a7ff1e390e9a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ce45d15c6b4ee90b2e16c4ebe3feeb0dc3c2b33 + baf96e743f8a54782ff4a8f109a9a7ff1e390e9a diff --git a/eng/Versions.props b/eng/Versions.props index 390ff4df1..75aeb4bf3 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.6 + 6.0.16-servicing.23160.6 + 6.0.16-servicing.23160.6 + 6.0.16-servicing.23160.6 0.2.0 - 6.0.408-servicing.23159.16 - 6.0.408-servicing.23159.16 + 6.0.408-servicing.23160.20 + 6.0.408-servicing.23160.20 $(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.23159.13 + 6.0.16-servicing.23159.13 6.0.16 6.0.16 6.0.16 From 70a7a81aea8b9df6b6e7af10c8cadbbb763bcf08 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 12 Mar 2023 05:33:53 +0000 Subject: [PATCH 05/13] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230311.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.408-servicing.23160.20 -> To Version 6.0.408-servicing.23161.1 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.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 From Version 6.0.16-servicing.23159.13 -> To Version 6.0.16-servicing.23160.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 22ab5e1f6..0d615458a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,14 @@ - + - + @@ -44,10 +44,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e5650668..7d51c6db7 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 - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 964350a9d183cff60d800229c203ee8210a0a96e + b4ba75bf386ec2f298aa0220852acac2e58f245f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92f3976ea69d37c5edce8d9d012f9d7df0f78d34 + 56b0b4aad7b06c253e6d664929362efa7386bf8e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 647bf84ba835f020ec0da08ca90f6682cd1ddc65 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baf96e743f8a54782ff4a8f109a9a7ff1e390e9a + 248110f022721e52b26b3077f807e45f8ff8169e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baf96e743f8a54782ff4a8f109a9a7ff1e390e9a + 248110f022721e52b26b3077f807e45f8ff8169e diff --git a/eng/Versions.props b/eng/Versions.props index 75aeb4bf3..901bb5811 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.16 6.0.16 - 6.0.16-servicing.23160.6 - 6.0.16-servicing.23160.6 - 6.0.16-servicing.23160.6 - 6.0.16-servicing.23160.6 + 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.408-servicing.23160.20 - 6.0.408-servicing.23160.20 + 6.0.408-servicing.23161.1 + 6.0.408-servicing.23161.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.16-servicing.23159.13 - 6.0.16-servicing.23159.13 + 6.0.16-servicing.23160.8 + 6.0.16-servicing.23160.8 6.0.16 6.0.16 6.0.16 From e8391e42e43aeee656cf8d5917e6931619b9c09e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Mar 2023 15:55:21 +0000 Subject: [PATCH 06/13] Merged PR 30006: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230317.8 - **Date Produced**: March 17, 2023 7:57:45 PM UTC - **Commit**: 91abb6f0627ff7198b847f7102e3125330565689 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23161.1 to 6.0.408-servicing.23167.8][6] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23161.1 to 6.0.408-servicing.23167.8][6] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23160.8 to 6.0.16-servicing.23166.11][7] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.16][7] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.16-servicing.23160.8 to 6.0.16-servicing.23166.11][7] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][7] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.16 to 6.0.16][7] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.16 to 6.0.16][7] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.9][7] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.16 to 6.0.16][8] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.16-servicing.23160.16 to 6.0.16-servicing.23166.11][8] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][8] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23160.16 to 6.0.16-servicing.23166.11][8] - **dotnet-dev-certs**: [from 6.0.16-servicing.23160.16 to 6.0.16-servicing.23166.11][8] - **dotnet-user-secrets**: [from 6.0.16-servicing.23160.16 to 6.0.16-servicing.23166.11][8] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.406 to 6.0.408][9] - **Microsoft.TemplateEngine.Cli**: [from 6.0.406-rtm.23074.6 to 6.0.408-rtm.23165.2][9] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.406 to 6.0.408][9] [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC248110f&targetVersion=GC91abb6f&_a=files [7]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCb4ba75b&targetVersion=GC90ad458&_a=files [8]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC56b0b4a&targetVersion=GC206b88e&_a=files [9]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC647bf84&targetVersion=GCb2eeea6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) [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/dotne... --- NuGet.config | 20 +++++--------- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 45 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0d615458a..f26c40ae8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,19 @@ - + - + + - - - - - @@ -44,19 +40,15 @@ - + - + + - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c97832f38..ebc4c3b83 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 - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b0b4aad7b06c253e6d664929362efa7386bf8e + 206b88efa734237274703a99f3b131e68a089767 https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 647bf84ba835f020ec0da08ca90f6682cd1ddc65 + b2eeea6da5301535d1b984b2d167b41d41d86a4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 647bf84ba835f020ec0da08ca90f6682cd1ddc65 + b2eeea6da5301535d1b984b2d167b41d41d86a4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 647bf84ba835f020ec0da08ca90f6682cd1ddc65 + b2eeea6da5301535d1b984b2d167b41d41d86a4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 248110f022721e52b26b3077f807e45f8ff8169e + 91abb6f0627ff7198b847f7102e3125330565689 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 248110f022721e52b26b3077f807e45f8ff8169e + 91abb6f0627ff7198b847f7102e3125330565689 diff --git a/eng/Versions.props b/eng/Versions.props index 6488414ff..6a01f8585 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.406 + 6.0.408 @@ -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.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.408-servicing.23161.1 - 6.0.408-servicing.23161.1 + 6.0.408-servicing.23167.8 + 6.0.408-servicing.23167.8 $(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 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.406 + 6.0.408 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 984df18d4945078b76055e00f96aba2ce1e19bc1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 16:49:31 +0000 Subject: [PATCH 07/13] Merged PR 30135: [internal/release/6.0.4xx] 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) - **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.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.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.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.16-servicing.23166.11 to 6.0.16-servicing.23170.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.408 to 6.0.408 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.408-rtm.23165.2 to 6.0.408-rtm.23171.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.408 to 6.0.408 (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-... --- NuGet.config | 14 ++++---- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 57 insertions(+), 55 deletions(-) diff --git a/NuGet.config b/NuGet.config index f26c40ae8..c513f0d95 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,20 @@ - + - + - + + @@ -40,15 +41,16 @@ - + - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ebc4c3b83..c6fd8b0ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ 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 - 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 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 206b88efa734237274703a99f3b131e68a089767 + bb8d881a95dba60e5fa392f8cb156f2ec39aed15 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b2eeea6da5301535d1b984b2d167b41d41d86a4c + 8af471086762e04add1ecf2991da0bd0200268be - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b2eeea6da5301535d1b984b2d167b41d41d86a4c + 8af471086762e04add1ecf2991da0bd0200268be https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b2eeea6da5301535d1b984b2d167b41d41d86a4c + 8af471086762e04add1ecf2991da0bd0200268be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91abb6f0627ff7198b847f7102e3125330565689 + d955d3b4e992bc28a3c1ac56f86cd09c0aab3de0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 91abb6f0627ff7198b847f7102e3125330565689 + d955d3b4e992bc28a3c1ac56f86cd09c0aab3de0 - + 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 6a01f8585..027f5d4ea 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.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.9 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 0.2.0 - 6.0.408-servicing.23167.8 - 6.0.408-servicing.23167.8 + 6.0.408-servicing.23171.34 + 6.0.408-servicing.23171.34 $(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 @@ -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 c1f6cbb80dd7d9af44932a56a32dbe55fdf8f496 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 18:53:17 +0000 Subject: [PATCH 08/13] Merged PR 30153: [internal/release/6.0.4xx] 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:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230322.11 - **Date Produced**: March 22, 2023 4:45:37 PM UTC - **Commit**: 689317e28f02dbc18867358491b75cdfc08ee487 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23171.34 to 6.0.408-servicing.23172.11][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23171.34 to 6.0.408-servicing.23172.11][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=GCd955d3b&targetVersion=GC689317e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCbb8d881&targetVersion=GC41a6490&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 c513f0d95..bea49ce3c 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 c6fd8b0ab..41ac374ec 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 8af471086762e04add1ecf2991da0bd0200268be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d955d3b4e992bc28a3c1ac56f86cd09c0aab3de0 + 689317e28f02dbc18867358491b75cdfc08ee487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d955d3b4e992bc28a3c1ac56f86cd09c0aab3de0 + 689317e28f02dbc18867358491b75cdfc08ee487 diff --git a/eng/Versions.props b/eng/Versions.props index 027f5d4ea..0b78522a0 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.408-servicing.23171.34 - 6.0.408-servicing.23171.34 + 6.0.408-servicing.23172.11 + 6.0.408-servicing.23172.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a7b826c98184e97ee81572f52dc1b5e0bc9e18a7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Mar 2023 16:00:36 +0000 Subject: [PATCH 09/13] Merged PR 30194: [internal/release/6.0.4xx] 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.3.1 to 17.3.2 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230323.4 - **Date Produced**: March 23, 2023 3:29:58 PM UTC - **Commit**: 42e2abaa4121743673f8695c74aa69d681e8f4af - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23172.11 to 6.0.408-servicing.23173.4][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23172.11 to 6.0.408-servicing.23173.4][1] - **Microsoft.NET.Test.Sdk**: [from 17.3.1 to 17.3.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC689317e28f&targetVersion=GC42e2abaa41&_a=files [2]: https://github.com/microsoft/vstest/compare/83d2f8162d...dd7c26bf1f [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 41ac374ec..9f16a5d16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8af471086762e04add1ecf2991da0bd0200268be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 689317e28f02dbc18867358491b75cdfc08ee487 + 42e2abaa4121743673f8695c74aa69d681e8f4af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 689317e28f02dbc18867358491b75cdfc08ee487 + 42e2abaa4121743673f8695c74aa69d681e8f4af @@ -130,9 +130,9 @@ 5d69143fbe992d8fa33d5b83d5fdd5f4ed7bb4fc - + https://github.com/microsoft/vstest - 83d2f8162d29a66a8ff323c4bba93c8250013511 + dd7c26bf1fa66d50a0f21999e24f7b7e4195ae05 diff --git a/eng/Versions.props b/eng/Versions.props index 0b78522a0..ac761201a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.408-servicing.23172.11 - 6.0.408-servicing.23172.11 + 6.0.408-servicing.23173.4 + 6.0.408-servicing.23173.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -152,7 +152,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.3.1 + 17.3.2 From 50050b19ed5bf45225d668d4a07cca7c21d33ee9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 16:14:19 +0000 Subject: [PATCH 10/13] Merged PR 30227: [internal/release/6.0.4xx] 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.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.NET.Sdk) - **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) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230324.13 - **Date Produced**: March 24, 2023 8:46:45 PM UTC - **Commit**: c2e11e37e99cdc36f17bee572c0b0e605dd60fff - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23173.4 to 6.0.408-servicing.23174.13][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23173.4 to 6.0.408-servicing.23174.13][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] - **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] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC42e2abaa41&targetVersion=GCc2e11e37e9&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC567ff53ac7&targetVersion=GC1e620a42e7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index bea49ce3c..d48582a42 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,13 +14,12 @@ - + - @@ -44,13 +43,12 @@ - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f16a5d16..9d2325c80 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 8af471086762e04add1ecf2991da0bd0200268be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 42e2abaa4121743673f8695c74aa69d681e8f4af + c2e11e37e99cdc36f17bee572c0b0e605dd60fff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 42e2abaa4121743673f8695c74aa69d681e8f4af + c2e11e37e99cdc36f17bee572c0b0e605dd60fff diff --git a/eng/Versions.props b/eng/Versions.props index ac761201a..e91e0a4f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.408-servicing.23173.4 - 6.0.408-servicing.23173.4 + 6.0.408-servicing.23174.13 + 6.0.408-servicing.23174.13 $(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 From 3d2f6cc5e6d748d4fca121c026fad8d422d22b2f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 19:20:40 +0000 Subject: [PATCH 11/13] Merged PR 30245: [internal/release/6.0.4xx] 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.408 to 6.0.408 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.408-rtm.23171.3 to 6.0.408-rtm.23174.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.408 to 6.0.408 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230325.3 - **Date Produced**: March 25, 2023 4:41:12 PM UTC - **Commit**: 19eb8146e388a98ba03c09e911baf54402d8d1e3 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23174.13 to 6.0.408-servicing.23175.3][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23174.13 to 6.0.408-servicing.23175.3][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.408 to 6.0.408][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.408-rtm.23171.3 to 6.0.408-rtm.23174.7][3] - **Microsoft.DotNet.Common.Pro... --- 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 d48582a42..105358b16 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -40,13 +40,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d2325c80..c188eebb1 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 - 8af471086762e04add1ecf2991da0bd0200268be + 1450763a83b184fa2fdd590d5774556b709bf4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8af471086762e04add1ecf2991da0bd0200268be + 1450763a83b184fa2fdd590d5774556b709bf4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8af471086762e04add1ecf2991da0bd0200268be + 1450763a83b184fa2fdd590d5774556b709bf4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2e11e37e99cdc36f17bee572c0b0e605dd60fff + 19eb8146e388a98ba03c09e911baf54402d8d1e3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2e11e37e99cdc36f17bee572c0b0e605dd60fff + 19eb8146e388a98ba03c09e911baf54402d8d1e3 diff --git a/eng/Versions.props b/eng/Versions.props index e91e0a4f8..062ebcdd9 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.408-servicing.23174.13 - 6.0.408-servicing.23174.13 + 6.0.408-servicing.23175.3 + 6.0.408-servicing.23175.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bfd6ec740e905beb535ce88d63cc54568ae54c3c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 22:08:20 +0000 Subject: [PATCH 12/13] Merged PR 30254: [internal/release/6.0.4xx] 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:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230325.11 - **Date Produced**: March 25, 2023 8:17:53 PM UTC - **Commit**: c5e53edfefe7a53aab594a3691bfa3ac0a107ada - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23175.3 to 6.0.408-servicing.23175.11][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23175.3 to 6.0.408-servicing.23175.11][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=GC19eb8146e3&targetVersion=GCc5e53edfef&_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 105358b16..2050fdc98 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,6 +20,7 @@ + @@ -49,6 +50,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c188eebb1..7e1bdec8a 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 1450763a83b184fa2fdd590d5774556b709bf4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19eb8146e388a98ba03c09e911baf54402d8d1e3 + c5e53edfefe7a53aab594a3691bfa3ac0a107ada - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 19eb8146e388a98ba03c09e911baf54402d8d1e3 + c5e53edfefe7a53aab594a3691bfa3ac0a107ada - + 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 062ebcdd9..5f40fcf56 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.408-servicing.23175.3 - 6.0.408-servicing.23175.3 + 6.0.408-servicing.23175.11 + 6.0.408-servicing.23175.11 $(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 0c3669d367ab1dc948988caebc0a2eb26fa18d59 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 27 Mar 2023 22:59:30 +0000 Subject: [PATCH 13/13] Merged PR 30279: [internal/release/6.0.4xx] 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:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230327.15 - **Date Produced**: March 27, 2023 10:27:33 PM UTC - **Commit**: 4478215a43d6cec39061c414d65d0a1dd78993f0 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.408-servicing.23175.11 to 6.0.408-servicing.23177.15][1] - **Microsoft.NET.Sdk**: [from 6.0.408-servicing.23175.11 to 6.0.408-servicing.23177.15][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=GCc5e53edfef&targetVersion=GC4478215a43&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC1b343fdc09&targetVersion=GCbde268e756&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- 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 2050fdc98..dee0d7d6f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,8 @@ - + + @@ -50,7 +51,8 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e1bdec8a..cbf0b4598 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 1450763a83b184fa2fdd590d5774556b709bf4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5e53edfefe7a53aab594a3691bfa3ac0a107ada + 4478215a43d6cec39061c414d65d0a1dd78993f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5e53edfefe7a53aab594a3691bfa3ac0a107ada + 4478215a43d6cec39061c414d65d0a1dd78993f0 diff --git a/eng/Versions.props b/eng/Versions.props index 5f40fcf56..ccb8e2479 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.408-servicing.23175.11 - 6.0.408-servicing.23175.11 + 6.0.408-servicing.23177.15 + 6.0.408-servicing.23177.15 $(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