From 0472585a3cc18ffe39e6c60ab9afbaa408705849 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Sep 2023 06:37:56 +0000 Subject: [PATCH 001/152] 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 2a16f1dc25a48f15ac9c12e162efba05189a0cad Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Sep 2023 06:38:35 +0000 Subject: [PATCH 002/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230903.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23453.14 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 19715c85a..93ca57aa0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,15 +49,23 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dbb1a3e0..943621e2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 + 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 + 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 diff --git a/eng/Versions.props b/eng/Versions.props index ff1a589ee..6b98cb91a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23425.32 - 6.0.414-servicing.23425.32 + 6.0.415-servicing.23453.14 + 6.0.415-servicing.23453.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6807af5fa294b3bf54bb69d11109e9708f731802 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Sep 2023 06:38:49 +0000 Subject: [PATCH 003/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230903.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23425.24 -> To Version 6.0.318-servicing.23453.13 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index e250238a3..5ab3f8a77 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,14 +49,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f5ca2132..0b56af244 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da716438f260441518b4f7d9962ced9814769669 + 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - da716438f260441518b4f7d9962ced9814769669 + 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 diff --git a/eng/Versions.props b/eng/Versions.props index c09ac1668..382b65062 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23425.24 - 6.0.317-servicing.23425.24 + 6.0.318-servicing.23453.13 + 6.0.318-servicing.23453.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8e50270c0263caf58a2ddbfb433d79bd13269608 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 5 Sep 2023 22:18:53 +0000 Subject: [PATCH 004/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230905.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23455.22 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 943621e2c..e04961481 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 + 28c87748d7a868cf2c76751dff51c86986daa119 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 773c8fa80b99eb0c34ea2fef6f62b7b6c9572e16 + 28c87748d7a868cf2c76751dff51c86986daa119 diff --git a/eng/Versions.props b/eng/Versions.props index 6b98cb91a..0626526a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23453.14 - 6.0.415-servicing.23453.14 + 6.0.415-servicing.23455.22 + 6.0.415-servicing.23455.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 73452f5f4a13217b91365404a1678666468819e5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Sep 2023 22:08:31 +0000 Subject: [PATCH 005/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23462.23 --- 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 93ca57aa0..44835ce43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e04961481..34c1303e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 28c87748d7a868cf2c76751dff51c86986daa119 + 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 28c87748d7a868cf2c76751dff51c86986daa119 + 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 diff --git a/eng/Versions.props b/eng/Versions.props index 0626526a0..6e3c23478 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23455.22 - 6.0.415-servicing.23455.22 + 6.0.415-servicing.23462.23 + 6.0.415-servicing.23462.23 $(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 006/152] 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 6264b298a6d14bf72f590d440ec049b6d21c9197 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 02:54:58 +0000 Subject: [PATCH 007/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23453.13 -> To Version 6.0.318-servicing.23462.21 --- 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 5ab3f8a77..0aa32e6a4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b56af244..753126b6f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 + bde28e9622b697cba0e61f43849b5de4f0e98347 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9acb30f9c8cdf9cdaeb015bcd3060ae5f47593d7 + bde28e9622b697cba0e61f43849b5de4f0e98347 diff --git a/eng/Versions.props b/eng/Versions.props index 382b65062..8e263f8b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23453.13 - 6.0.318-servicing.23453.13 + 6.0.318-servicing.23462.21 + 6.0.318-servicing.23462.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15eea5a29ab3cc5df81f3ed7d7f25c3f95064d15 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 03:43:17 +0000 Subject: [PATCH 008/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.46 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23463.46 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 26 ++++--------- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44835ce43..6a25c9a80 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,20 @@ - - - + + - - - + - - - + @@ -46,21 +41,16 @@ - - - + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34c1303e2..06f1f3e46 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 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 017f84465cd8eb56c666ad1e6872d4fc23cec288 + cfe8d97fc70cdbd7558f051c9223ca89be77df54 - + 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,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce2a08ace580a06ac3ea0291222f5e550c9f32b4 + ba8fbae6f29754311fcf890aad8bb00820c3b65e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce2a08ace580a06ac3ea0291222f5e550c9f32b4 + ba8fbae6f29754311fcf890aad8bb00820c3b65e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce2a08ace580a06ac3ea0291222f5e550c9f32b4 + ba8fbae6f29754311fcf890aad8bb00820c3b65e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 + c9240dd9140b5117632d40de3f3cf980ff83c6ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1ee785d23839ac8aaa6342c18b3e54dadfe455 + c9240dd9140b5117632d40de3f3cf980ff83c6ea diff --git a/eng/Versions.props b/eng/Versions.props index 6e3c23478..a7d420344 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.414 + 6.0.415 @@ -44,20 +44,20 @@ - 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 - 6.0.415-servicing.23462.23 - 6.0.415-servicing.23462.23 + 6.0.415-servicing.23463.46 + 6.0.415-servicing.23463.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -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.23462.4 + 6.0.23-servicing.23462.4 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.414 + 6.0.415 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 9ab857dce44ebdd4e8dac1d3dff49589e9424e29 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 07:42:20 +0000 Subject: [PATCH 009/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.60 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23463.60 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6a25c9a80..42aed78b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06f1f3e46..b9d845f88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfe8d97fc70cdbd7558f051c9223ca89be77df54 + df6cc30b54e470fdfee7d71e714f7f1432ace282 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ba8fbae6f29754311fcf890aad8bb00820c3b65e + 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ba8fbae6f29754311fcf890aad8bb00820c3b65e + 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ba8fbae6f29754311fcf890aad8bb00820c3b65e + 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9240dd9140b5117632d40de3f3cf980ff83c6ea + 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9240dd9140b5117632d40de3f3cf980ff83c6ea + 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f501934867fd4723518c1c7b03c6033c2e52ecad + a6196493264b681cd16a58b74d3da84811386fa9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a7d420344..15bf289fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.22-servicing.23425.2 + 6.0.23-servicing.23431.6 @@ -56,8 +56,8 @@ - 6.0.415-servicing.23463.46 - 6.0.415-servicing.23463.46 + 6.0.415-servicing.23463.60 + 6.0.415-servicing.23463.60 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.23-servicing.23462.4 - 6.0.23-servicing.23462.4 + 6.0.23-servicing.23463.2 + 6.0.23-servicing.23463.2 6.0.23 6.0.23 From 0ed8d7158da8b13d00756a37c1dd29dbe34bf93c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 17:35:45 +0000 Subject: [PATCH 010/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23464.19 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.23 (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 42aed78b7..51e6e1dd2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9d845f88..18a39cefc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - df6cc30b54e470fdfee7d71e714f7f1432ace282 + 0c1d005f46ba43bf07b6ce16deef9d8bd113ac6d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f + 0bb452bba5d0d1a2378193fe763df581dc76339c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f50f5dd1cc48971bca7be3d95195a8e6e32e97f + 0bb452bba5d0d1a2378193fe763df581dc76339c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 53190af510e57c1c146bd8a23725509771a42ae0 + 4c9c993698c298801739cd2dc25efa7ffe700bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a6196493264b681cd16a58b74d3da84811386fa9 + 823450756bc26a13c44a96ea190c46a77c526e04 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 15bf289fe..9e34a774c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23424.7 + 6.0.23-servicing.23463.14 - 6.0.23-servicing.23431.6 + 6.0.23-servicing.23463.7 @@ -56,8 +56,8 @@ - 6.0.415-servicing.23463.60 - 6.0.415-servicing.23463.60 + 6.0.415-servicing.23464.19 + 6.0.415-servicing.23464.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.23-servicing.23463.2 - 6.0.23-servicing.23463.2 + 6.0.23-servicing.23463.6 + 6.0.23-servicing.23463.6 6.0.23 6.0.23 From 5e9c53ca9843e83de00382b2ef3919e5feb162c8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 18:51:18 +0000 Subject: [PATCH 011/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23462.23 -> To Version 6.0.415-servicing.23464.25 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18a39cefc..9e6b3d96f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bb452bba5d0d1a2378193fe763df581dc76339c + 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bb452bba5d0d1a2378193fe763df581dc76339c + 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 diff --git a/eng/Versions.props b/eng/Versions.props index 9e34a774c..35c9af552 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23464.19 - 6.0.415-servicing.23464.19 + 6.0.415-servicing.23464.25 + 6.0.415-servicing.23464.25 $(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 012/152] 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 013/152] 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 014/152] 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 015/152] 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 016/152] 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 b44c73fce852268e0e627739c9fc6842c518cf24 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:17 +0000 Subject: [PATCH 017/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.45 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23462.21 -> To Version 6.0.318-servicing.23463.45 --- 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 0aa32e6a4..be2607241 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -46,9 +43,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 753126b6f..88d054e0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bde28e9622b697cba0e61f43849b5de4f0e98347 + 7e6a12638532bd726caa01aed96158dd470bc538 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bde28e9622b697cba0e61f43849b5de4f0e98347 + 7e6a12638532bd726caa01aed96158dd470bc538 diff --git a/eng/Versions.props b/eng/Versions.props index 8e263f8b6..e78f5d788 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23462.21 - 6.0.318-servicing.23462.21 + 6.0.318-servicing.23463.45 + 6.0.318-servicing.23463.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c490d9a0d88cef00ad97433687236d4c28b0afc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:27 +0000 Subject: [PATCH 018/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230913.61 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23463.45 -> To Version 6.0.318-servicing.23463.61 --- 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 88d054e0f..0c105831f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7e6a12638532bd726caa01aed96158dd470bc538 + 9226ebcce20dfffd1593fbe19cef750b6ba7e475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7e6a12638532bd726caa01aed96158dd470bc538 + 9226ebcce20dfffd1593fbe19cef750b6ba7e475 diff --git a/eng/Versions.props b/eng/Versions.props index e78f5d788..ceecff1e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23463.45 - 6.0.318-servicing.23463.45 + 6.0.318-servicing.23463.61 + 6.0.318-servicing.23463.61 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0ed281191dbbd082e199e4fcc50ecfe587484944 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:50 +0000 Subject: [PATCH 019/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23463.61 -> To Version 6.0.318-servicing.23464.18 --- 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 0c105831f..dee72f8fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9226ebcce20dfffd1593fbe19cef750b6ba7e475 + 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9226ebcce20dfffd1593fbe19cef750b6ba7e475 + 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 diff --git a/eng/Versions.props b/eng/Versions.props index ceecff1e6..f5d9ef0eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23463.61 - 6.0.318-servicing.23463.61 + 6.0.318-servicing.23464.18 + 6.0.318-servicing.23464.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e162d9d227b823e5839be61f726faada708f6ef Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:01:59 +0000 Subject: [PATCH 020/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23464.18 -> To Version 6.0.318-servicing.23464.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 dee72f8fa..bb8e425de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 + c67a7250452612429c36b96267a51b42c1c439e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 52033f2cb4eb64e2d12a8aa44d0d711d9129b161 + c67a7250452612429c36b96267a51b42c1c439e4 diff --git a/eng/Versions.props b/eng/Versions.props index f5d9ef0eb..f70414176 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23464.18 - 6.0.318-servicing.23464.18 + 6.0.318-servicing.23464.26 + 6.0.318-servicing.23464.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1c181baebd833c5bf9e5955563d5c72e5fcb2eaf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 19:02:17 +0000 Subject: [PATCH 021/152] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++++------ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index be2607241..6c6b54ba2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,20 @@ + + - - - + - - - + @@ -43,17 +41,15 @@ + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb8e425de..6092a1ba6 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 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f521522b17430e3760fd09760e77822b0bd891b + cc63749868db135f5a7998ca9c07e57a800692bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f521522b17430e3760fd09760e77822b0bd891b + cc63749868db135f5a7998ca9c07e57a800692bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f521522b17430e3760fd09760e77822b0bd891b + cc63749868db135f5a7998ca9c07e57a800692bc https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ c67a7250452612429c36b96267a51b42c1c439e4 - + 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 diff --git a/eng/Versions.props b/eng/Versions.props index f70414176..5e1564329 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.317 + 6.0.318 @@ -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.317 + 6.0.318 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 7717177fe7c112f0ee08de09c789fa860b4a91d1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 18 Sep 2023 16:35:34 +0000 Subject: [PATCH 022/152] 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 8b382fe097c29350d2c611d67827ee896bee10e2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:28:18 +0000 Subject: [PATCH 023/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23464.25 -> To Version 6.0.415-servicing.23469.18 --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 51e6e1dd2..136aa9b39 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,12 +16,15 @@ + + + @@ -41,15 +45,19 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e6b3d96f..9af9ba25c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 5cebb8cd49c5bcf087cae0368c1f610d4dfec0f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 + ac1b8a8f81ddb3ad0a9274f520f88071cde80cdf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 338ab1c7fe914679dbaf78e77bb3afd2e95ee977 + ac1b8a8f81ddb3ad0a9274f520f88071cde80cdf diff --git a/eng/Versions.props b/eng/Versions.props index 35c9af552..92f74a94a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23464.25 - 6.0.415-servicing.23464.25 + 6.0.415-servicing.23469.18 + 6.0.415-servicing.23469.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6e0cd88c50bf40d9843c899a57feda92f6be52cb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:28:33 +0000 Subject: [PATCH 024/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23464.26 -> To Version 6.0.318-servicing.23469.15 --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6c6b54ba2..bf0ae613f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,12 +16,15 @@ + + + @@ -41,14 +45,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6092a1ba6..2812d6ba0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating cc63749868db135f5a7998ca9c07e57a800692bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c67a7250452612429c36b96267a51b42c1c439e4 + d1e4f2398a36bff5b0ff25cf8bf0d9745b8dd356 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c67a7250452612429c36b96267a51b42c1c439e4 + d1e4f2398a36bff5b0ff25cf8bf0d9745b8dd356 diff --git a/eng/Versions.props b/eng/Versions.props index 5e1564329..558257ec1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23464.26 - 6.0.318-servicing.23464.26 + 6.0.318-servicing.23469.15 + 6.0.318-servicing.23469.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 55f1554eec43d92654e584f401f31eac2ad865de Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:29:45 +0000 Subject: [PATCH 025/152] 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 026/152] 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 840b7beac01c3376738e4da921a8064e2afee502 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Oct 2023 20:17:59 +0000 Subject: [PATCH 027/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231013.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23480.39 -> To Version 6.0.319-servicing.23513.16 --- 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 c8e5ee130..2cf5556c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c2c995c7..df851c72d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 + 70f5e33478a0cc2ae99c727511247cc74e408544 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 + 70f5e33478a0cc2ae99c727511247cc74e408544 diff --git a/eng/Versions.props b/eng/Versions.props index e5ac3afbe..7a04c643a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23480.39 - 6.0.318-servicing.23480.39 + 6.0.319-servicing.23513.16 + 6.0.319-servicing.23513.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8ce6a3057fc379935649aaa1b62b250632f91f8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Oct 2023 20:19:04 +0000 Subject: [PATCH 028/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231013.17 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23480.38 -> To Version 6.0.416-servicing.23513.17 --- NuGet.config | 24 ------------------------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9401b3f64..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,22 +13,10 @@ - - - - - - - - - - - - @@ -51,22 +39,10 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 688060474..b54aec9a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb5ae4829da51d315033bedb73116477b0390cd3 + 1b0c19415d2cc4637c04d49b4c23379da28682e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb5ae4829da51d315033bedb73116477b0390cd3 + 1b0c19415d2cc4637c04d49b4c23379da28682e9 diff --git a/eng/Versions.props b/eng/Versions.props index fac630493..c91639786 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23480.38 - 6.0.415-servicing.23480.38 + 6.0.416-servicing.23513.17 + 6.0.416-servicing.23513.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 950032c4d9f3e431ccd7b83093ad994c569c63d2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Oct 2023 23:30:50 +0000 Subject: [PATCH 029/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231016.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.416-servicing.23513.17 -> To Version 6.0.416-servicing.23516.24 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.23 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03d3587a6..53591c247 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,12 +41,16 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b54aec9a8..6a1d0831c 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 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 + 520dd9c4ea44753c16fc626380009570ff53b278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 + 520dd9c4ea44753c16fc626380009570ff53b278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 + 520dd9c4ea44753c16fc626380009570ff53b278 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b0c19415d2cc4637c04d49b4c23379da28682e9 + 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b0c19415d2cc4637c04d49b4c23379da28682e9 + 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 diff --git a/eng/Versions.props b/eng/Versions.props index 3b9e698d2..a9cd00b3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.415 + 6.0.416 @@ -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.416-servicing.23513.17 - 6.0.416-servicing.23513.17 + 6.0.416-servicing.23516.24 + 6.0.416-servicing.23516.24 $(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.415 + 6.0.416 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From eb37878032dc22e56ce8108d343ecffe07fbf842 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Oct 2023 23:32:10 +0000 Subject: [PATCH 030/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231016.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23513.16 -> To Version 6.0.319-servicing.23516.23 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 6.0.23 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++ eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++---------- 3 files changed, 70 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cf5556c3..61c4019bf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,20 @@ + + + + @@ -37,11 +41,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df851c72d..e65122205 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 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81b4aff895d7eaab61aa000a696f7bc79fc49b70 + 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81b4aff895d7eaab61aa000a696f7bc79fc49b70 + 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 81b4aff895d7eaab61aa000a696f7bc79fc49b70 + 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70f5e33478a0cc2ae99c727511247cc74e408544 + e76a4b93ff235181ccf4ed1e52a256a16e2e576e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70f5e33478a0cc2ae99c727511247cc74e408544 + e76a4b93ff235181ccf4ed1e52a256a16e2e576e diff --git a/eng/Versions.props b/eng/Versions.props index 7a04c643a..ddd5ddbd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.318 + 6.0.319 @@ -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.319-servicing.23513.16 - 6.0.319-servicing.23513.16 + 6.0.319-servicing.23516.23 + 6.0.319-servicing.23516.23 $(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.318 + 6.0.319 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 9689fbfcd8c8f3f88cd2a18407398493b0aaa16a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Oct 2023 23:32:35 +0000 Subject: [PATCH 031/152] 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 032/152] 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 e1a3176c64e0ccfad779d27a7c3bb71f408544d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Oct 2023 23:08:30 +0000 Subject: [PATCH 033/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23516.23 -> To Version 6.0.319-servicing.23517.22 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.24-servicing.23516.12 -> To Version 6.0.24-servicing.23516.31 (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 61c4019bf..a92c5c68c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,12 +41,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e65122205..c2a0aef57 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 - 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 + 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 + 519f9badec1482e692fe0008611e4da847ad3b16 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1274cdd11e447b39169cfcb72042e7dd0bee7fc3 + 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e76a4b93ff235181ccf4ed1e52a256a16e2e576e + c11217ab79113ced4cab9bf694abd9abac5116d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e76a4b93ff235181ccf4ed1e52a256a16e2e576e + c11217ab79113ced4cab9bf694abd9abac5116d1 diff --git a/eng/Versions.props b/eng/Versions.props index ddd5ddbd0..8427352b2 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.319-servicing.23516.23 - 6.0.319-servicing.23516.23 + 6.0.319-servicing.23517.22 + 6.0.319-servicing.23517.22 $(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 74953cad9260d2bdc2732a314191c2b80d9fe0d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Oct 2023 23:51:30 +0000 Subject: [PATCH 034/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.46 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.416-servicing.23516.24 -> To Version 6.0.416-servicing.23517.46 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.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 | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 53591c247..135568420 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a1d0831c..bb6f487b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ 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 - 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,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 520dd9c4ea44753c16fc626380009570ff53b278 + 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 520dd9c4ea44753c16fc626380009570ff53b278 + 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 520dd9c4ea44753c16fc626380009570ff53b278 + 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 + 946bd1a99dfca001c7799ac1d54eb1011725459c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f02fd3d297b48ce03104a1b58e704a60a82c6c9 + 946bd1a99dfca001c7799ac1d54eb1011725459c - + 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 a9cd00b3b..71976afad 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 @@ -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.416-servicing.23516.24 - 6.0.416-servicing.23516.24 + 6.0.416-servicing.23517.46 + 6.0.416-servicing.23517.46 $(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 @@ -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 439fee6d75a9f843a66e4f3250f4b2b0ef53244d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:03 -0700 Subject: [PATCH 035/152] Update branding to 6.0.125 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c3c5ea3c3..84a2b235b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 24 + 25 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From eea5af01f102809b4b972832fea50dfc14dac908 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 00:40:24 +0000 Subject: [PATCH 036/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.416-servicing.23516.24 -> To Version 6.0.417-servicing.23518.28 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.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 --- 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 bb6f487b8..32343ceae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 946bd1a99dfca001c7799ac1d54eb1011725459c + d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 946bd1a99dfca001c7799ac1d54eb1011725459c + d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 diff --git a/eng/Versions.props b/eng/Versions.props index 71976afad..1c73c1165 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.416-servicing.23517.46 - 6.0.416-servicing.23517.46 + 6.0.417-servicing.23518.28 + 6.0.417-servicing.23518.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 53738af03b2a53d77e128de5f502099e0fcbd660 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:00:15 +0000 Subject: [PATCH 037/152] 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 038/152] 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 039/152] 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 961033387a8f5eaab42005dfd4365904d1e99b37 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:21 +0000 Subject: [PATCH 040/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.45 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23517.22 -> To Version 6.0.319-servicing.23517.45 --- 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 c2a0aef57..1c8a6f1d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11217ab79113ced4cab9bf694abd9abac5116d1 + 4117aa6ac88d4890e3fe498c9f33896871c1c434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11217ab79113ced4cab9bf694abd9abac5116d1 + 4117aa6ac88d4890e3fe498c9f33896871c1c434 diff --git a/eng/Versions.props b/eng/Versions.props index b7277bccd..8b75d729f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.319-servicing.23517.22 - 6.0.319-servicing.23517.22 + 6.0.319-servicing.23517.45 + 6.0.319-servicing.23517.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8cb7c225a30703ed688059c7e7faa2fcf9d8bc66 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:28 +0000 Subject: [PATCH 041/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23517.45 -> To Version 6.0.320-servicing.23518.27 --- 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 1c8a6f1d4..99c6385fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4117aa6ac88d4890e3fe498c9f33896871c1c434 + 67fb1e64b6d4a7fe38735418cfd7fe068e986713 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4117aa6ac88d4890e3fe498c9f33896871c1c434 + 67fb1e64b6d4a7fe38735418cfd7fe068e986713 diff --git a/eng/Versions.props b/eng/Versions.props index 8b75d729f..916dd48be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.319-servicing.23517.45 - 6.0.319-servicing.23517.45 + 6.0.320-servicing.23518.27 + 6.0.320-servicing.23518.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7111d581d4a0b027e21af10147d50380602494d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:36 +0000 Subject: [PATCH 042/152] 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 a92c5c68c..b32124a20 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -46,10 +46,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99c6385fb..41e09eacb 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 - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 67fb1e64b6d4a7fe38735418cfd7fe068e986713 - + 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 916dd48be..a5fcd6759 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 d1fcad3746cde0e82979a28f98543c8848dcc8d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 03:31:36 +0000 Subject: [PATCH 043/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.49 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23518.28 -> To Version 6.0.417-servicing.23518.49 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates 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 135568420..edf7a1141 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32343ceae..1b887c2ce 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 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 + 1f517c83fb26e346ded88c5f5a3efa04302b23d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 + 1f517c83fb26e346ded88c5f5a3efa04302b23d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 478f4ae500a03931ddc0b0b6b20980a9cd1438a7 + 1f517c83fb26e346ded88c5f5a3efa04302b23d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 + 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d36f8a9539fc68ca3c9e0f4b706790fbbfd8fa46 + 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c - + 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 4ef90d136..7c2f4761a 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.416 + 6.0.417 @@ -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.417-servicing.23518.28 - 6.0.417-servicing.23518.28 + 6.0.417-servicing.23518.49 + 6.0.417-servicing.23518.49 $(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.416 + 6.0.417 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 6a3feb228bafed59a73b095942b4135805aaa452 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 18:41:03 +0000 Subject: [PATCH 044/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23518.27 -> To Version 6.0.320-servicing.23518.48 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates 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 b32124a20..c12543dc7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41e09eacb..8b56c64bf 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 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fef6a134b76e2a2ff3633aa1816918a3498e15ce + e92b5823af697ff169d8e4235c731dc87c84abbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fef6a134b76e2a2ff3633aa1816918a3498e15ce + e92b5823af697ff169d8e4235c731dc87c84abbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fef6a134b76e2a2ff3633aa1816918a3498e15ce + e92b5823af697ff169d8e4235c731dc87c84abbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 67fb1e64b6d4a7fe38735418cfd7fe068e986713 + 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 67fb1e64b6d4a7fe38735418cfd7fe068e986713 + 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 - + 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 a5fcd6759..38f74fd3a 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.319 + 6.0.320 @@ -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.320-servicing.23518.27 - 6.0.320-servicing.23518.27 + 6.0.320-servicing.23518.48 + 6.0.320-servicing.23518.48 $(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.319 + 6.0.320 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 06880423f1608828ccd53d01d1ccedae3117c7db Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 18:45:19 +0000 Subject: [PATCH 045/152] 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 787886101e731065e1cb46be597775f2d8e49c51 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 19:32:14 +0000 Subject: [PATCH 046/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23518.49 -> To Version 6.0.417-servicing.23519.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.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 | 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 edf7a1141..611eb0d5d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b887c2ce..f4c97df55 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 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + 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 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f517c83fb26e346ded88c5f5a3efa04302b23d9 + 8e4c93344f8dd182a2b71513c4cb5b6054606afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f517c83fb26e346ded88c5f5a3efa04302b23d9 + 8e4c93344f8dd182a2b71513c4cb5b6054606afe https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1f517c83fb26e346ded88c5f5a3efa04302b23d9 + 8e4c93344f8dd182a2b71513c4cb5b6054606afe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c + 360b0f2714f315e8a84f3846f541385b119f52fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7786a00f8f7f7bb0bbccedcb8ee7c232e7df837c + 360b0f2714f315e8a84f3846f541385b119f52fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f74130bc3ca3b606a18011ad64ac37a7ee77d514 + 36b5a159142e33ab521c9539cd0bc92667f4b936 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e1722e80b8f688100d15b4b794f17e1a1779e286 + 38e9bcc8ba97ba9f230975df106754d27ad98401 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7c2f4761a..adcbf236b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23516.5 + 6.0.24-servicing.23517.8 - 6.0.24-servicing.23517.2 + 6.0.24-servicing.23517.5 @@ -46,18 +46,18 @@ 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.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 0.2.0 - 6.0.417-servicing.23518.49 - 6.0.417-servicing.23518.49 + 6.0.417-servicing.23519.21 + 6.0.417-servicing.23519.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -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.23518.9 + 6.0.25-servicing.23518.9 6.0.25 6.0.25 From 0790110b35b0761dc815f53f34d4737adc509048 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 19:32:40 +0000 Subject: [PATCH 047/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23518.48 -> To Version 6.0.320-servicing.23519.24 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.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 | 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 c12543dc7..4be1091d2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b56c64bf..3942ff9b2 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 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 - + 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 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 9f5e433f881aea5968fc5a9acb2c5131f3956794 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92b5823af697ff169d8e4235c731dc87c84abbb + 0eaf582ac259a2a13774e0251aaebd2b28b24e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92b5823af697ff169d8e4235c731dc87c84abbb + 0eaf582ac259a2a13774e0251aaebd2b28b24e29 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e92b5823af697ff169d8e4235c731dc87c84abbb + 0eaf582ac259a2a13774e0251aaebd2b28b24e29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 + c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2866dbcb41a3d8ee6741cc7239cb46e8fd4b0c57 + c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f74130bc3ca3b606a18011ad64ac37a7ee77d514 + 36b5a159142e33ab521c9539cd0bc92667f4b936 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e1722e80b8f688100d15b4b794f17e1a1779e286 + 38e9bcc8ba97ba9f230975df106754d27ad98401 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 38f74fd3a..7a7fc3dbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23516.5 + 6.0.24-servicing.23517.8 - 6.0.24-servicing.23517.2 + 6.0.24-servicing.23517.5 @@ -46,18 +46,18 @@ 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.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 + 6.0.24-servicing.23518.18 0.2.0 - 6.0.320-servicing.23518.48 - 6.0.320-servicing.23518.48 + 6.0.320-servicing.23519.24 + 6.0.320-servicing.23519.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -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.23518.9 + 6.0.25-servicing.23518.9 6.0.25 6.0.25 From 1782d26b3d9c3c26826aca19ee5ec7463bff85c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 22:49:11 +0000 Subject: [PATCH 048/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.52 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23518.49 -> To Version 6.0.417-servicing.23519.52 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.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 | 12 ++++----- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 611eb0d5d..c9f651954 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - + - + @@ -41,16 +41,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4c97df55..4693ec63f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8e4c93344f8dd182a2b71513c4cb5b6054606afe + ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8e4c93344f8dd182a2b71513c4cb5b6054606afe + ce18965fe0cdaaf3676d74620365f9c1fb124ffb https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8e4c93344f8dd182a2b71513c4cb5b6054606afe + ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 360b0f2714f315e8a84f3846f541385b119f52fb + c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 360b0f2714f315e8a84f3846f541385b119f52fb + c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 36b5a159142e33ab521c9539cd0bc92667f4b936 + 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 38e9bcc8ba97ba9f230975df106754d27ad98401 + b0a02caf5d0dd6f56f073d6616d5a3501854f632 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index adcbf236b..32f07a80b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23517.8 + 6.0.25-servicing.23518.2 - 6.0.24-servicing.23517.5 + 6.0.25-servicing.23518.13 @@ -44,20 +44,20 @@ - 6.0.24 - 6.0.24 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.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 0.2.0 - 6.0.417-servicing.23519.21 - 6.0.417-servicing.23519.21 + 6.0.417-servicing.23519.52 + 6.0.417-servicing.23519.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23518.9 - 6.0.25-servicing.23518.9 + 6.0.25-servicing.23519.5 + 6.0.25-servicing.23519.5 6.0.25 6.0.25 From 7f11ce7011af0304ba33ba6151f36e0d219f7886 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:53:25 +0000 Subject: [PATCH 049/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.53 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.24 -> To Version 6.0.320-servicing.23519.53 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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 From Version 6.0.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4be1091d2..f3c2237e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - + - + @@ -41,15 +41,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3942ff9b2..721d23658 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b9a0fd905cadfbe7c915f97f1a7ea1129c29d949 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f5e433f881aea5968fc5a9acb2c5131f3956794 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0eaf582ac259a2a13774e0251aaebd2b28b24e29 + e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0eaf582ac259a2a13774e0251aaebd2b28b24e29 + e936b09bf9de0a8473a0e8964e43da4405bcc093 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0eaf582ac259a2a13774e0251aaebd2b28b24e29 + e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 + 26a6bc21dd600fcd10e9acccfaf332ae35efa381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0fd03dbad7ac94bc2ce037617dacaffd2b2e353 + 26a6bc21dd600fcd10e9acccfaf332ae35efa381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 36b5a159142e33ab521c9539cd0bc92667f4b936 + 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 38e9bcc8ba97ba9f230975df106754d27ad98401 + b0a02caf5d0dd6f56f073d6616d5a3501854f632 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7a7fc3dbd..0743ece5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23517.8 + 6.0.25-servicing.23518.2 - 6.0.24-servicing.23517.5 + 6.0.25-servicing.23518.13 @@ -44,20 +44,20 @@ - 6.0.24 - 6.0.24 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.18 - 6.0.24-servicing.23518.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 0.2.0 - 6.0.320-servicing.23519.24 - 6.0.320-servicing.23519.24 + 6.0.320-servicing.23519.53 + 6.0.320-servicing.23519.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.25-servicing.23518.9 - 6.0.25-servicing.23518.9 + 6.0.25-servicing.23519.5 + 6.0.25-servicing.23519.5 6.0.25 6.0.25 From 419d2b12feda101dbea40dd32d4e24644c0f5ef2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:55:40 +0000 Subject: [PATCH 050/152] 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 051/152] 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 052/152] 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 f3deb351d704d35c301460804bdc195a5569aeca Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:45:23 +0000 Subject: [PATCH 053/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.83 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23519.52 -> To Version 6.0.417-servicing.23519.83 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 From Version 6.0.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index c9f651954..f8bae50c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4693ec63f..55e842f9e 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 ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 + bb537eda87a605857f5ae9eebe536aecbc98408a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c87879bb8ea4cb9022b61c3d919cd8ddc3eeef46 + bb537eda87a605857f5ae9eebe536aecbc98408a diff --git a/eng/Versions.props b/eng/Versions.props index 32f07a80b..ab439ad00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.417-servicing.23519.52 - 6.0.417-servicing.23519.52 + 6.0.417-servicing.23519.83 + 6.0.417-servicing.23519.83 $(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 From 573cf82fb653ccda8633b5d60d039cb0d17abebe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:45:39 +0000 Subject: [PATCH 054/152] 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 b1162036fbcfff63d9da8a2da50f628366707852 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:46:02 +0000 Subject: [PATCH 055/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.82 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.53 -> To Version 6.0.320-servicing.23519.82 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 From Version 6.0.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3c2237e6..fbb8744ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 721d23658..03aca582f 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 e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 26a6bc21dd600fcd10e9acccfaf332ae35efa381 + b7366aae088d555ab08fc57e69567ccea691b4e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 26a6bc21dd600fcd10e9acccfaf332ae35efa381 + b7366aae088d555ab08fc57e69567ccea691b4e6 diff --git a/eng/Versions.props b/eng/Versions.props index 0743ece5d..b0ef76dee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.320-servicing.23519.53 - 6.0.320-servicing.23519.53 + 6.0.320-servicing.23519.82 + 6.0.320-servicing.23519.82 $(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 From 72a161b24681354cf9513bd30f79bb412e127ec0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 06:34:52 +0000 Subject: [PATCH 056/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.91 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23519.52 -> To Version 6.0.417-servicing.23519.91 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.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (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 f8bae50c0..6559e9d6c 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 55e842f9e..e618f067f 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 ce18965fe0cdaaf3676d74620365f9c1fb124ffb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb537eda87a605857f5ae9eebe536aecbc98408a + 052e58c70a5b81648817a701972795defff693ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb537eda87a605857f5ae9eebe536aecbc98408a + 052e58c70a5b81648817a701972795defff693ce diff --git a/eng/Versions.props b/eng/Versions.props index ab439ad00..1455eeeaf 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.417-servicing.23519.83 - 6.0.417-servicing.23519.83 + 6.0.417-servicing.23519.91 + 6.0.417-servicing.23519.91 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 309221d4a91295eb09041df117055cc5ce544109 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 06:36:27 +0000 Subject: [PATCH 057/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.93 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.53 -> To Version 6.0.320-servicing.23519.93 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.25-servicing.23518.22 -> To Version 6.0.25-servicing.23519.12 (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 fbb8744ae..59107e7f3 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 03aca582f..1e087399e 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 e936b09bf9de0a8473a0e8964e43da4405bcc093 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b7366aae088d555ab08fc57e69567ccea691b4e6 + 486d7ad115d528ebf6aeb5906050e85da5b58da8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b7366aae088d555ab08fc57e69567ccea691b4e6 + 486d7ad115d528ebf6aeb5906050e85da5b58da8 diff --git a/eng/Versions.props b/eng/Versions.props index b0ef76dee..5271a0ce5 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.320-servicing.23519.82 - 6.0.320-servicing.23519.82 + 6.0.320-servicing.23519.93 + 6.0.320-servicing.23519.93 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 600e288ffe3cee206cc3d4f8c193c46d65626f6e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 06:46:46 +0000 Subject: [PATCH 058/152] 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 3105957ad59e6b4725d27132e32608bbcc005ae5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 20:05:15 +0000 Subject: [PATCH 059/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.19 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23519.91 -> To Version 6.0.417-servicing.23520.19 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 6559e9d6c..fd811c61d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e618f067f..200fde590 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 - ce18965fe0cdaaf3676d74620365f9c1fb124ffb + 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce18965fe0cdaaf3676d74620365f9c1fb124ffb + 42ab085a51763b862990e089c4b49e881d8b4e07 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ce18965fe0cdaaf3676d74620365f9c1fb124ffb + 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 052e58c70a5b81648817a701972795defff693ce + f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 052e58c70a5b81648817a701972795defff693ce + f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe - + 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 1455eeeaf..e3574e768 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.417-servicing.23519.91 - 6.0.417-servicing.23519.91 + 6.0.417-servicing.23520.19 + 6.0.417-servicing.23520.19 $(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 52a05cf6bb4171d1c19cfd331edb15de7d55649a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 20:06:41 +0000 Subject: [PATCH 060/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23519.93 -> To Version 6.0.320-servicing.23520.20 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 59107e7f3..d23aa41a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -46,10 +46,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e087399e..93185f7d6 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 - e936b09bf9de0a8473a0e8964e43da4405bcc093 + 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e936b09bf9de0a8473a0e8964e43da4405bcc093 + 6e525a642fe66413e4edf553f5bbc73ea5c866e5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e936b09bf9de0a8473a0e8964e43da4405bcc093 + 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 486d7ad115d528ebf6aeb5906050e85da5b58da8 + aba9c2c28f7e7827da7f757669e823b3c3dc831c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 486d7ad115d528ebf6aeb5906050e85da5b58da8 + aba9c2c28f7e7827da7f757669e823b3c3dc831c - + 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 5271a0ce5..3b06d84bb 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.320-servicing.23519.93 - 6.0.320-servicing.23519.93 + 6.0.320-servicing.23520.20 + 6.0.320-servicing.23520.20 $(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 806583a1dac91c5d01c16351548f9fc1a66f8646 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 20:07:53 +0000 Subject: [PATCH 061/152] 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 58eb78b6a0629b7f860c1f1269a70e619bb6742a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 23 Oct 2023 11:27:48 -0700 Subject: [PATCH 062/152] Add coherent dependency for emsdk on runtime and run an coherency update --- NuGet.config | 8 -------- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8e5ee130..2cf5556c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c2c995c7..761812080 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 52e9452f82e26f9fcae791e84c082ae22f1ef66f + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 709738fc7..b87703aab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,8 +185,8 @@ 12.3.100-rc.1.125 15.4.100-rc.1.125 6.0.4 - 6.0.4 - $(MicrosoftNETWorkloadEmscriptenManifest60200Version) + 6.0.22 + $(MicrosoftNETWorkloadEmscriptenManifest60300Version) From 4e6318f73ab3bd391e96da68f2dea8fe8fa6f6f9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 23 Oct 2023 11:53:20 -0700 Subject: [PATCH 063/152] Enable coherency dependency flow for emsdk --- NuGet.config | 24 ------------------------ eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9401b3f64..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,22 +13,10 @@ - - - - - - - - - - - - @@ -51,22 +39,10 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 688060474..a9899d9f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 52e9452f82e26f9fcae791e84c082ae22f1ef66f + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index dc111971f..c97437784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,8 +185,8 @@ 12.3.303 15.4.303 6.0.5 - 6.0.4 - $(MicrosoftNETWorkloadEmscriptenManifest60200Version) + 6.0.22 + $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 61a27a32854c6b29d058095873ef0476ebbf46c5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:08:14 +0000 Subject: [PATCH 064/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.417-servicing.23520.19 -> To Version 6.0.417-servicing.23523.41 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 fd811c61d..1f8067f09 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 200fde590..e2ba4a8c9 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 42ab085a51763b862990e089c4b49e881d8b4e07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe + 964a8fda7fbf584c0301cffcde43c959e0ea0275 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f858ff1c05db3bd2b40d61c221ae2dc9c0fc8efe + 964a8fda7fbf584c0301cffcde43c959e0ea0275 diff --git a/eng/Versions.props b/eng/Versions.props index e3574e768..242fdbe89 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.417-servicing.23520.19 - 6.0.417-servicing.23520.19 + 6.0.417-servicing.23523.41 + 6.0.417-servicing.23523.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 40bbcfa2e2ab8bb71099070a057c0002d2af9925 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:08:32 +0000 Subject: [PATCH 065/152] 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 763e59b735f8897681261d1dd917cc543a43e84a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:09:15 +0000 Subject: [PATCH 066/152] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.320-servicing.23520.20 -> To Version 6.0.320-servicing.23523.40 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 d23aa41a8..df347d0f2 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 93185f7d6..218fc77c7 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 6e525a642fe66413e4edf553f5bbc73ea5c866e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aba9c2c28f7e7827da7f757669e823b3c3dc831c + 733590df6146364699e0d3d8d465f2f8da15b063 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aba9c2c28f7e7827da7f757669e823b3c3dc831c + 733590df6146364699e0d3d8d465f2f8da15b063 diff --git a/eng/Versions.props b/eng/Versions.props index 3b06d84bb..ffc00dd66 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.320-servicing.23520.20 - 6.0.320-servicing.23520.20 + 6.0.320-servicing.23523.40 + 6.0.320-servicing.23523.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1b5e0e204956294804c290739a41e440d184d0af Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 24 Oct 2023 14:02:51 -0700 Subject: [PATCH 067/152] .NET Source-Build 6.0.124 October 2023 Updates (#17618) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 84a2b235b..d7a82ec5d 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.123 + 6.0.124 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 20e7bdc4c..e64601b87 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.123" + "dotnet": "6.0.124" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 7905f1bbc8bb284f2bb5ea1857b5191768cd2880 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 7 Nov 2023 08:53:17 -0500 Subject: [PATCH 068/152] [release/6.0] Add alpine to CI for source-build (#13074) --- .../common/templates/job/source-build-build-tarball.yml | 9 +++++++-- .../templates/job/source-build-run-tarball-build.yml | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 9ae170d1c..2c7900e09 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -85,7 +85,7 @@ jobs: - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} artifact: BlobArtifacts - patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' displayName: Download MSFT sdk Tarball - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: @@ -156,7 +156,12 @@ jobs: if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" - msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" fi diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 1dc1503c5..e710e1250 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -9,6 +9,7 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- + alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80 centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c @@ -37,6 +38,11 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: + Alpine317-Offline: + _BootstrapPrep: true + _Container: ${{ parameters.alpine317Container }} + _ExcludeOmniSharpTests: true + _RunOnline: false CentOS7-Online: _BootstrapPrep: false _Container: ${{ parameters.centOS7Container }} From a7d4f9cef5257390ac5f2dbe064f01e4a18bca4e Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 7 Nov 2023 09:27:14 -0600 Subject: [PATCH 069/152] [source build] Use floating tags for container image names (#17696) --- eng/common/templates/jobs/source-build.yml | 2 +- .../job/source-build-create-tarball.yml | 2 +- .../job/source-build-run-tarball-build.yml | 20 ++++-------- .../pipelines/security-partners-dotnet.yml | 31 ------------------- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3..7c240e654 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index ac6d73016..347f61cf8 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -2,7 +2,7 @@ jobs: - job: Source_Build_Create_Tarball - container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index e710e1250..bfea7becd 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -10,13 +10,11 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 - centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80 - centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b + centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c - debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b - debian9Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-arm64v8-20220405201138-a251961 - fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-20230609193134-47458d2 - ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b + debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 + fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 @@ -56,12 +54,6 @@ jobs: _ExcludeOmniSharpTests: true _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - CentOS8-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.centOS8Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false CentOSStream9-Offline: _BootstrapPrep: false _Container: ${{ parameters.centOSStream9Container }} @@ -97,9 +89,9 @@ jobs: dependsOn: ${{ parameters.dependsOn }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Debian9-Offline: + Debian11-Offline: _BootstrapPrep: true - _Container: ${{ parameters.debian9Arm64Container }} + _Container: ${{ parameters.debian11Arm64Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml deleted file mode 100644 index 73dd514c5..000000000 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ /dev/null @@ -1,31 +0,0 @@ -trigger: none - -variables: -- name: cfsNPMWarnLevel - value: none - -- name: cfsNugetWarnLevel - value: none - -- name: myGetWarnLevel - value: none - -- name: NuGetSecurityAnalysisWarningLevel - value: none - -jobs: -- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml - parameters: - architecture: x64 - excludeSdkContentTests: true - matrix: - Ubuntu1804-Offline: - _BootstrapPrep: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - name: Build_Tarball_x64 - pool: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From 2485ef7607181a26ec84e356e4fad71f02bed5b9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:07 -0800 Subject: [PATCH 070/152] Update branding to 6.0.126 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d7a82ec5d..cad7761d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 25 + 26 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From f212d116e7444d461391ef131c3a553fb505e240 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:11 -0800 Subject: [PATCH 071/152] Update branding to 6.0.321 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 709738fc7..19776745f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 20 + 21 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c0dde1944c7364dfe4fa6f3642dea627f2a7ce88 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:15 -0800 Subject: [PATCH 072/152] Update branding to 6.0.418 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index dc111971f..461f3a8cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 17 + 18 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 084c161943ff64e03cd3952ac635db4bf72d3f5f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 8 Nov 2023 17:34:45 -0600 Subject: [PATCH 073/152] Remove redundant xml doc test (#17734) --- .../XmlDocTests.cs | 48 ----- .../assets/baselines/MissingXmlDoc.txt | 175 ------------------ 2 files changed, 223 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs deleted file mode 100644 index f8f4f2c8b..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Xunit; -using Xunit.Abstractions; - -namespace Microsoft.DotNet.SourceBuild.SmokeTests; - -public class XmlDocTests : SmokeTests -{ - public XmlDocTests(ITestOutputHelper outputHelper) : base(outputHelper) { } - - /// - /// Verifies every targeting pack assembly has a xml doc file. - /// There are exceptions which are specified in baselines/XmlDocIgnore.*.txt. - /// - // Re-enable when fixing https://github.com/dotnet/source-build/issues/3660 - //[Fact] - public void VerifyTargetingPacksHaveDoc() - { - List missingXmlDoc = new(); - - string targetingPacksDirectory = Path.Combine(Config.DotNetDirectory, "packs"); - foreach (string targetingPackAssembly in Directory.EnumerateFiles(targetingPacksDirectory, "*.dll", SearchOption.AllDirectories)) - { - if (targetingPackAssembly.EndsWith("resources.dll")) - { - continue; - } - - string xmlFile = Path.ChangeExtension(targetingPackAssembly, ".xml"); - if (!File.Exists(xmlFile)) - { - string pathWithoutPacksPrefix = xmlFile[(targetingPacksDirectory.Length + 1)..]; - string[] pathParts = pathWithoutPacksPrefix.Split(Path.DirectorySeparatorChar); - string pathWithoutVersion = string.Join(Path.DirectorySeparatorChar, pathParts.Take(1).Concat(pathParts.Skip(2))); - pathWithoutVersion = BaselineHelper.RemoveNetTfmPaths(pathWithoutVersion); - missingXmlDoc.Add(pathWithoutVersion); - } - } - - BaselineHelper.CompareEntries("MissingXmlDoc.txt", missingXmlDoc.OrderBy(entry => entry)); - } -} 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 deleted file mode 100644 index 38f80e186..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ /dev/null @@ -1,175 +0,0 @@ -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.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 -Microsoft.NETCore.App.Ref/ref/netx.y/System.AppContext.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Buffers.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ComponentModel.DataAnnotations.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Configuration.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Core.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.DataSetExtensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Data.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Debug.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Diagnostics.Tools.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Drawing.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Dynamic.Runtime.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Calendars.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Globalization.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.Brotli.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.Compression.FileSystem.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.Primitives.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.FileSystem.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.UnmanagedMemoryStream.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.IO.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Net.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Numerics.Vectors.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Numerics.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Reflection.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.Reader.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Resources.ResourceManager.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Handles.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Runtime.Serialization.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.Principal.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.SecureString.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Security.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ServiceModel.Web.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ServiceProcess.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Text.Encoding.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.Extensions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Tasks.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Threading.Timer.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Transactions.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.ValueTuple.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Web.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Windows.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.Linq.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.Serialization.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.xml -Microsoft.NETCore.App.Ref/ref/netx.y/System.Xml.XmlDocument.xml -Microsoft.NETCore.App.Ref/ref/netx.y/WindowsBase.xml -NETStandard.Library.Ref/ref/netstandard2.1/Microsoft.Win32.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/mscorlib.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.AppContext.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Buffers.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.Concurrent.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.NonGeneric.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.Specialized.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.Composition.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.EventBasedAsync.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.TypeConverter.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Console.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Core.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Data.Common.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Data.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Contracts.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Debug.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.FileVersionInfo.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Process.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.StackTrace.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.TextWriterTraceListener.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Tools.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.TraceSource.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Tracing.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Drawing.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Drawing.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Dynamic.Runtime.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.Calendars.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.FileSystem.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.ZipFile.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.DriveInfo.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.Watcher.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.IsolatedStorage.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.MemoryMappedFiles.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Pipes.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.UnmanagedMemoryStream.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Expressions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Parallel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Queryable.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Memory.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Http.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.NameResolution.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.NetworkInformation.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Ping.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Requests.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Security.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Sockets.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebHeaderCollection.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebSockets.Client.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebSockets.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Numerics.Vectors.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Numerics.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ObjectModel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.DispatchProxy.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.ILGeneration.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.Lightweight.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.Reader.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.ResourceManager.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.Writer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.CompilerServices.VisualC.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Handles.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.InteropServices.RuntimeInformation.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.InteropServices.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Numerics.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Formatters.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Json.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Xml.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Claims.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Algorithms.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Csp.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Encoding.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.X509Certificates.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Principal.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.SecureString.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ServiceModel.Web.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.Encoding.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.Encoding.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.RegularExpressions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Overlapped.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.Parallel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Thread.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.ThreadPool.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Timer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Transactions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ValueTuple.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Web.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Windows.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.Linq.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.ReaderWriter.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.Serialization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlSerializer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.XDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.xml 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 074/152] .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 From 193aa8f1fbfcae43126620143761dc59fb74e8fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Nov 2023 19:18:28 +0000 Subject: [PATCH 075/152] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23511.8 -> To Version 6.0.0-beta.23517.3 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.22 -> To Version 6.0.25 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0 --- NuGet.config | 8 -------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 4 ++-- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f8067f09..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,16 +37,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10158d645..492e94748 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 https://github.com/dotnet/source-build @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7814defb1..6407cb843 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23511.8 + 6.0.0-beta.23517.3 @@ -185,7 +185,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.22 + 6.0.25 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 7c240e654..00aa98eb3 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/global.json b/global.json index eeff7fa00..1410185dd 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23511.8" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" } } From 66c787891e4032897eb5df029c11ea97a5a4b89a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:01:01 +0000 Subject: [PATCH 076/152] [release/6.0.1xx] Update dependencies from dotnet/arcade (#17517) [release/6.0.1xx] Update dependencies from dotnet/arcade - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-25252fb3-bc5a-4401-85d9-c93e83346b2b - Merge branch 'release/6.0.1xx' into darc-release/6.0.1xx-25252fb3-bc5a-4401-85d9-c93e83346b2b --- NuGet.config | 9 ----- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 2 +- eng/common/retain-build.ps1 | 45 +++++++++++++++++++++ eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/steps/retain-build.yml | 28 +++++++++++++ global.json | 6 +-- 7 files changed, 84 insertions(+), 20 deletions(-) create mode 100644 eng/common/retain-build.ps1 create mode 100644 eng/common/templates/steps/retain-build.yml diff --git a/NuGet.config b/NuGet.config index a735b4622..dd632b04b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -42,17 +37,13 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7af92d1e..039431cba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c858d3a61..616f2592a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23408.5 + 6.0.0-beta.23517.3 diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1 new file mode 100644 index 000000000..e7ba975ad --- /dev/null +++ b/eng/common/retain-build.ps1 @@ -0,0 +1,45 @@ + +Param( +[Parameter(Mandatory=$true)][int] $buildId, +[Parameter(Mandatory=$true)][string] $azdoOrgUri, +[Parameter(Mandatory=$true)][string] $azdoProject, +[Parameter(Mandatory=$true)][string] $token +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +function Get-AzDOHeaders( + [string] $token) +{ + $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) + $headers = @{"Authorization"="Basic $base64AuthInfo"} + return $headers +} + +function Update-BuildRetention( + [string] $azdoOrgUri, + [string] $azdoProject, + [int] $buildId, + [string] $token) +{ + $headers = Get-AzDOHeaders -token $token + $requestBody = "{ + `"keepForever`": `"true`" + }" + + $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" + write-Host "Attempting to retain build using the following URI: ${requestUri} ..." + + try { + Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" + Write-Host "Updated retention settings for build ${buildId}." + } + catch { + Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" + exit 1 + } +} + +Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token +exit 0 diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 7c240e654..00aa98eb3 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml new file mode 100644 index 000000000..83d97a26a --- /dev/null +++ b/eng/common/templates/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/global.json b/global.json index 327cfe027..1410185dd 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121", + "dotnet": "6.0.123", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" } } From 61a7ec7347804b96e1f123bb87b1bb8f43363397 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 27 Nov 2023 11:27:55 -0800 Subject: [PATCH 077/152] Download and compare linux-musl-x64 MSFT sdk (#17823) --- .../common/templates/job/source-build-build-tarball.yml | 9 +++++++-- src/SourceBuild/tarball/content/Directory.Build.props | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 9e67adb4d..c8756326e 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -85,7 +85,7 @@ jobs: - ${{ if ne(parameters.excludeSdkContentTests, 'true') }}: - download: ${{ parameters.installerBuildResourceId }} artifact: BlobArtifacts - patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' displayName: Download MSFT sdk Tarball - ${{ if eq(parameters.usePreviousArtifacts, 'true') }}: @@ -185,7 +185,12 @@ jobs: if [[ '${{ parameters.excludeSdkContentTests}}' != 'true' ]]; then dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" - msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + platform="linux" + docker run --rm $(_Container) /bin/sh -c "cat /etc/os-release | grep -q alpine" + if [[ $? == 0 ]]; then + platform="$platform-musl" + fi + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" fi diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 2f4a8ee71..0bd228850 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -174,6 +174,7 @@ freebsd-$(Platform) osx-$(Platform) linux-$(Platform) + linux-musl-$(Platform) win-$(Platform) $(PortableRid) From 1bfbd543e06811b56f7b0b3e9b5e885d8f43dc4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 18:57:28 +0000 Subject: [PATCH 078/152] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231128.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23219.1 -> To Version 7.0.0-alpha.1.23578.1 --- NuGet.config | 27 --------------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7b13934dc..bdc3a6cb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,29 +10,14 @@ - - - - - - - - - - - - - - - @@ -54,23 +39,11 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ed02abb3..661646f3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/source-build-reference-packages - 525b6c35cc5c5c9b80b47044be2e4e77858d505a + 6d5841c05f04d60eccf3358588b8c8968215d9e2 From e58facf1b23bbd3ba7850272765e2d9354ed480c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 18:57:29 +0000 Subject: [PATCH 079/152] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231128.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23219.1 -> To Version 7.0.0-alpha.1.23578.1 --- NuGet.config | 27 --------------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6965e587b..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,29 +10,14 @@ - - - - - - - - - - - - - - - @@ -54,23 +39,11 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a3d473a0..e86c9c4ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/source-build-reference-packages - 525b6c35cc5c5c9b80b47044be2e4e77858d505a + 6d5841c05f04d60eccf3358588b8c8968215d9e2 From d60339e96f69c69153a754512fcb8683cbb64bd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 18:57:29 +0000 Subject: [PATCH 080/152] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231128.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23219.1 -> To Version 7.0.0-alpha.1.23578.1 --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index be7632bd2..9c94cf60c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,27 +9,15 @@ - - - - - - - - - - - - @@ -53,18 +41,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a464c3fa3..327438c20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,9 +207,9 @@ https://github.com/dotnet/arcade ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/source-build-reference-packages - 525b6c35cc5c5c9b80b47044be2e4e77858d505a + 6d5841c05f04d60eccf3358588b8c8968215d9e2 From f3408134a4434bf293b704fdc7369aec172f9f6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Nov 2023 17:42:52 +0000 Subject: [PATCH 081/152] Update dependencies from https://github.com/dotnet/arcade build 20231130.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23564.5 -> To Version 7.0.0-beta.23580.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/post-build/common-variables.yml | 2 +- global.json | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e86c9c4ef..d2ead3a98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3012a3afa..b2a622e42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23564.5 + 7.0.0-beta.23580.4 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 84c1d0cc2..c305ae6bd 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index c5fedd7f7..e8c6c2d09 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -87,7 +87,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb5..8dd2d355f 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 776bd9700..b504fe55c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -10,7 +10,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/global.json b/global.json index 154f5f035..d3f802679 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23580.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" } } From 5fd71536c8e684e82399e7f96edaadabd78412f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Nov 2023 17:42:52 +0000 Subject: [PATCH 082/152] Update dependencies from https://github.com/dotnet/arcade build 20231130.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23564.5 -> To Version 7.0.0-beta.23580.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/post-build/common-variables.yml | 2 +- global.json | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 661646f3a..5639ece9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 122ba126e..9c86d8b84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23564.5 + 7.0.0-beta.23580.4 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 84c1d0cc2..c305ae6bd 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index c5fedd7f7..e8c6c2d09 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -87,7 +87,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb5..8dd2d355f 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 776bd9700..b504fe55c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -10,7 +10,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/global.json b/global.json index 154f5f035..d3f802679 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23580.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" } } From b654f3e01bd56d01afd22663f05a63baf4c5eb22 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Tue, 5 Dec 2023 12:15:32 -0800 Subject: [PATCH 083/152] Enable open ssl sha 1 signatures for CentOS Stream 9 (#17889) --- .../templates/job/source-build-build-tarball.yml | 11 ++++++++--- .../templates/job/source-build-run-tarball-build.yml | 10 +++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 2c7900e09..f5569e26b 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -123,19 +123,24 @@ jobs: set -x df -h - networkArgs= + customRunArgs= customBuildArgs= if [[ '$(_RunOnline)' == 'true' ]]; then customBuildArgs='--online' else - networkArgs='--network none' + customRunArgs='--network none' + fi + + # See https://github.com/dotnet/source-build/issues/3712 + if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then + customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1" fi if [[ '$(_EnablePoison)' == 'true' ]]; then customBuildArgs="$customBuildArgs --poison" fi - docker run --rm -v $(tarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) + docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) displayName: Build Tarball - ${{ if ne(variables['System.TeamProject'], 'public') }}: diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index bfea7becd..a4a18425a 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -11,7 +11,7 @@ parameters: # ----------------------------------------------------------------------------------------------- alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build - centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 @@ -40,18 +40,21 @@ jobs: _BootstrapPrep: true _Container: ${{ parameters.alpine317Container }} _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false _RunOnline: false CentOS7-Online: _BootstrapPrep: false _Container: ${{ parameters.centOS7Container }} _EnablePoison: false _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false _RunOnline: true CentOS7-Offline: _BootstrapPrep: false _Container: ${{ parameters.centOS7Container }} _EnablePoison: false _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: CentOSStream9-Offline: @@ -59,18 +62,21 @@ jobs: _Container: ${{ parameters.centOSStream9Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: true _RunOnline: false Fedora38-Offline: _BootstrapPrep: false _Container: ${{ parameters.fedora38Container }} _EnablePoison: true _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false Ubuntu1804-Offline: _BootstrapPrep: false _Container: ${{ parameters.ubuntu1804Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false name: Build_Tarball_x64 pool: @@ -94,6 +100,7 @@ jobs: _Container: ${{ parameters.debian11Arm64Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false name: Build_Tarball_arm64 pool: ${{ parameters.poolInternalArm64 }} @@ -114,6 +121,7 @@ jobs: _Container: ${{ parameters.fedora38Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false name: Build_Tarball_x64_Using_Previous pool: From e488f0c8cf38a7baf3d67d553c001be76b63e84d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Dec 2023 11:13:41 -0600 Subject: [PATCH 084/152] Add back security-partners-dotnet pipeline (#17956) --- .../pipelines/security-partners-dotnet.yml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml new file mode 100644 index 000000000..844f876f6 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -0,0 +1,32 @@ +trigger: none + +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + +jobs: +- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu2004-Offline: + _BootstrapPrep: true + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From 46bc6576aa335ef994e03b0e4bceb5db741bda6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 17:39:50 +0000 Subject: [PATCH 085/152] [release/7.0.4xx] Update dependencies from dotnet/arcade (#18011) [release/7.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- global.json | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5639ece9f..b29928cb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9c86d8b84..f1e52762b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23580.4 + 7.0.0-beta.23620.3 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index ef337eac5..11c345c58 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -124,7 +124,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index e8c6c2d09..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index c051f1b65..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 @@ -272,7 +272,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index d3f802679..73ab36895 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23580.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" } } From fe9a639fb4b4509617a59f0d44a384478c5638fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 17:39:53 +0000 Subject: [PATCH 086/152] [release/7.0.3xx] Update dependencies from dotnet/arcade (#18012) [release/7.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- global.json | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2ead3a98..6cc0c1769 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b2a622e42..a82728ae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23580.4 + 7.0.0-beta.23620.3 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index ef337eac5..11c345c58 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -124,7 +124,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index e8c6c2d09..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index c051f1b65..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 @@ -272,7 +272,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index d3f802679..73ab36895 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23580.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" } } From b015286fbf1aa466c5ea93ddafb2641d4c6b6eac Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:51 -0800 Subject: [PATCH 087/152] Update branding to 6.0.322 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c689826cd..a0544d921 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 21 + 22 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 9c3dc27baa46731dfe71d44ebd14dac55a98036d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:55 -0800 Subject: [PATCH 088/152] Update branding to 6.0.419 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6407cb843..50201197d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 18 + 19 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 377a557649f9237e02ee15dc150e07a3ba567c12 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:59 -0800 Subject: [PATCH 089/152] Update branding to 7.0.116 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a42e5dcf5..192f8e1a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 15 + 16 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 9a55503c824a8bca5589fb75188cafc41b0d1961 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:58:04 -0800 Subject: [PATCH 090/152] Update branding to 7.0.313 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a82728ae8..95123c15c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 12 + 13 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From dbd23ce32317989b0b9e88c6f4687fe44ec82023 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:58:08 -0800 Subject: [PATCH 091/152] Update branding to 7.0.406 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f1e52762b..c1b89b449 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 9d6cf72414e1b210d818d4ef971aac50a2586e8d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:58:12 -0800 Subject: [PATCH 092/152] Update branding to 8.0.102 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b2c7f72dc..625530b63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 1 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 07753fbe69dfcd225a20bf91c9ba3e1b5f395a13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Jan 2024 23:38:10 +0000 Subject: [PATCH 093/152] Update dependencies from https://github.com/dotnet/sdk build 20240103.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24051.1 -> To Version 8.0.200-preview.24053.24 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.9.0-3.23629.3 -> To Version 4.9.0-3.24052.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 + eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 94ab32f7a..e3428e918 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a1ab0cc1..d6fb43002 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 0074a68a37fc8d79d619765f4c0fc1198297f92c + 1109d97e98f8fe1559174454ef54f7e71b72cf66 - + https://github.com/dotnet/sdk - 0074a68a37fc8d79d619765f4c0fc1198297f92c + 1109d97e98f8fe1559174454ef54f7e71b72cf66 - + https://github.com/dotnet/sdk - 0074a68a37fc8d79d619765f4c0fc1198297f92c + 1109d97e98f8fe1559174454ef54f7e71b72cf66 - + https://github.com/dotnet/sdk - 0074a68a37fc8d79d619765f4c0fc1198297f92c + 1109d97e98f8fe1559174454ef54f7e71b72cf66 https://github.com/dotnet/test-templates @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - ebb588725e707db23d8723b633258e7eb918277b + 45421ad7dfcb8e1563e172eda81d9d892a0fe73c - + https://github.com/dotnet/msbuild - 82d381eb23290d50936683719bda333461af9528 + e514b5973d09e1b8fe4e2cb154e4b680efc135ec https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index e535f369b..61679004c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.24051.1 - 8.0.200-preview.24051.1 - 8.0.200-preview.24051.1 + 8.0.200-preview.24053.24 + 8.0.200-preview.24053.24 + 8.0.200-preview.24053.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23629.3 + 4.9.0-3.24052.3 From f450eb5f270a90aec4e0822c26f0599df579939f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Jan 2024 20:05:02 +0000 Subject: [PATCH 094/152] Update dependencies from https://github.com/dotnet/source-build-externals build 20240104.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23570.1 -> To Version 8.0.0-alpha.1.24054.1 --- NuGet.config | 9 --------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 71b75cf38..31081bc89 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -42,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a2d6ca92..bd4df2042 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - e844aa02a05b90d8cbe499676ec6ee0f19ec4980 + 6c9557fbf18398d6f226bfd16ce3876f1fe2e940 From 54e22b112e57d80c8d329145e163d55ca08365e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 12:25:10 -0800 Subject: [PATCH 095/152] [release/8.0.2xx] Update dependencies from dotnet/sdk (#18103) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6fb43002..62a90b728 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1109d97e98f8fe1559174454ef54f7e71b72cf66 + 852e9c368cc8d024681115b554dfd78a206ade92 - + https://github.com/dotnet/sdk - 1109d97e98f8fe1559174454ef54f7e71b72cf66 + 852e9c368cc8d024681115b554dfd78a206ade92 - + https://github.com/dotnet/sdk - 1109d97e98f8fe1559174454ef54f7e71b72cf66 + 852e9c368cc8d024681115b554dfd78a206ade92 - + https://github.com/dotnet/sdk - 1109d97e98f8fe1559174454ef54f7e71b72cf66 + 852e9c368cc8d024681115b554dfd78a206ade92 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 61679004c..655a2b314 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24053.24 - 8.0.200-preview.24053.24 - 8.0.200-preview.24053.24 + 8.0.200-preview.24054.4 + 8.0.200-preview.24054.4 + 8.0.200-preview.24054.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 764e1919eb929b4012e1ecd88b8c7d1fe7be6be9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Jan 2024 20:43:12 +0000 Subject: [PATCH 096/152] Update dependencies from https://github.com/dotnet/sdk build 20240104.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24054.4 -> To Version 8.0.200-preview.24054.7 Dependency coherency updates NuGet.Build.Tasks From Version 6.9.0-preview.1.70 -> To Version 6.9.0-rc.74 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62a90b728..cfdaf4bbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 852e9c368cc8d024681115b554dfd78a206ade92 + 1edd268c8b77f8b8751a74006adbdfc0339ecad6 - + https://github.com/dotnet/sdk - 852e9c368cc8d024681115b554dfd78a206ade92 + 1edd268c8b77f8b8751a74006adbdfc0339ecad6 - + https://github.com/dotnet/sdk - 852e9c368cc8d024681115b554dfd78a206ade92 + 1edd268c8b77f8b8751a74006adbdfc0339ecad6 - + https://github.com/dotnet/sdk - 852e9c368cc8d024681115b554dfd78a206ade92 + 1edd268c8b77f8b8751a74006adbdfc0339ecad6 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild e514b5973d09e1b8fe4e2cb154e4b680efc135ec - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c diff --git a/eng/Versions.props b/eng/Versions.props index 655a2b314..9584995d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24054.4 - 8.0.200-preview.24054.4 - 8.0.200-preview.24054.4 + 8.0.200-preview.24054.7 + 8.0.200-preview.24054.7 + 8.0.200-preview.24054.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-preview.1.70 + 6.9.0-rc.74 From b211d930910e3cb090abfca56109d301629aafaf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Jan 2024 21:44:49 +0000 Subject: [PATCH 097/152] Update dependencies from https://github.com/dotnet/sdk build 20240104.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24054.4 -> To Version 8.0.200-preview.24054.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.9.0-3.24052.3 -> To Version 4.9.0-3.24053.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfdaf4bbc..c25af0bf9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1edd268c8b77f8b8751a74006adbdfc0339ecad6 + 8cf291c5add437f1ac5c7d3a890b445b339f6412 - + https://github.com/dotnet/sdk - 1edd268c8b77f8b8751a74006adbdfc0339ecad6 + 8cf291c5add437f1ac5c7d3a890b445b339f6412 - + https://github.com/dotnet/sdk - 1edd268c8b77f8b8751a74006adbdfc0339ecad6 + 8cf291c5add437f1ac5c7d3a890b445b339f6412 - + https://github.com/dotnet/sdk - 1edd268c8b77f8b8751a74006adbdfc0339ecad6 + 8cf291c5add437f1ac5c7d3a890b445b339f6412 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 45421ad7dfcb8e1563e172eda81d9d892a0fe73c + 237fb52c683601ed639f1fdeaf38ceef0c768fbc diff --git a/eng/Versions.props b/eng/Versions.props index 9584995d7..6cac2b87c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.24054.7 - 8.0.200-preview.24054.7 - 8.0.200-preview.24054.7 + 8.0.200-preview.24054.8 + 8.0.200-preview.24054.8 + 8.0.200-preview.24054.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.24052.3 + 4.9.0-3.24053.1 From 5dc7639d3c248d5840cc56da301c6d7b739e3120 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Jan 2024 22:39:19 +0000 Subject: [PATCH 098/152] Update dependencies from https://github.com/dotnet/sdk build 20240104.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24054.4 -> To Version 8.0.200-preview.24054.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.9.0-3.24052.3 -> To Version 4.9.0-3.24053.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3428e918..9dedafcb5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c25af0bf9..b557684c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 8cf291c5add437f1ac5c7d3a890b445b339f6412 + 74b892ac17dfad6c02dbd30f7cfb194138fb0943 - + https://github.com/dotnet/sdk - 8cf291c5add437f1ac5c7d3a890b445b339f6412 + 74b892ac17dfad6c02dbd30f7cfb194138fb0943 - + https://github.com/dotnet/sdk - 8cf291c5add437f1ac5c7d3a890b445b339f6412 + 74b892ac17dfad6c02dbd30f7cfb194138fb0943 - + https://github.com/dotnet/sdk - 8cf291c5add437f1ac5c7d3a890b445b339f6412 + 74b892ac17dfad6c02dbd30f7cfb194138fb0943 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 237fb52c683601ed639f1fdeaf38ceef0c768fbc - + https://github.com/dotnet/msbuild - e514b5973d09e1b8fe4e2cb154e4b680efc135ec + 5f481c7bc7d489e0d369b82b9cd18aac25f63ce6 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 6cac2b87c..7992d3b38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24054.8 - 8.0.200-preview.24054.8 - 8.0.200-preview.24054.8 + 8.0.200-preview.24054.11 + 8.0.200-preview.24054.11 + 8.0.200-preview.24054.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fccbe158e18a2afec3f0bf4484cd80fac92b4515 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 15:44:01 -0800 Subject: [PATCH 099/152] [release/8.0.2xx] Update dependencies from dotnet/sdk (#18114) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9dedafcb5..ba606dcba 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b557684c6..59af8b631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 74b892ac17dfad6c02dbd30f7cfb194138fb0943 + 9599baa3832545dbdea0959e22bc81092d19e032 - + https://github.com/dotnet/sdk - 74b892ac17dfad6c02dbd30f7cfb194138fb0943 + 9599baa3832545dbdea0959e22bc81092d19e032 - + https://github.com/dotnet/sdk - 74b892ac17dfad6c02dbd30f7cfb194138fb0943 + 9599baa3832545dbdea0959e22bc81092d19e032 - + https://github.com/dotnet/sdk - 74b892ac17dfad6c02dbd30f7cfb194138fb0943 + 9599baa3832545dbdea0959e22bc81092d19e032 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 237fb52c683601ed639f1fdeaf38ceef0c768fbc - + https://github.com/dotnet/msbuild - 5f481c7bc7d489e0d369b82b9cd18aac25f63ce6 + bb6fadf23225f5097f4e05ed507d93683a21ae56 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 7992d3b38..f0dff43a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24054.11 - 8.0.200-preview.24054.11 - 8.0.200-preview.24054.11 + 8.0.200-preview.24055.7 + 8.0.200-preview.24055.7 + 8.0.200-preview.24055.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0d0edb5b6bede59602015871b8a8d0032cb2299 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 8 Jan 2024 03:11:14 +0000 Subject: [PATCH 100/152] Update dependencies from https://github.com/dotnet/sdk build 20240107.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24055.7 -> To Version 8.0.200-preview.24057.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.200-beta.23618.1 -> To Version 12.8.200-beta.24055.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59af8b631..220d02f64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 9599baa3832545dbdea0959e22bc81092d19e032 + 8b1d49493edee44364e2117b49df1bf0df4ea46a - + https://github.com/dotnet/sdk - 9599baa3832545dbdea0959e22bc81092d19e032 + 8b1d49493edee44364e2117b49df1bf0df4ea46a - + https://github.com/dotnet/sdk - 9599baa3832545dbdea0959e22bc81092d19e032 + 8b1d49493edee44364e2117b49df1bf0df4ea46a - + https://github.com/dotnet/sdk - 9599baa3832545dbdea0959e22bc81092d19e032 + 8b1d49493edee44364e2117b49df1bf0df4ea46a https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 0c489541068f311e23b582410c1df3ff86f1d526 + cc741852156e5f048e4e046061fa36477f8b92fb - + https://github.com/dotnet/fsharp - 0c489541068f311e23b582410c1df3ff86f1d526 + cc741852156e5f048e4e046061fa36477f8b92fb diff --git a/eng/Versions.props b/eng/Versions.props index f0dff43a4..409964fb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24055.7 - 8.0.200-preview.24055.7 - 8.0.200-preview.24055.7 + 8.0.200-preview.24057.5 + 8.0.200-preview.24057.5 + 8.0.200-preview.24057.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9dd35668a38509227db5f01ae007301831370d61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 13:53:43 +0000 Subject: [PATCH 101/152] Update dependencies from https://github.com/dotnet/test-templates build 20240109.1 Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23612.1 -> To Version 1.1.0-rc.24059.1 --- 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 220d02f64..f2b10a8bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - ec54b2c1553db0a544ef0e8595be2318fc12e08d + 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://github.com/dotnet/test-templates - ec54b2c1553db0a544ef0e8595be2318fc12e08d + 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://github.com/dotnet/test-templates - ec54b2c1553db0a544ef0e8595be2318fc12e08d + 7d2f2719628e6744f3172a2d48e0d1f600b360c0 diff --git a/eng/Versions.props b/eng/Versions.props index 409964fb9..23556b3a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 1.1.0-rc.22558.1 1.1.0-rc.23410.2 - 1.1.0-rc.23612.1 - 1.1.0-rc.23612.1 - 1.1.0-rc.23612.1 + 1.1.0-rc.24059.1 + 1.1.0-rc.24059.1 + 1.1.0-rc.24059.1 From 426d535488294b863cd8beb8b17e47ec4eb23612 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 9 Jan 2024 11:06:50 -0800 Subject: [PATCH 102/152] [release/8.0.1xx] Use SHA256 for RPM digest (#18111) --- src/core-sdk-tasks/BuildFPMToolPreReqs.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs index ec43d0ae3..b24fbfd10 100644 --- a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs +++ b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs @@ -101,6 +101,7 @@ namespace Microsoft.DotNet.Build.Tasks // -a : architecture --JSON // -d : is for all dependent packages. This can be used multiple times to specify the dependencies of the package. --JSON // --rpm-os : the operating system to target this rpm --Static + // --rpm-digest : rpm digest algorithm --Static // --rpm-changelog : the changelog from FILEPATH contents --ARG // --rpm-summary : it is the RPM summary that shows in the Title --JSON // --description : it is the description for the package --JSON @@ -157,6 +158,7 @@ namespace Microsoft.DotNet.Build.Tasks } parameters.Add("--rpm-os linux"); + parameters.Add("--rpm-digest sha256"); parameters.Add(string.Concat("--rpm-changelog ", EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description))); From a30a69fea1834bc988cedd1a5577e6773e0833c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 19:50:00 +0000 Subject: [PATCH 103/152] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cc0c1769..0c9f7c70d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From 802d734f374f7ae1a95a741dc1f38ba09fda0d27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 19:50:04 +0000 Subject: [PATCH 104/152] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b29928cb2..f07547d28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From 60657853f5cc8e128741ef888ab2ba46b6af0c56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 20:35:57 +0000 Subject: [PATCH 105/152] Update dependencies from https://github.com/dotnet/sdk build 20240109.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24057.5 -> To Version 8.0.200-preview.24059.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 220d02f64..1054fdcb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 8b1d49493edee44364e2117b49df1bf0df4ea46a + 75b02ea86c5e8e386affab9c86e9391c1450a9f1 - + https://github.com/dotnet/sdk - 8b1d49493edee44364e2117b49df1bf0df4ea46a + 75b02ea86c5e8e386affab9c86e9391c1450a9f1 - + https://github.com/dotnet/sdk - 8b1d49493edee44364e2117b49df1bf0df4ea46a + 75b02ea86c5e8e386affab9c86e9391c1450a9f1 - + https://github.com/dotnet/sdk - 8b1d49493edee44364e2117b49df1bf0df4ea46a + 75b02ea86c5e8e386affab9c86e9391c1450a9f1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 409964fb9..1d1aa66d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24057.5 - 8.0.200-preview.24057.5 - 8.0.200-preview.24057.5 + 8.0.200-preview.24059.7 + 8.0.200-preview.24059.7 + 8.0.200-preview.24059.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3168133a01772e53f66b7748511b284b950df57d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 20:42:39 +0000 Subject: [PATCH 106/152] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c9f7c70d..e36277abf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - d6ad546c83ce94b3efb4662513bed71a3e6192ef + 4bed7bdd937666fac4c4f351b9b02adddf8d035b From 5ecf815011b53316e2e0e7b8b2d30df67c16d8b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 20:42:40 +0000 Subject: [PATCH 107/152] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f07547d28..394548a19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - d6ad546c83ce94b3efb4662513bed71a3e6192ef + 4bed7bdd937666fac4c4f351b9b02adddf8d035b From 5539a3e44a908f4d953e7dfa8e6733768150e684 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 21:38:09 +0000 Subject: [PATCH 108/152] Update dependencies from https://github.com/dotnet/sdk build 20240109.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24057.5 -> To Version 8.0.200-preview.24059.9 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1054fdcb0..c8ce09bb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 75b02ea86c5e8e386affab9c86e9391c1450a9f1 + b20592807140cdf3e9f174e1df76ee971ecfe4a8 - + https://github.com/dotnet/sdk - 75b02ea86c5e8e386affab9c86e9391c1450a9f1 + b20592807140cdf3e9f174e1df76ee971ecfe4a8 - + https://github.com/dotnet/sdk - 75b02ea86c5e8e386affab9c86e9391c1450a9f1 + b20592807140cdf3e9f174e1df76ee971ecfe4a8 - + https://github.com/dotnet/sdk - 75b02ea86c5e8e386affab9c86e9391c1450a9f1 + b20592807140cdf3e9f174e1df76ee971ecfe4a8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1d1aa66d3..2246e5741 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24059.7 - 8.0.200-preview.24059.7 - 8.0.200-preview.24059.7 + 8.0.200-preview.24059.9 + 8.0.200-preview.24059.9 + 8.0.200-preview.24059.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8e1ac043f8b4472ab7d95491d72003f3427abb9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:29:19 +0000 Subject: [PATCH 109/152] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23578.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cc0c1769..b9d31b0bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/source-build-reference-packages - 6d5841c05f04d60eccf3358588b8c8968215d9e2 + 727ef4887d561dae6069d6b9c035773013dad041 From 41d248a950569d308a3579d72d8dd1569748b9b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:29:19 +0000 Subject: [PATCH 110/152] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23578.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b29928cb2..5406651dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/source-build-reference-packages - 6d5841c05f04d60eccf3358588b8c8968215d9e2 + 727ef4887d561dae6069d6b9c035773013dad041 From 4c34f145ba150bdd52b89be6d820992b217c3894 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:53:36 +0000 Subject: [PATCH 111/152] Update dependencies from https://github.com/dotnet/arcade build 20240109.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23620.3 -> To Version 7.0.0-beta.24059.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b29928cb2..e8e0535a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c1b89b449..828e9255a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23620.3 + 7.0.0-beta.24059.5 diff --git a/global.json b/global.json index 73ab36895..fd9164f9a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.113", + "dotnet": "7.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" } } From c5024f481376f38a4b480409e908feb600706b77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:53:37 +0000 Subject: [PATCH 112/152] Update dependencies from https://github.com/dotnet/arcade build 20240109.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23620.3 -> To Version 7.0.0-beta.24059.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cc0c1769..7a1d9e0d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 95123c15c..36c28d660 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23620.3 + 7.0.0-beta.24059.5 diff --git a/global.json b/global.json index 73ab36895..fd9164f9a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.113", + "dotnet": "7.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" } } From 351592c3af1ddf81e5452dbf14eaaf89aa09b57f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Wed, 10 Jan 2024 10:45:00 +0100 Subject: [PATCH 113/152] [release/8.0.1xx] Move VMR component list into `Components.md` (#18061) --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- .../templates/steps/vmr-pull-updates.yml | 2 +- eng/vmr-sync.sh | 14 +++++++------- .../content/README.md} | 12 +----------- src/VirtualMonoRepo/Component.template.md | 15 +++++++++++++++ src/VirtualMonoRepo/InitializeVMR.proj | 2 +- .../Tasks/VirtualMonoRepo_Initialize.cs | 4 ++-- 9 files changed, 33 insertions(+), 28 deletions(-) rename src/{VirtualMonoRepo/README.template.md => SourceBuild/content/README.md} (94%) create mode 100644 src/VirtualMonoRepo/Component.template.md diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9394fd31e..b8aebb8b0 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23578.2", + "version": "1.1.0-beta.23621.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd4df2042..c62315654 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade-services - 5263b603d90991a0c200aca8b8892c3d7cfe4751 + 702f946f89ace6197fdca2ac309d32187c4bc1bd - + https://github.com/dotnet/arcade-services - 5263b603d90991a0c200aca8b8892c3d7cfe4751 + 702f946f89ace6197fdca2ac309d32187c4bc1bd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 625530b63..4b17a6b0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.23578.2 + 1.1.0-beta.23621.3 diff --git a/eng/pipelines/templates/steps/vmr-pull-updates.yml b/eng/pipelines/templates/steps/vmr-pull-updates.yml index debe748e6..ceeb1981a 100644 --- a/eng/pipelines/templates/steps/vmr-pull-updates.yml +++ b/eng/pipelines/templates/steps/vmr-pull-updates.yml @@ -44,7 +44,7 @@ steps: --repository "installer:${{ parameters.targetRef }}" --recursive --remote "installer:$(pwd)" - --readme-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/README.template.md + --component-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/Component.template.md --tpn-template $(Agent.BuildDirectory)/installer/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt --debug displayName: Synchronize dotnet/dotnet diff --git a/eng/vmr-sync.sh b/eng/vmr-sync.sh index db0f704e2..92f34d690 100755 --- a/eng/vmr-sync.sh +++ b/eng/vmr-sync.sh @@ -33,10 +33,10 @@ ### --debug ### Optional. Turns on the most verbose logging for the VMR tooling ### -### --readme-template -### Optional. Template for VMRs README.md used for regenerating the file to list the newest versions of +### --component-template +### Optional. Template for VMRs Component.md used for regenerating the file to list the newest versions of ### components. -### Defaults to src/VirtualMonoRepo/README.template.md +### Defaults to src/VirtualMonoRepo/Component.template.md ### ### --recursive ### Optional. Recursively synchronize all the source build dependencies (declared in Version.Details.xml) @@ -103,7 +103,7 @@ repository='' additional_remotes='' recursive=false verbosity=verbose -readme_template="$installer_dir/src/VirtualMonoRepo/README.template.md" +readme_template="$installer_dir/src/VirtualMonoRepo/Component.template.md" tpn_template="$installer_dir/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt" azdev_pat='' @@ -138,8 +138,8 @@ while [[ $# -gt 0 ]]; do additional_remotes="$additional_remotes $2" shift ;; - --readme-template) - readme_template=$2 + --component-template) + component_template=$2 shift ;; --tpn-template) @@ -266,7 +266,7 @@ fi --$verbosity \ $recursive_arg \ $additional_remotes \ - --readme-template "$readme_template" \ + --component-template "$component_template" \ --tpn-template "$tpn_template" \ "$repository" diff --git a/src/VirtualMonoRepo/README.template.md b/src/SourceBuild/content/README.md similarity index 94% rename from src/VirtualMonoRepo/README.template.md rename to src/SourceBuild/content/README.md index f23b92645..c83ad9a6d 100644 --- a/src/VirtualMonoRepo/README.template.md +++ b/src/SourceBuild/content/README.md @@ -152,17 +152,7 @@ To do this, you can start a [dotnet/dotnet](https://github.com/dotnet/dotnet) Co ## List of components -To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here: -- [Strategy for managing external source dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) -- [Source Synchronization Process](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) - -### Detailed list - - - -> Auto-generated list of components will go here - - +The full list of components synchronized into the VMR is [here (Components.md)](./Components.md). The repository also contains a [JSON manifest](https://github.com/dotnet/dotnet/blob/main/src/source-manifest.json) listing all components in a machine-readable format. diff --git a/src/VirtualMonoRepo/Component.template.md b/src/VirtualMonoRepo/Component.template.md new file mode 100644 index 000000000..27b0f7893 --- /dev/null +++ b/src/VirtualMonoRepo/Component.template.md @@ -0,0 +1,15 @@ +# List of components + +To enable full offline source-building of the VMR, we have no other choice than to synchronize all the necessary code into the VMR. This also includes any code referenced via git submodules. More details on why and how this is done can be found here: +- [Strategy for managing external source dependencies](src/arcade/Documentation/UnifiedBuild/VMR-Strategy-For-External-Source.md) +- [Source Synchronization Process](src/arcade/Documentation/UnifiedBuild/VMR-Design-And-Operation.md#source-synchronization-process) + +## Detailed list + + + +> Auto-generated list of components will go here + + + +The repository also contains a [JSON manifest](https://github.com/dotnet/dotnet/blob/main/src/source-manifest.json) listing all components in a machine-readable format. diff --git a/src/VirtualMonoRepo/InitializeVMR.proj b/src/VirtualMonoRepo/InitializeVMR.proj index 09ab72b1c..e3d98fc3c 100644 --- a/src/VirtualMonoRepo/InitializeVMR.proj +++ b/src/VirtualMonoRepo/InitializeVMR.proj @@ -58,7 +58,7 @@ VmrPath="$(VmrDir)" TmpPath="$(TmpDir)" InstallerPath="$(RepoRoot)" - ReadmeTemplatePath="$(MSBuildThisFileDirectory)/README.template.md" + ComponentTemplatePath="$(MSBuildThisFileDirectory)/Component.template.md" TpnTemplatePath="$(MSBuildThisFileDirectory)/THIRD-PARTY-NOTICES.template.txt" SourceMappingsPath="$(MSBuildThisFileDirectory)/source-mappings.json" /> diff --git a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs index 2a8c1d726..5ab294231 100644 --- a/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs +++ b/src/VirtualMonoRepo/Tasks/VirtualMonoRepo_Initialize.cs @@ -42,7 +42,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask public string InstallerPath { get; set; } - public string ReadmeTemplatePath { get; set; } + public string ComponentTemplatePath { get; set; } public string TpnTemplatePath { get; set; } @@ -72,7 +72,7 @@ public class VirtualMonoRepo_Initialize : Build.Utilities.Task, ICancelableTask Recursive, new NativePath(SourceMappingsPath), additionalRemotes, - ReadmeTemplatePath, + ComponentTemplatePath, TpnTemplatePath, generateCodeowners: false, discardPatches: true, From c0112c53cb3f2cd8ea688b892c43906d996cf319 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 10:56:40 +0000 Subject: [PATCH 114/152] Update dependencies from https://github.com/dotnet/sdk build 20240110.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24059.9 -> To Version 8.0.200-preview.24060.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 798f2c391..8ccc8494e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - b20592807140cdf3e9f174e1df76ee971ecfe4a8 + a9db03d634eae446d0aae7fea79c12f955b9f80a - + https://github.com/dotnet/sdk - b20592807140cdf3e9f174e1df76ee971ecfe4a8 + a9db03d634eae446d0aae7fea79c12f955b9f80a - + https://github.com/dotnet/sdk - b20592807140cdf3e9f174e1df76ee971ecfe4a8 + a9db03d634eae446d0aae7fea79c12f955b9f80a - + https://github.com/dotnet/sdk - b20592807140cdf3e9f174e1df76ee971ecfe4a8 + a9db03d634eae446d0aae7fea79c12f955b9f80a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 4751434a3..bf014dd8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24059.9 - 8.0.200-preview.24059.9 - 8.0.200-preview.24059.9 + 8.0.200-preview.24060.5 + 8.0.200-preview.24060.5 + 8.0.200-preview.24060.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b6560b24e81ef896951c7ea4ea8d70e3ea4a208b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 17:01:32 +0000 Subject: [PATCH 115/152] Update dependencies from https://github.com/dotnet/arcade build 20240109.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23564.4 -> To Version 8.0.0-beta.24059.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- eng/common/tools.ps1 | 10 +++++++++- eng/common/tools.sh | 7 ++++++- global.json | 6 +++--- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 798f2c391..79a56b30a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 4751434a3..48cb07a47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23564.4 + 8.0.0-beta.24059.4 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e20ee3a98..e24ca2f46 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -136,7 +136,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index bb0d9f8b0..fa5446c09 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Build Assets diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ef720f9d7..3f74abf7c 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' # Signing validation will optionally work with the buildmanifest file which is downloaded from @@ -266,7 +266,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fdd0cbb91..eb188cfda 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -601,7 +601,15 @@ function InitializeBuildTool() { ExitWithExitCode 1 } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' } + + # Use override if it exists - commonly set by source-build + if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) { + $initializeBuildToolFramework="net8.0" + } else { + $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework + } + + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e8d478943..3392e3a99 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -341,7 +341,12 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="net8.0" + # use override if it exists - commonly set by source-build + if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then + _InitializeBuildToolFramework="net8.0" + else + _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" + fi } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/global.json b/global.json index 88256e459..52a0f29ec 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100", + "dotnet": "8.0.101", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23564.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24059.4" } } From e6ae75cdf5d2f4ab0f16e17372e14d6e13658fcd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:47:11 -0800 Subject: [PATCH 116/152] [release/8.0.1xx] Update dependencies from dotnet/arcade (#18197) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- eng/common/tools.ps1 | 10 +++++++++- eng/common/tools.sh | 7 ++++++- global.json | 6 +++--- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c62315654..bc4f89993 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 4b17a6b0d..483cf5b57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23564.4 + 8.0.0-beta.24059.4 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e20ee3a98..e24ca2f46 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -136,7 +136,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index bb0d9f8b0..fa5446c09 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Build Assets diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ef720f9d7..3f74abf7c 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' # Signing validation will optionally work with the buildmanifest file which is downloaded from @@ -266,7 +266,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fdd0cbb91..eb188cfda 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -601,7 +601,15 @@ function InitializeBuildTool() { ExitWithExitCode 1 } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' } + + # Use override if it exists - commonly set by source-build + if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) { + $initializeBuildToolFramework="net8.0" + } else { + $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework + } + + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e8d478943..3392e3a99 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -341,7 +341,12 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="net8.0" + # use override if it exists - commonly set by source-build + if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then + _InitializeBuildToolFramework="net8.0" + else + _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" + fi } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/global.json b/global.json index 88256e459..52a0f29ec 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100", + "dotnet": "8.0.101", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23564.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24059.4" } } From 6f22dc86d812dd33b093aeca629626587d1d6a1f Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 10 Jan 2024 14:18:47 -0800 Subject: [PATCH 117/152] Merging internal commits for release/8.0.1xx (#18164) --- NuGet.config | 10 ++ eng/Version.Details.xml | 128 +++++++++--------- eng/Versions.props | 61 +++++---- .../repo-projects/Directory.Build.props | 3 + 4 files changed, 112 insertions(+), 90 deletions(-) diff --git a/NuGet.config b/NuGet.config index 31081bc89..e03fc8203 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + + + + @@ -37,11 +43,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc4f89993..4f21ade59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 + 08814442c7c94f8b059c818902b6883a69844860 https://github.com/dotnet/test-templates @@ -124,35 +124,35 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4ede9b8979b9d2b1b1d4383f30a791414f0625b + 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a + ac40bed7a33baf164d3984ca90c2aedba996a7b2 - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/dotnet/fsharp - f41fe153f68dd6b20cf4f91de9ea1e55fc09bb20 + 424e4b7cffb7656efd63f7a905a2498e39011104 - + https://github.com/microsoft/vstest - ae25c3b96fe433c60af70e3991ace49fcbf7e970 + 3259862fadd5e784564e7d920a2d61a75f415a79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://github.com/dotnet/roslyn - f43cd10b737b6343956dee421cff8c50b602c788 + 7b75981cf3bd520b86ec4ed00ec156c8bc48e4eb @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 6c9557fbf18398d6f226bfd16ce3876f1fe2e940 + 7134e53b6b1210a1ce8838b12b8f6071e0a3433b diff --git a/eng/Versions.props b/eng/Versions.props index 483cf5b57..77453e103 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23531.5 + 8.0.1-servicing.23580.6 - 8.0.0-rtm.23531.4 + 8.0.1-servicing.23580.5 @@ -72,50 +72,50 @@ - 8.0.0 - 8.0.0 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 + 8.0.1 + 8.0.1 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 0.2.0 - 8.0.100 - 8.0.100-rtm.23551.6 - 8.0.100-rtm.23551.6 + 8.0.101 + 8.0.101-servicing.23580.21 + 8.0.101-servicing.23580.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23524.11 + 4.8.0-7.23572.1 - 8.0.0-rtm.23531.3 + 8.0.1-servicing.23580.1 - 8.0.0-rtm.23531.3 - 8.0.0-rtm.23531.3 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23580.1 + 8.0.1-servicing.23580.1 + 8.0.1 + 8.0.1 + 8.0.1 + 8.0.1 2.1.0 - 8.0.0-rtm.23551.1 - 8.0.0-rtm.23551.1 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23580.5 + 8.0.1-servicing.23580.5 + 8.0.1 + 8.0.1 @@ -234,11 +234,20 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23523-03 + 17.8.0-release-23578-02 8.0.0-alpha.1.22557.12 + 8.0.100 + 8.0.0-preview.1.23551.7 + 8.0.100-rc.2 + 8.0.0-rc.2.9373 + 34.0.0-rc.2.468 + 16.4.8968-net8-rc2 + 16.4.8968-net8-rc2 + 13.3.8968-net8-rc2 + 16.4.8968-net8-rc2 8.0.100 8.0.0-preview.1.23557.2 8.0.100 @@ -249,7 +258,7 @@ 14.0.8478 17.0.8478 - 8.0.0 + 8.0.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 4b2215bd4..29747eaa0 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -110,6 +110,9 @@ + + + From 5e12b89c162aeca1ee3244be8ede3b3109938d17 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Thu, 11 Jan 2024 01:08:01 +0100 Subject: [PATCH 118/152] .NET Source-Build 8.0.101 January 2024 Updates (#18156) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 9f5666494..bb8227558 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rtm.23551.1.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.101-servicing.23601.1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.101-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index d16655873..c8e9324a4 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100" + "dotnet": "8.0.101" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 44560a527550b104b354aee08838a64a5f140dfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 03:18:27 +0000 Subject: [PATCH 119/152] [release/8.0.2xx] Update dependencies from dotnet/sdk (#18207) [release/8.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.200-beta.24055.2 to 12.8.200-beta.24059.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.24055.2 to 8.0.200-beta.24059.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4321af5be..4ddb10fde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - a9db03d634eae446d0aae7fea79c12f955b9f80a + 10e6ba662e4f8d990af44f423f2f4a492b4b53ba - + https://github.com/dotnet/sdk - a9db03d634eae446d0aae7fea79c12f955b9f80a + 10e6ba662e4f8d990af44f423f2f4a492b4b53ba - + https://github.com/dotnet/sdk - a9db03d634eae446d0aae7fea79c12f955b9f80a + 10e6ba662e4f8d990af44f423f2f4a492b4b53ba - + https://github.com/dotnet/sdk - a9db03d634eae446d0aae7fea79c12f955b9f80a + 10e6ba662e4f8d990af44f423f2f4a492b4b53ba https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - cc741852156e5f048e4e046061fa36477f8b92fb + 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 - + https://github.com/dotnet/fsharp - cc741852156e5f048e4e046061fa36477f8b92fb + 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 diff --git a/eng/Versions.props b/eng/Versions.props index 0c9f96af3..f122b766a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24060.5 - 8.0.200-preview.24060.5 - 8.0.200-preview.24060.5 + 8.0.200-preview.24060.53 + 8.0.200-preview.24060.53 + 8.0.200-preview.24060.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 79cfea2c03ab0bf14dccc668aa3c41a5fef5119f Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 11 Jan 2024 11:42:51 -0600 Subject: [PATCH 120/152] Remove source-build sourcelink snupkg workaround (#18215) --- src/SourceBuild/content/repo-projects/Directory.Build.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 29747eaa0..4b2215bd4 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -110,9 +110,6 @@ - - - From 974ce9ca680cf5fd077b42bab2f518ae600a097e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:03:04 -0800 Subject: [PATCH 121/152] [release/8.0.2xx] Update dependencies from dotnet/sdk (#18221) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ddb10fde..6af5af2a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 10e6ba662e4f8d990af44f423f2f4a492b4b53ba + c36194b2b406e055611adfb1347de1a01e212e22 - + https://github.com/dotnet/sdk - 10e6ba662e4f8d990af44f423f2f4a492b4b53ba + c36194b2b406e055611adfb1347de1a01e212e22 - + https://github.com/dotnet/sdk - 10e6ba662e4f8d990af44f423f2f4a492b4b53ba + c36194b2b406e055611adfb1347de1a01e212e22 - + https://github.com/dotnet/sdk - 10e6ba662e4f8d990af44f423f2f4a492b4b53ba + c36194b2b406e055611adfb1347de1a01e212e22 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 237fb52c683601ed639f1fdeaf38ceef0c768fbc + 28e49407a6e4744819bd471707259b99964e441c diff --git a/eng/Versions.props b/eng/Versions.props index f122b766a..460f5286c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.24060.53 - 8.0.200-preview.24060.53 - 8.0.200-preview.24060.53 + 8.0.200-preview.24061.35 + 8.0.200-preview.24061.35 + 8.0.200-preview.24061.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.24053.1 + 4.9.0-3.24054.13 From 7e1c638384bde85353dc26e9cdd9003e737d1eb4 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 11 Jan 2024 16:07:57 -0800 Subject: [PATCH 122/152] Fix the duplicate properties added in the internal to public merge The internal to public duplicated all the maui and aspire workload properties for some reason. Deleted the duplicates. --- eng/Versions.props | 9 --------- 1 file changed, 9 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 77453e103..1415afd27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -239,15 +239,6 @@ - 8.0.100 - 8.0.0-preview.1.23551.7 - 8.0.100-rc.2 - 8.0.0-rc.2.9373 - 34.0.0-rc.2.468 - 16.4.8968-net8-rc2 - 16.4.8968-net8-rc2 - 13.3.8968-net8-rc2 - 16.4.8968-net8-rc2 8.0.100 8.0.0-preview.1.23557.2 8.0.100 From bd0809a8457f518f352dede53ab0a4eb3c31a92a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 01:03:51 +0000 Subject: [PATCH 123/152] Update dependencies from https://github.com/dotnet/sdk build 20240111.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24061.35 -> To Version 8.0.200-preview.24061.38 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6af5af2a0..6babfcc43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - c36194b2b406e055611adfb1347de1a01e212e22 + 9614445cd20031368f890be63c34a1b9de23f2d9 - + https://github.com/dotnet/sdk - c36194b2b406e055611adfb1347de1a01e212e22 + 9614445cd20031368f890be63c34a1b9de23f2d9 - + https://github.com/dotnet/sdk - c36194b2b406e055611adfb1347de1a01e212e22 + 9614445cd20031368f890be63c34a1b9de23f2d9 - + https://github.com/dotnet/sdk - c36194b2b406e055611adfb1347de1a01e212e22 + 9614445cd20031368f890be63c34a1b9de23f2d9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 460f5286c..672bc0b4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24061.35 - 8.0.200-preview.24061.35 - 8.0.200-preview.24061.35 + 8.0.200-preview.24061.38 + 8.0.200-preview.24061.38 + 8.0.200-preview.24061.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 28e8805b11cf44507a722112314eca90b1f70d6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 02:56:34 +0000 Subject: [PATCH 124/152] Update dependencies from https://github.com/dotnet/sdk build 20240111.39 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24061.38 -> To Version 8.0.200-preview.24061.39 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.200-beta.24059.2 -> To Version 12.8.200-beta.24060.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6babfcc43..b5722d5b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 9614445cd20031368f890be63c34a1b9de23f2d9 + f0a96025b67d2614a7fe244f643665f31bed0532 - + https://github.com/dotnet/sdk - 9614445cd20031368f890be63c34a1b9de23f2d9 + f0a96025b67d2614a7fe244f643665f31bed0532 - + https://github.com/dotnet/sdk - 9614445cd20031368f890be63c34a1b9de23f2d9 + f0a96025b67d2614a7fe244f643665f31bed0532 - + https://github.com/dotnet/sdk - 9614445cd20031368f890be63c34a1b9de23f2d9 + f0a96025b67d2614a7fe244f643665f31bed0532 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 + 2e4dde8f8fd64aad0026cd03060698c30bf30a8d - + https://github.com/dotnet/fsharp - 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 + 2e4dde8f8fd64aad0026cd03060698c30bf30a8d diff --git a/eng/Versions.props b/eng/Versions.props index 672bc0b4a..c26eb152e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24061.38 - 8.0.200-preview.24061.38 - 8.0.200-preview.24061.38 + 8.0.200-preview.24061.39 + 8.0.200-preview.24061.39 + 8.0.200-preview.24061.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0681ce79bc9e8187212a3f6e374ea92e4ef94810 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 05:42:38 +0000 Subject: [PATCH 125/152] Update dependencies from https://github.com/dotnet/sdk build 20240111.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24061.38 -> To Version 8.0.200-preview.24061.45 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.200-beta.24059.2 -> To Version 12.8.200-beta.24060.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5722d5b9..e46406508 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - f0a96025b67d2614a7fe244f643665f31bed0532 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - f0a96025b67d2614a7fe244f643665f31bed0532 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - f0a96025b67d2614a7fe244f643665f31bed0532 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - f0a96025b67d2614a7fe244f643665f31bed0532 + 41185cf4240faf705904213e1a0468d8164c99a8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c26eb152e..3a2155e5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24061.39 - 8.0.200-preview.24061.39 - 8.0.200-preview.24061.39 + 8.0.200-preview.24061.45 + 8.0.200-preview.24061.45 + 8.0.200-preview.24061.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 002ea121406e72a848c105cfc12337a21355fbff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 13:55:04 +0000 Subject: [PATCH 126/152] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23565.1 -> To Version 8.0.0-alpha.1.24061.1 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index e03fc8203..9f19ee9e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,28 @@ + + - + + + + + + @@ -43,14 +50,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f21ade59..f4eb83c12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 95f83e27806330fec09edd96e06bba3acabe3f35 + 453a37ef7ae6c335cd49b3b9ab7713c87faeb265 From 7b6ffd0a22704617fbd1173bca1b1c8be06741db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 18:44:32 +0000 Subject: [PATCH 127/152] Update dependencies from https://github.com/dotnet/sdk build 20240112.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24061.45 -> To Version 8.0.200-preview.24062.10 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 750bc6edf..0a4e6d725 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + 67c548395fafd42a6ac4e3a7969242f72de5f8e2 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + 67c548395fafd42a6ac4e3a7969242f72de5f8e2 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + 67c548395fafd42a6ac4e3a7969242f72de5f8e2 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + 67c548395fafd42a6ac4e3a7969242f72de5f8e2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5bcd4880e..54146585e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24061.45 - 8.0.200-preview.24061.45 - 8.0.200-preview.24061.45 + 8.0.200-preview.24062.10 + 8.0.200-preview.24062.10 + 8.0.200-preview.24062.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0bf95ed6be8aaecc3d22d63e9b3db5efa00e2b2b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 19:01:37 +0000 Subject: [PATCH 128/152] [release/8.0.1xx] Fix VMR build tagging (#18233) --- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 2 +- .../content/eng/pipelines/templates/stages/vmr-scan.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index 1102f74ac..d7ed9a81a 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -34,7 +34,7 @@ jobs: echo "Dotnet-dotnet build: https://dev.azure.com/dnceng/internal/_build/results?buildId=$dotnet_dotnet_build&view=results" - installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer-,,g") + installer_sha=$(az pipelines build tag list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --build-id $dotnet_dotnet_build --output tsv | sed "s,installer ,,g") installer_build=$(az pipelines runs list --organization '$(AZDO_ORG)' --project '$(AZDO_PROJECT)' --pipeline-ids '$(INSTALLER_OFFICIAL_CI_PIPELINE_ID)' --query "[?sourceVersion == '$installer_sha'].id" --output tsv) if [[ -z "$installer_build" ]]; then echo "Could not find a build of installer for commit '$installer_sha'" diff --git a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml index 99a34658f..6024ce182 100644 --- a/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml +++ b/src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml @@ -28,7 +28,7 @@ stages: - script: | set -e sha=`./.dotnet/dotnet darc vmr get-version --vmr "$(Build.SourcesDirectory)" installer` - echo "##vso[build.addbuildtag]installer-$sha" + echo "##vso[build.addbuildtag]$sha" displayName: Tag the build workingDirectory: $(Build.SourcesDirectory)/src/installer From 53cb7c0a2287b6ba320806f5b28445cf15dada0b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 12 Jan 2024 11:50:03 -0800 Subject: [PATCH 129/152] Stabilize branding Update implicit versions --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5bcd4880e..7c413d4f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release preview @@ -26,8 +26,8 @@ 30 32 17 - 25 - 14 + $([MSBuild]::Add($(VersionFeature), 27)) + $([MSBuild]::Add($(VersionFeature), 16)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 89a709f0c07a1011df0b84b5269d662d0fb8567b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 12 Jan 2024 13:45:15 -0800 Subject: [PATCH 130/152] disable test that targets 6.0 --- test/SdkTests/TestConfig.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index ed432ea13..245dd40e7 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -257,5 +257,9 @@ Skip="true" Issue="" Reason="Requires props file not in installer repo"/> + From 8a3bb8090a5546364918e0e2fd70b6efc9e390c1 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 12 Jan 2024 14:27:20 -0800 Subject: [PATCH 131/152] Increase version (#18240) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5bcd4880e..662417547 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 8 0 - 2 + 3 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) From 0fe2917a54667f106d1971e424c0f2f0aaf6855f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 23:15:46 +0000 Subject: [PATCH 132/152] Update dependencies from https://github.com/dotnet/arcade-services build 20240112.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.23621.3 -> To Version 1.1.0-beta.24062.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b8aebb8b0..3c713eb84 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23621.3", + "version": "1.1.0-beta.24062.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 750bc6edf..9e50c1866 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade-services - 702f946f89ace6197fdca2ac309d32187c4bc1bd + 3fe5ccd30a3bc843ca0a3e971bfe6ed70eda0825 - + https://github.com/dotnet/arcade-services - 702f946f89ace6197fdca2ac309d32187c4bc1bd + 3fe5ccd30a3bc843ca0a3e971bfe6ed70eda0825 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 662417547..1172f1ebc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.23621.3 + 1.1.0-beta.24062.2 From 69302ed428b57075ddb546944da98a231f53ffe6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 23:17:03 +0000 Subject: [PATCH 133/152] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23502.1 -> To Version 8.0.0-alpha.1.24059.4 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 750bc6edf..52e0261c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - ed17956dbc31097b7ba6a66be086f4a70a97d84f + 7134e53b6b1210a1ce8838b12b8f6071e0a3433b From b3743bf35490c506153434d0c16bf537cc044a06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 23:17:13 +0000 Subject: [PATCH 134/152] Update dependencies from https://github.com/dotnet/arcade build 20240110.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24059.4 -> To Version 8.0.0-beta.24060.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 750bc6edf..bdae94ac1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + 888985fb9a9ae4cb30bca75f98af9126c839e660 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 662417547..f94cdd5e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24059.4 + 8.0.0-beta.24060.4 diff --git a/global.json b/global.json index 52a0f29ec..57a162e41 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24059.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24060.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24060.4" } } From eff7d312197f6d4cb5cb318f5ab789d6b3218d1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 23:17:33 +0000 Subject: [PATCH 135/152] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23471.1 -> To Version 8.0.0-alpha.1.24061.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 750bc6edf..b1339f75a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 7b55da982fc6e71c1776c4de89111aee0eecb45a + 453a37ef7ae6c335cd49b3b9ab7713c87faeb265 From d3bfe4a31a8b1d5422e928b643e21a109fc1da04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 13:58:52 +0000 Subject: [PATCH 136/152] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23565.1 -> To Version 8.0.0-alpha.1.24061.1 --- NuGet.config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9f19ee9e9..6ee261624 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,9 +17,6 @@ - - - @@ -52,9 +49,6 @@ - - - From dce6942baedceb45ba62a6479a6eb5ce90c23f81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 14:09:21 +0000 Subject: [PATCH 137/152] Update dependencies from https://github.com/dotnet/arcade build 20240110.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24059.4 -> To Version 8.0.0-beta.24060.4 From 880b84c6fb4cb2da7666bfb17dea6d5270b72414 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 14:09:45 +0000 Subject: [PATCH 138/152] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23471.1 -> To Version 8.0.0-alpha.1.24061.1 From 6d6a603605321c2099fe0f45d9a760a1138bd8fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 14:13:17 +0000 Subject: [PATCH 139/152] Update dependencies from https://github.com/dotnet/arcade-services build 20240112.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.23621.3 -> To Version 1.1.0-beta.24062.2 From 58f7541d77f37e5e209663c3e570776cb4ffd3db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 14:13:42 +0000 Subject: [PATCH 140/152] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23502.1 -> To Version 8.0.0-alpha.1.24059.4 From 776d577b21742a1c98bb730dd2d0b9e45a8b99f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 13:50:46 +0000 Subject: [PATCH 141/152] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23565.1 -> To Version 8.0.0-alpha.1.24061.1 --- NuGet.config | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ee261624..a52c961da 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,14 +19,8 @@ - - - - - - @@ -50,14 +44,8 @@ - - - - - - From 933ee04a8083de282741f8933cd9fc97a8971aec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 14:00:48 +0000 Subject: [PATCH 142/152] Update dependencies from https://github.com/dotnet/arcade build 20240110.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24059.4 -> To Version 8.0.0-beta.24060.4 From 121ce389d6b9e774d091bbc0bb88d381a06f8699 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 14:01:09 +0000 Subject: [PATCH 143/152] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23471.1 -> To Version 8.0.0-alpha.1.24061.1 From 6dadf0a8b53ac9421c55823da811a51e4523555b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 14:04:41 +0000 Subject: [PATCH 144/152] Update dependencies from https://github.com/dotnet/arcade-services build 20240112.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.23621.3 -> To Version 1.1.0-beta.24062.2 From 4768421106cb874a52bd1184cab87b3583578229 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 14:05:08 +0000 Subject: [PATCH 145/152] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23502.1 -> To Version 8.0.0-alpha.1.24059.4 From afd746c9ba8de304cb9d8db3dec0e17fa51cf359 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Jan 2024 13:51:31 +0000 Subject: [PATCH 146/152] Update dependencies from https://github.com/dotnet/arcade-services build 20240115.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24062.2 -> To Version 1.1.0-beta.24065.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 3c713eb84..1e231bdb2 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24062.2", + "version": "1.1.0-beta.24065.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9ec5be5b..65514e542 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade-services - 3fe5ccd30a3bc843ca0a3e971bfe6ed70eda0825 + 7fab0443ef68ca1e326678bfb6123a5e0fc4ac81 - + https://github.com/dotnet/arcade-services - 3fe5ccd30a3bc843ca0a3e971bfe6ed70eda0825 + 7fab0443ef68ca1e326678bfb6123a5e0fc4ac81 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 942e871c4..3dbf7ca5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24062.2 + 1.1.0-beta.24065.1 From a8524c037847cb3ccf9770ab2c48a16d806a615c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Jan 2024 15:16:43 +0000 Subject: [PATCH 147/152] Update dependencies from https://github.com/dotnet/source-build-externals build 20240115.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24059.4 -> To Version 8.0.0-alpha.1.24065.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4eb83c12..81e8a49c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 7134e53b6b1210a1ce8838b12b8f6071e0a3433b + 83274d94c7e2ff21081b0d75ecbec2da2241f831 From 9213169c26d570e1a209f7e46b47f9d04df60350 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Jan 2024 14:13:49 +0000 Subject: [PATCH 148/152] Update dependencies from https://github.com/dotnet/arcade-services build 20240116.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24065.1 -> To Version 1.1.0-beta.24066.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1e231bdb2..fe98f4232 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24065.1", + "version": "1.1.0-beta.24066.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65514e542..957ad6782 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade-services - 7fab0443ef68ca1e326678bfb6123a5e0fc4ac81 + 13127001582f67623ee96d79e13cf11d1df31017 - + https://github.com/dotnet/arcade-services - 7fab0443ef68ca1e326678bfb6123a5e0fc4ac81 + 13127001582f67623ee96d79e13cf11d1df31017 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3dbf7ca5b..e8417193c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24065.1 + 1.1.0-beta.24066.1 From cbd3e8573da4cc8c18e948e8c30a7946885a6c97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Jan 2024 14:14:13 +0000 Subject: [PATCH 149/152] Update dependencies from https://github.com/dotnet/source-build-externals build 20240115.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24059.4 -> To Version 8.0.0-alpha.1.24065.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65514e542..687db648c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 7134e53b6b1210a1ce8838b12b8f6071e0a3433b + 83274d94c7e2ff21081b0d75ecbec2da2241f831 From ae16586f7637bef18e6c84d8a71a3cab46e60230 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 16 Jan 2024 21:58:19 -0800 Subject: [PATCH 150/152] Revert the changes in the eng folder --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06df7ea46..957ad6782 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + 41185cf4240faf705904213e1a0468d8164c99a8 https://github.com/dotnet/test-templates @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 83274d94c7e2ff21081b0d75ecbec2da2241f831 + 7134e53b6b1210a1ce8838b12b8f6071e0a3433b diff --git a/eng/Versions.props b/eng/Versions.props index 49cfadf93..e8417193c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release preview @@ -26,8 +26,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 27)) - $([MSBuild]::Add($(VersionFeature), 16)) + 25 + 14 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -85,9 +85,9 @@ - 8.0.200-preview.24062.10 - 8.0.200-preview.24062.10 - 8.0.200-preview.24062.10 + 8.0.200-preview.24061.45 + 8.0.200-preview.24061.45 + 8.0.200-preview.24061.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From de4f1385b7cb12136bfca75fc20d19f6c4996a04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Jan 2024 14:09:55 +0000 Subject: [PATCH 151/152] Update dependencies from https://github.com/dotnet/arcade-services build 20240117.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24066.1 -> To Version 1.1.0-beta.24067.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index fe98f4232..58251c5f5 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24066.1", + "version": "1.1.0-beta.24067.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d78efa337..a8070b817 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade-services - 13127001582f67623ee96d79e13cf11d1df31017 + 0e7066949ad0fd9503cc4f3d138a4a9c68aa57bc - + https://github.com/dotnet/arcade-services - 13127001582f67623ee96d79e13cf11d1df31017 + 0e7066949ad0fd9503cc4f3d138a4a9c68aa57bc https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e8417193c..1fb88a39a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24066.1 + 1.1.0-beta.24067.2 From edd193abd25ba278e43da09cd854b2c96234bb9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Jan 2024 23:26:38 +0000 Subject: [PATCH 152/152] Update dependencies from https://github.com/dotnet/sdk build 20240117.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24061.45 -> To Version 8.0.300-preview.24067.17 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.200-beta.24060.4 -> To Version 12.8.300-beta.24066.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba606dcba..94ab32f7a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 957ad6782..38aea4e5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + a585c60cad72a31ff26125065c0cd861e861ec48 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + a585c60cad72a31ff26125065c0cd861e861ec48 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + a585c60cad72a31ff26125065c0cd861e861ec48 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + a585c60cad72a31ff26125065c0cd861e861ec48 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 2e4dde8f8fd64aad0026cd03060698c30bf30a8d + 8d7795d4a68a21010577f11084ba937e51daf9a3 - + https://github.com/dotnet/fsharp - 2e4dde8f8fd64aad0026cd03060698c30bf30a8d + 8d7795d4a68a21010577f11084ba937e51daf9a3 @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 28e49407a6e4744819bd471707259b99964e441c + fda44c407b951fe551c2a9935faf500bc3aea18b - + https://github.com/dotnet/msbuild - bb6fadf23225f5097f4e05ed507d93683a21ae56 + f1448f15870e0d229cb9ae6efe336b94cefe3ab3 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index e8417193c..3ef7e211f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.24061.45 - 8.0.200-preview.24061.45 - 8.0.200-preview.24061.45 + 8.0.300-preview.24067.17 + 8.0.300-preview.24067.17 + 8.0.300-preview.24067.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.24054.13 + 4.10.0-1.24067.1