From 0472585a3cc18ffe39e6c60ab9afbaa408705849 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Sep 2023 06:37:56 +0000 Subject: [PATCH 01/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230903.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.122-servicing.23425.21 -> To Version 6.0.123-servicing.23453.12 --- 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 115bd3427..00c55d9ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,30 @@ + + + + + + + + + + @@ -42,16 +52,24 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61a6f0917..3baf86c28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 851641e40c1191f339933987d6c1aac3837ce7f8 + 5c256633d1ecbdf0a252f0ae8a8f6ac80b1daeff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 851641e40c1191f339933987d6c1aac3837ce7f8 + 5c256633d1ecbdf0a252f0ae8a8f6ac80b1daeff diff --git a/eng/Versions.props b/eng/Versions.props index 08cf8283c..13d348e0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.122-servicing.23425.21 - 6.0.122-servicing.23425.21 + 6.0.123-servicing.23453.12 + 6.0.123-servicing.23453.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2f6d09c852b2fe4f1e827f8bff45f04befaaa70f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 02:48:53 +0000 Subject: [PATCH 02/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23453.12 -> To Version 6.0.123-servicing.23462.22 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 00c55d9ae..43371bd5f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,6 @@ - - - @@ -59,9 +56,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3baf86c28..619dddbef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c256633d1ecbdf0a252f0ae8a8f6ac80b1daeff + d9c5308277f68802debb61ac8ac4bd461c64f8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c256633d1ecbdf0a252f0ae8a8f6ac80b1daeff + d9c5308277f68802debb61ac8ac4bd461c64f8ff diff --git a/eng/Versions.props b/eng/Versions.props index 13d348e0f..492f3420b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23453.12 - 6.0.123-servicing.23453.12 + 6.0.123-servicing.23462.22 + 6.0.123-servicing.23462.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 92ad507114beeed3498c701226cfb51ad0d6150d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:56:53 +0000 Subject: [PATCH 03/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23462.22 -> To Version 6.0.123-servicing.23463.39 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 43371bd5f..23ba19292 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -49,9 +46,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 619dddbef..39662e8fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d9c5308277f68802debb61ac8ac4bd461c64f8ff + fed074bfef604d5f67899afc6fb0de02e7c6a2a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d9c5308277f68802debb61ac8ac4bd461c64f8ff + fed074bfef604d5f67899afc6fb0de02e7c6a2a0 diff --git a/eng/Versions.props b/eng/Versions.props index 492f3420b..4fe623fed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23462.22 - 6.0.123-servicing.23462.22 + 6.0.123-servicing.23463.39 + 6.0.123-servicing.23463.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 51732351f8a3bd64900a0717a6d5aa8bf61debcd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:57:03 +0000 Subject: [PATCH 04/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.62 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23463.39 -> To Version 6.0.123-servicing.23463.62 --- 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 39662e8fc..ec2ff9b6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fed074bfef604d5f67899afc6fb0de02e7c6a2a0 + 34dae02869c41c62b903e6bf5500e3b9700ee109 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fed074bfef604d5f67899afc6fb0de02e7c6a2a0 + 34dae02869c41c62b903e6bf5500e3b9700ee109 diff --git a/eng/Versions.props b/eng/Versions.props index 4fe623fed..1fe8a79c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23463.39 - 6.0.123-servicing.23463.39 + 6.0.123-servicing.23463.62 + 6.0.123-servicing.23463.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 71a11c4cd6aaf066daf00c0d0aba44c4049ceb61 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:57:13 +0000 Subject: [PATCH 05/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23463.62 -> To Version 6.0.123-servicing.23464.17 --- 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 ec2ff9b6d..4b60b97df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 34dae02869c41c62b903e6bf5500e3b9700ee109 + 032c9e965aeffd655a34694a7eeb75928fdc3e70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 34dae02869c41c62b903e6bf5500e3b9700ee109 + 032c9e965aeffd655a34694a7eeb75928fdc3e70 diff --git a/eng/Versions.props b/eng/Versions.props index 1fe8a79c1..cb3164c22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23463.62 - 6.0.123-servicing.23463.62 + 6.0.123-servicing.23464.17 + 6.0.123-servicing.23464.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2bb9c0c7c92b527f023e1ab1f142ec4d617cdf72 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:57:23 +0000 Subject: [PATCH 06/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23464.17 -> To Version 6.0.123-servicing.23464.24 --- 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 4b60b97df..e888d0d48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 032c9e965aeffd655a34694a7eeb75928fdc3e70 + 06dd1875ed36ef4e2f4a51d5f3b2e8bb41c94fd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 032c9e965aeffd655a34694a7eeb75928fdc3e70 + 06dd1875ed36ef4e2f4a51d5f3b2e8bb41c94fd2 diff --git a/eng/Versions.props b/eng/Versions.props index cb3164c22..9c963fe06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23464.17 - 6.0.123-servicing.23464.17 + 6.0.123-servicing.23464.24 + 6.0.123-servicing.23464.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e07c6667fcf27f1bfe5386419d23ff7e3cef9cdf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:57:33 +0000 Subject: [PATCH 07/24] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 +++++------ eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 3 files changed, 74 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index 23ba19292..ff90ea0d7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,21 @@ + - - - + + - - - + - - - + @@ -46,19 +42,17 @@ + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e888d0d48..eccf1968a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd + ca8b53290abed6b00ae7a9cc331fbc69bc06026c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 564969bca155b40432d101ec35f24a0e81e6afa0 + e99084eedfdb1a3d2d99951ae0748c2b5f468358 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d6c86fd918b96350521dc48dc996b6231616f0f + 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d6c86fd918b96350521dc48dc996b6231616f0f + 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8d6c86fd918b96350521dc48dc996b6231616f0f + 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 06dd1875ed36ef4e2f4a51d5f3b2e8bb41c94fd2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + 4c9c993698c298801739cd2dc25efa7ffe700bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f501934867fd4723518c1c7b03c6033c2e52ecad + 823450756bc26a13c44a96ea190c46a77c526e04 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + f472bde6484a7b860c6647cf2ac64fd2870853e0 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 9c963fe06..790254759 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.22-servicing.23424.7 + 6.0.23-servicing.23463.14 - 6.0.22-servicing.23425.2 + 6.0.23-servicing.23463.7 - 6.0.122 + 6.0.123 @@ -44,12 +44,12 @@ - 6.0.22 - 6.0.22 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 - 6.0.22-servicing.23424.15 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 + 6.0.23-servicing.23463.13 0.2.0 @@ -68,20 +68,20 @@ - 6.0.22-servicing.23424.25 - 6.0.22-servicing.23424.25 - 6.0.22 - 6.0.22 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.4 + 6.0.23-servicing.23463.4 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 - 6.0.22-servicing.23425.2 - 6.0.22-servicing.23425.2 - 6.0.22 - 6.0.22 + 6.0.23-servicing.23463.6 + 6.0.23-servicing.23463.6 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.122 + 6.0.123 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.22 + 6.0.23 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 7717177fe7c112f0ee08de09c789fa860b4a91d1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 18 Sep 2023 16:35:34 +0000 Subject: [PATCH 08/24] Merged PR 33737: Remove extra entry in XML doc baseline --- .../assets/baselines/MissingXmlDoc.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index bde73ece6..38f80e186 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,7 +1,6 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml From 55f1554eec43d92654e584f401f31eac2ad865de Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:29:45 +0000 Subject: [PATCH 09/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23464.24 -> To Version 6.0.123-servicing.23469.16 --- NuGet.config | 9 +++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index ff90ea0d7..2f3134c25 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,25 @@ + + + + + @@ -42,16 +47,20 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eccf1968a..272ad70a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 54ea5cf952f339685dbe5ec2ef1434bbc0b226a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 06dd1875ed36ef4e2f4a51d5f3b2e8bb41c94fd2 + 0efb0c52f5d3c51b39af3b6021a50af178daea2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 06dd1875ed36ef4e2f4a51d5f3b2e8bb41c94fd2 + 0efb0c52f5d3c51b39af3b6021a50af178daea2e diff --git a/eng/Versions.props b/eng/Versions.props index 5bbaaac50..a56c06b80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23464.24 - 6.0.123-servicing.23464.24 + 6.0.123-servicing.23469.16 + 6.0.123-servicing.23469.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ff2f77351271698d29c1502d0ad6adf25d754e0f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Oct 2023 20:17:44 +0000 Subject: [PATCH 10/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231013.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23480.40 -> To Version 6.0.124-servicing.23513.15 --- NuGet.config | 8 -------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 49478e17d..dd632b04b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,17 +37,13 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b04700e60..c030dba8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 + 71230905d1d3ea0fcefa396fe13ff4ad10fc233b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 + 71230905d1d3ea0fcefa396fe13ff4ad10fc233b diff --git a/eng/Versions.props b/eng/Versions.props index c3c5ea3c3..f9b0c3c7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23480.40 - 6.0.123-servicing.23480.40 + 6.0.124-servicing.23513.15 + 6.0.124-servicing.23513.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9689fbfcd8c8f3f88cd2a18407398493b0aaa16a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Oct 2023 23:32:35 +0000 Subject: [PATCH 11/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231016.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.124-servicing.23513.15 -> To Version 6.0.124-servicing.23516.25 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.23 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 3 files changed, 73 insertions(+), 65 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd632b04b..85312fd26 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,13 +41,17 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c030dba8a..3fe60cd12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 + 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0f0de876a67755a2c6cd2dc730c13f5959bdea8 + 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bc25dd5d39fd057f7cb28acb5ad4d9e925a375de + 93cb36588ba69f140e92668e20a4d7bcc99ce84d https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d0deccaa5039ef510feef0dbb63a63dcc88112f5 + 18c25846d4767a1e6bcbaef60027f3bcaaee748d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d0deccaa5039ef510feef0dbb63a63dcc88112f5 + 18c25846d4767a1e6bcbaef60027f3bcaaee748d - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - d0deccaa5039ef510feef0dbb63a63dcc88112f5 + 18c25846d4767a1e6bcbaef60027f3bcaaee748d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 71230905d1d3ea0fcefa396fe13ff4ad10fc233b + 9956bc35ded21a4fe8f85dde8d37e99ad1347139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 71230905d1d3ea0fcefa396fe13ff4ad10fc233b + 9956bc35ded21a4fe8f85dde8d37e99ad1347139 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + 0b73b536f6e0d0a6143387439c3308db4db9fdfe https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f9b0c3c7b..167b5ae21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.123 + 6.0.124 @@ -44,20 +44,20 @@ - 6.0.23 - 6.0.23 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 - 6.0.23-servicing.23480.7 + 6.0.24 + 6.0.24 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 + 6.0.24-servicing.23513.7 0.2.0 - 6.0.124-servicing.23513.15 - 6.0.124-servicing.23513.15 + 6.0.124-servicing.23516.25 + 6.0.124-servicing.23516.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.12 + 6.0.24 + 6.0.24 + 6.0.24 + 6.0.24 2.1.0 - 6.0.23-servicing.23480.2 - 6.0.23-servicing.23480.2 - 6.0.23 - 6.0.23 + 6.0.24-servicing.23513.4 + 6.0.24-servicing.23513.4 + 6.0.24 + 6.0.24 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.123 + 6.0.124 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.22 + 6.0.23 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 355590497fdef548ba3b24cc5c125bfcb1feb957 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Oct 2023 23:07:34 +0000 Subject: [PATCH 12/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.124-servicing.23516.25 -> To Version 6.0.124-servicing.23517.23 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.24 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 85312fd26..385ebb02b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,14 +41,14 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3fe60cd12..49201afd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 4e0adad7198e8509579e2dfedd445073fcf67fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cfaa835e9d761a3433687d004c416e0f2b4f2a6 + cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 93cb36588ba69f140e92668e20a4d7bcc99ce84d + caada2338902a9524eb87fdab853eba77db52974 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 18c25846d4767a1e6bcbaef60027f3bcaaee748d + 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 18c25846d4767a1e6bcbaef60027f3bcaaee748d + 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 18c25846d4767a1e6bcbaef60027f3bcaaee748d + 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9956bc35ded21a4fe8f85dde8d37e99ad1347139 + 355ccb561cf5c9121000499bef61c90003e1a9fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9956bc35ded21a4fe8f85dde8d37e99ad1347139 + 355ccb561cf5c9121000499bef61c90003e1a9fc diff --git a/eng/Versions.props b/eng/Versions.props index 167b5ae21..c9530bb7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 - 6.0.24-servicing.23513.7 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 0.2.0 - 6.0.124-servicing.23516.25 - 6.0.124-servicing.23516.25 + 6.0.124-servicing.23517.23 + 6.0.124-servicing.23517.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.12 - 6.0.24-servicing.23516.12 + 6.0.24-servicing.23516.31 + 6.0.24-servicing.23516.31 6.0.24 6.0.24 6.0.24 From 53738af03b2a53d77e128de5f502099e0fcbd660 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:00:15 +0000 Subject: [PATCH 13/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.44 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.124-servicing.23517.23 -> To Version 6.0.124-servicing.23517.44 --- 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 49201afd1..4407fd025 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 355ccb561cf5c9121000499bef61c90003e1a9fc + f8753d8a7169a584a9d584d045d89150bfaf1328 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 355ccb561cf5c9121000499bef61c90003e1a9fc + f8753d8a7169a584a9d584d045d89150bfaf1328 diff --git a/eng/Versions.props b/eng/Versions.props index c9530bb7e..440ada2b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.124-servicing.23517.23 - 6.0.124-servicing.23517.23 + 6.0.124-servicing.23517.44 + 6.0.124-servicing.23517.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 895162e6f48e6b3ed2f3db899af1888906b25f3f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:00:22 +0000 Subject: [PATCH 14/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.124-servicing.23517.44 -> To Version 6.0.125-servicing.23518.29 --- 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 4407fd025..08ea1bc74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8753d8a7169a584a9d584d045d89150bfaf1328 + 22921fb9b8e0bec351e9b63aef8182427d3ec7d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f8753d8a7169a584a9d584d045d89150bfaf1328 + 22921fb9b8e0bec351e9b63aef8182427d3ec7d1 diff --git a/eng/Versions.props b/eng/Versions.props index 440ada2b3..1f7be443e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.124-servicing.23517.44 - 6.0.124-servicing.23517.44 + 6.0.125-servicing.23518.29 + 6.0.125-servicing.23518.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b65a25d85a120b4ab152f066b72aa42a9f96851f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:00:30 +0000 Subject: [PATCH 15/24] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.24 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 385ebb02b..d7a6fab56 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -48,10 +48,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08ea1bc74..a6c522fd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,16 +92,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 + 568bc4059aec754311fce7a2d8106ab29ec1c0b0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 + 568bc4059aec754311fce7a2d8106ab29ec1c0b0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 80fe0b8c0791316cbdd89ce9827d2d2f0c7e9bb6 + 568bc4059aec754311fce7a2d8106ab29ec1c0b0 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 22921fb9b8e0bec351e9b63aef8182427d3ec7d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a8ba4b39b59ca421254550010de48b33d7c7b57d + c1396d66ff3d595b912cd5f96d6f4651427ecfcd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2b6f0273734c631e1ecc8c503836d4fab840065b + 54f99d916b6630956d732099722d5e4dbfcd2825 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1f7be443e..82237409c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23480.3 + 6.0.24-servicing.23513.4 - 6.0.23-servicing.23480.2 + 6.0.24-servicing.23516.7 @@ -78,8 +78,8 @@ - 6.0.24-servicing.23513.4 - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 6.0.24 6.0.24 From 06880423f1608828ccd53d01d1ccedae3117c7db Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 18:45:19 +0000 Subject: [PATCH 16/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.47 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23518.29 -> To Version 6.0.125-servicing.23518.47 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.24 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7a6fab56..f271150ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,17 +41,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6c522fd2..84c728770 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5a32973319c74b856f132afb513ac44837d2b2aa + 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5bcd2b394eaf9f079b67ab980e193e1d1ccadd + 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - caada2338902a9524eb87fdab853eba77db52974 + c81c53cd507ae3699ef60e6a02be0b1984d00452 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 568bc4059aec754311fce7a2d8106ab29ec1c0b0 + e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 568bc4059aec754311fce7a2d8106ab29ec1c0b0 + e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 568bc4059aec754311fce7a2d8106ab29ec1c0b0 + e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22921fb9b8e0bec351e9b63aef8182427d3ec7d1 + 0b0837a07e0fb11ee75c2508ef246ff36fde5c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 22921fb9b8e0bec351e9b63aef8182427d3ec7d1 + 0b0837a07e0fb11ee75c2508ef246ff36fde5c78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c1396d66ff3d595b912cd5f96d6f4651427ecfcd + f74130bc3ca3b606a18011ad64ac37a7ee77d514 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 54f99d916b6630956d732099722d5e4dbfcd2825 + e1722e80b8f688100d15b4b794f17e1a1779e286 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 82237409c..395dc30f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23516.5 - 6.0.24-servicing.23516.7 + 6.0.24-servicing.23517.2 - 6.0.124 + 6.0.125 @@ -46,18 +46,18 @@ 6.0.24 6.0.24 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 + 6.0.24-servicing.23517.11 0.2.0 - 6.0.125-servicing.23518.29 - 6.0.125-servicing.23518.29 + 6.0.125-servicing.23518.47 + 6.0.125-servicing.23518.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.24-servicing.23516.31 - 6.0.24-servicing.23516.31 + 6.0.24-servicing.23517.17 + 6.0.24-servicing.23517.17 6.0.24 6.0.24 6.0.24 @@ -78,10 +78,10 @@ - 6.0.24-servicing.23517.3 - 6.0.24-servicing.23517.3 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.6 + 6.0.25-servicing.23518.6 + 6.0.25 + 6.0.25 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.124 + 6.0.125 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 419d2b12feda101dbea40dd32d4e24644c0f5ef2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:55:40 +0000 Subject: [PATCH 17/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23518.47 -> To Version 6.0.125-servicing.23519.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 84c728770..09acedabf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0b0837a07e0fb11ee75c2508ef246ff36fde5c78 + 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0b0837a07e0fb11ee75c2508ef246ff36fde5c78 + 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 diff --git a/eng/Versions.props b/eng/Versions.props index 118b2ef92..3cd7363c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.125-servicing.23518.47 - 6.0.125-servicing.23518.47 + 6.0.125-servicing.23519.26 + 6.0.125-servicing.23519.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ccaa3858edc91bdbb2ccbb5fdcfcfc5a5007e019 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:55:48 +0000 Subject: [PATCH 18/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.54 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23519.26 -> To Version 6.0.125-servicing.23519.54 --- 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 09acedabf..d10b4f2d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 + 242714167d7ec659bf372fe545164214267489c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 + 242714167d7ec659bf372fe545164214267489c1 diff --git a/eng/Versions.props b/eng/Versions.props index 3cd7363c2..95d7d9fe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.125-servicing.23519.26 - 6.0.125-servicing.23519.26 + 6.0.125-servicing.23519.54 + 6.0.125-servicing.23519.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6bb0f11159c9fef115ca9646321aa333e0e673e6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:55:55 +0000 Subject: [PATCH 19/24] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index f271150ec..f5fd38f5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,17 +41,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d10b4f2d5..e1fff280f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 https://github.com/dotnet/test-templates @@ -92,16 +92,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e87581dd7461f50f79d0bbc907f455b58603df27 + 09a2091e07d334d42f6b441ae845f854622326cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e87581dd7461f50f79d0bbc907f455b58603df27 + 09a2091e07d334d42f6b441ae845f854622326cc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e87581dd7461f50f79d0bbc907f455b58603df27 + 09a2091e07d334d42f6b441ae845f854622326cc https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 242714167d7ec659bf372fe545164214267489c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f74130bc3ca3b606a18011ad64ac37a7ee77d514 + 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e1722e80b8f688100d15b4b794f17e1a1779e286 + b0a02caf5d0dd6f56f073d6616d5a3501854f632 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 95d7d9fe8..618f76dae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23516.5 + 6.0.25-servicing.23518.2 - 6.0.24-servicing.23517.2 + 6.0.25-servicing.23518.13 @@ -44,12 +44,12 @@ - 6.0.24 - 6.0.24 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 + 6.0.25 + 6.0.25 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 0.2.0 @@ -68,18 +68,18 @@ - 6.0.24-servicing.23517.17 - 6.0.24-servicing.23517.17 - 6.0.24 - 6.0.24 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.22 + 6.0.25-servicing.23518.22 + 6.0.25 + 6.0.25 + 6.0.25 + 6.0.25 2.1.0 - 6.0.25-servicing.23518.6 - 6.0.25-servicing.23518.6 + 6.0.25-servicing.23519.5 + 6.0.25-servicing.23519.5 6.0.25 6.0.25 From 573cf82fb653ccda8633b5d60d039cb0d17abebe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:45:39 +0000 Subject: [PATCH 20/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.81 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23519.54 -> To Version 6.0.125-servicing.23519.81 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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 5 +++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index f5fd38f5b..d92483f25 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,11 +10,12 @@ + - + @@ -46,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1fff280f..ac7f0a5c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7b9518372d8e9988e62154d73453e7df508df2c + 492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 09a2091e07d334d42f6b441ae845f854622326cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 242714167d7ec659bf372fe545164214267489c1 + 4667ac66b721b1c1ea169c71a6b1c30abf11c969 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 242714167d7ec659bf372fe545164214267489c1 + 4667ac66b721b1c1ea169c71a6b1c30abf11c969 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 0b73b536f6e0d0a6143387439c3308db4db9fdfe + d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 618f76dae..2edcf0d1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.125-servicing.23519.54 - 6.0.125-servicing.23519.54 + 6.0.125-servicing.23519.81 + 6.0.125-servicing.23519.81 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.25-servicing.23518.22 - 6.0.25-servicing.23518.22 + 6.0.25-servicing.23519.12 + 6.0.25-servicing.23519.12 6.0.25 6.0.25 6.0.25 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.23 + 6.0.25 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 600e288ffe3cee206cc3d4f8c193c46d65626f6e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 06:46:46 +0000 Subject: [PATCH 21/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.92 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23519.81 -> To Version 6.0.125-servicing.23519.92 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 From Version 6.0.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index d92483f25..e0fe07940 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 ac7f0a5c5..2dd797935 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 + ad15e08a98e1d3697d4577631c6ffc1bfb07e904 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 09a2091e07d334d42f6b441ae845f854622326cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4667ac66b721b1c1ea169c71a6b1c30abf11c969 + 687313671a26d2a2b34c220a78b65a07dde4fd64 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4667ac66b721b1c1ea169c71a6b1c30abf11c969 + 687313671a26d2a2b34c220a78b65a07dde4fd64 diff --git a/eng/Versions.props b/eng/Versions.props index 2edcf0d1a..b27fe182f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 - 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 + 6.0.25-servicing.23519.17 0.2.0 - 6.0.125-servicing.23519.81 - 6.0.125-servicing.23519.81 + 6.0.125-servicing.23519.92 + 6.0.125-servicing.23519.92 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 806583a1dac91c5d01c16351548f9fc1a66f8646 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 20:07:53 +0000 Subject: [PATCH 22/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23519.92 -> To Version 6.0.125-servicing.23520.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.25 -> To Version 6.0.25 (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 e0fe07940..049727a89 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,10 +18,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dd797935..da95ff983 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7a8ee66adb20d70b1403a3a5142ed305e8699f5e + a74946f8dae6d29fd18c8fc702e23f8fe77c729c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 09a2091e07d334d42f6b441ae845f854622326cc + 7e5c0220b5ebe21277a6943f32ca92e666d30e37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 09a2091e07d334d42f6b441ae845f854622326cc + 7e5c0220b5ebe21277a6943f32ca92e666d30e37 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 09a2091e07d334d42f6b441ae845f854622326cc + 7e5c0220b5ebe21277a6943f32ca92e666d30e37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 687313671a26d2a2b34c220a78b65a07dde4fd64 + 1866438867ef81a3f0a32e78c0dee1d114a10a7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 687313671a26d2a2b34c220a78b65a07dde4fd64 + 1866438867ef81a3f0a32e78c0dee1d114a10a7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab + d4ee94199afb6c67ed448c252a07c0747c089e41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b0a02caf5d0dd6f56f073d6616d5a3501854f632 + fcec4d8986bb8339964c429abd6e4651b968ff4f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b27fe182f..88f638af3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23518.2 + 6.0.25-servicing.23519.16 - 6.0.25-servicing.23518.13 + 6.0.25-servicing.23519.18 @@ -56,8 +56,8 @@ - 6.0.125-servicing.23519.92 - 6.0.125-servicing.23519.92 + 6.0.125-servicing.23520.21 + 6.0.125-servicing.23520.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23519.5 - 6.0.25-servicing.23519.5 + 6.0.25-servicing.23520.5 + 6.0.25-servicing.23520.5 6.0.25 6.0.25 From 40bbcfa2e2ab8bb71099070a057c0002d2af9925 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:08:32 +0000 Subject: [PATCH 23/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.37 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23520.21 -> To Version 6.0.125-servicing.23523.37 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 From Version 6.0.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 049727a89..a735b4622 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 da95ff983..d7af92d1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ad15e08a98e1d3697d4577631c6ffc1bfb07e904 + 36be7ed6d6d56b7da0a2891e3de7ecc2aa48eecd https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7e5c0220b5ebe21277a6943f32ca92e666d30e37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1866438867ef81a3f0a32e78c0dee1d114a10a7e + a8b4ec801637f85c99edb62569b72d99c550da7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1866438867ef81a3f0a32e78c0dee1d114a10a7e + a8b4ec801637f85c99edb62569b72d99c550da7e diff --git a/eng/Versions.props b/eng/Versions.props index 88f638af3..86ee689aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.25 6.0.25 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 - 6.0.25-servicing.23519.17 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 + 6.0.25-servicing.23523.15 0.2.0 - 6.0.125-servicing.23520.21 - 6.0.125-servicing.23520.21 + 6.0.125-servicing.23523.37 + 6.0.125-servicing.23523.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee809e5f00f8ef518462f2fb6fa0be368896f38c Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:02:47 +0100 Subject: [PATCH 24/24] .NET Source-Build 6.0.125 November 2023 Updates (#17781) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- src/SourceBuild/tarball/content/prep.sh | 2 +- .../scripts/bootstrap/OverrideBootstrapVersions.props | 11 +++++++++++ .../bootstrap/buildBootstrapPreviouslySB.csproj | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props diff --git a/eng/Versions.props b/eng/Versions.props index 517ffef7a..c858d3a61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.124 + 6.0.125 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index e64601b87..06cde48c2 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.124" + "dotnet": "6.0.125" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index 429173290..89e00b1bb 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -118,7 +118,7 @@ if [ "$buildBootstrap" == "true" ]; then fi # Run restore on project to initiate download of bootstrap packages - $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" + $DOTNET_SDK_PATH/dotnet restore $workingDir/buildBootstrapPreviouslySB.csproj /bl:artifacts/prep/bootstrap.binlog /fileLoggerParameters:LogFile=artifacts/prep/bootstrap.log /p:ArchiveDir="$SCRIPT_ROOT/packages/archive/" /p:BootstrapOverrideVersionsProps="$SCRIPT_ROOT/scripts/bootstrap/OverrideBootstrapVersions.props" # Remove working directory rm -rf $workingDir diff --git a/src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props new file mode 100644 index 000000000..234abd681 --- /dev/null +++ b/src/SourceBuild/tarball/content/scripts/bootstrap/OverrideBootstrapVersions.props @@ -0,0 +1,11 @@ + + + + 6.0.25-servicing.23520.6 + + $(NonshippingRuntimeVersionFor6_0_25) + $(NonshippingRuntimeVersionFor6_0_25) + $(NonshippingRuntimeVersionFor6_0_25) + + diff --git a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj index 14921a48f..c11dfcb3e 100644 --- a/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/scripts/bootstrap/buildBootstrapPreviouslySB.csproj @@ -2,6 +2,7 @@ + net6.0