From c912a505d9a5b004524326d90bd7e9e4b68a332e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Dec 2023 11:19:35 +0000 Subject: [PATCH 01/29] Update dependencies from https://github.com/dotnet/test-templates build 20231212.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.23607.1 -> To Version 1.1.0-rc.23612.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 5a7311b86..aa47486cd 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 - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d diff --git a/eng/Versions.props b/eng/Versions.props index b3032cb5f..11d4ad1bf 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.23607.1 - 1.1.0-rc.23607.1 - 1.1.0-rc.23607.1 + 1.1.0-rc.23612.1 + 1.1.0-rc.23612.1 + 1.1.0-rc.23612.1 From e8105db7a03df8408c1d961af0679170d1760637 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 21:18:56 +0000 Subject: [PATCH 02/29] [release/8.0.2xx] Update dependencies from dotnet/sdk (#17942) [release/8.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.200-beta.23608.3 to 12.8.200-beta.23611.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23608.3 to 8.0.200-beta.23611.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.9.0-preview-23606-01 to 17.9.0-preview-23610-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a7311b86..ecb755232 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 - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b - + https://github.com/dotnet/sdk - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b - + https://github.com/dotnet/sdk - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b - + https://github.com/dotnet/sdk - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - e479cbe697a26f864e60ea49f02c278a8331f7bc + bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/dotnet/fsharp - e479cbe697a26f864e60ea49f02c278a8331f7bc + bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/microsoft/vstest - 4572ac35d2bb1c3c8de81eab54cc99ec76f987c2 + 50c0f7889fdd8d13381d325bdbb6d253e33da1ff diff --git a/eng/Versions.props b/eng/Versions.props index b3032cb5f..d274ff29b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23610.2 - 8.0.200-preview.23610.2 - 8.0.200-preview.23610.2 + 8.0.200-preview.23612.6 + 8.0.200-preview.23612.6 + 8.0.200-preview.23612.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23606-01 + 17.9.0-preview-23610-02 8.0.0-alpha.1.22557.12 From 680d9fd886f9165c8c278353c1a8f51bae140b43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Dec 2023 22:14:32 +0000 Subject: [PATCH 03/29] Update dependencies from https://github.com/dotnet/sdk build 20231212.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.6 -> To Version 8.0.200-preview.23612.9 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23608.9 -> To Version 4.9.0-3.23611.13 (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 ecb755232..eea1d97d1 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 - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 - + https://github.com/dotnet/sdk - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 - + https://github.com/dotnet/sdk - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 - + https://github.com/dotnet/sdk - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 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 - 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f + 544f1e9300e500c25a0759134c27e9bc9b9eec6d diff --git a/eng/Versions.props b/eng/Versions.props index d274ff29b..94d2dfb73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23612.6 - 8.0.200-preview.23612.6 - 8.0.200-preview.23612.6 + 8.0.200-preview.23612.9 + 8.0.200-preview.23612.9 + 8.0.200-preview.23612.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23608.9 + 4.9.0-3.23611.13 From 3232b64c14cbc13b1666d0b8ddb71489ac67f85d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Dec 2023 23:19:24 +0000 Subject: [PATCH 04/29] Update dependencies from https://github.com/dotnet/sdk build 20231212.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.6 -> To Version 8.0.200-preview.23612.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23608.9 -> To Version 4.9.0-3.23611.13 (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 eea1d97d1..117189307 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 - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a - + https://github.com/dotnet/sdk - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a - + https://github.com/dotnet/sdk - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a - + https://github.com/dotnet/sdk - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 94d2dfb73..f632de489 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23612.9 - 8.0.200-preview.23612.9 - 8.0.200-preview.23612.9 + 8.0.200-preview.23612.11 + 8.0.200-preview.23612.11 + 8.0.200-preview.23612.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a76328b8fcb5a48cfeae67790b374db5140d0327 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 00:13:26 +0000 Subject: [PATCH 05/29] Update dependencies from https://github.com/dotnet/sdk build 20231212.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.6 -> To Version 8.0.200-preview.23612.12 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23608.9 -> To Version 4.9.0-3.23611.13 (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 117189307..048dc57a2 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 - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 - + https://github.com/dotnet/sdk - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 - + https://github.com/dotnet/sdk - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 - + https://github.com/dotnet/sdk - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f632de489..cf53c8370 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23612.11 - 8.0.200-preview.23612.11 - 8.0.200-preview.23612.11 + 8.0.200-preview.23612.12 + 8.0.200-preview.23612.12 + 8.0.200-preview.23612.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From daa880ab595bd66269944e69da54fc992908164e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 18:14:26 +0000 Subject: [PATCH 06/29] [release/8.0.1xx] Remove global CheckEolTargetFramework=false (#17964) Co-authored-by: Ella Hathaway --- 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 165f87523..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 cff8d4f08d7735dd86215513d0009da81a18bcf3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 21:15:36 +0000 Subject: [PATCH 07/29] Update dependencies from https://github.com/dotnet/sdk build 20231213.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.12 -> To Version 8.0.200-preview.23613.4 --- 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 5774a15b6..22a94aa46 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 - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 - + https://github.com/dotnet/sdk - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 - + https://github.com/dotnet/sdk - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 - + https://github.com/dotnet/sdk - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 13f8e564f..5c44d3754 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23612.12 - 8.0.200-preview.23612.12 - 8.0.200-preview.23612.12 + 8.0.200-preview.23613.4 + 8.0.200-preview.23613.4 + 8.0.200-preview.23613.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c9dc3fb1806f4d0f422a3afdbc95ef9c3b592158 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 02:57:43 +0000 Subject: [PATCH 08/29] Update dependencies from https://github.com/dotnet/sdk build 20231213.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.4 -> To Version 8.0.200-preview.23613.8 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 17.9.0-preview-23610-02 -> To Version 17.9.0-preview-23612-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22a94aa46..2c705685a 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 - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b - + https://github.com/dotnet/sdk - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b - + https://github.com/dotnet/sdk - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b - + https://github.com/dotnet/sdk - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/microsoft/vstest - 50c0f7889fdd8d13381d325bdbb6d253e33da1ff + dc8fe3865011cef3a0891f5f55c1fc5c7f401066 @@ -155,13 +155,13 @@ 544f1e9300e500c25a0759134c27e9bc9b9eec6d - + https://github.com/dotnet/msbuild - 2f3d37672a69142a13a62856b09034a915bedc70 + eea84ad7cf250b9dbf80f0981c594155d55de0b7 - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe diff --git a/eng/Versions.props b/eng/Versions.props index 5c44d3754..56011947b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23613.4 - 8.0.200-preview.23613.4 - 8.0.200-preview.23613.4 + 8.0.200-preview.23613.8 + 8.0.200-preview.23613.8 + 8.0.200-preview.23613.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-preview.1.50 + 6.9.0-preview.1.52 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23610-02 + 17.9.0-preview-23612-01 8.0.0-alpha.1.22557.12 From 04c50a4008f5e9ef9214c5a6f45881be20cf2bd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 06:32:57 +0000 Subject: [PATCH 09/29] Update dependencies from https://github.com/dotnet/sdk build 20231213.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.8 -> To Version 8.0.200-preview.23613.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23611.3 -> To Version 12.8.200-beta.23613.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c705685a..d662d5b45 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 - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 - + https://github.com/dotnet/sdk - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 - + https://github.com/dotnet/sdk - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 - + https://github.com/dotnet/sdk - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 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 - bb832169d6b799a62962452212010e66c3fecacf + e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 - + https://github.com/dotnet/fsharp - bb832169d6b799a62962452212010e66c3fecacf + e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 544f1e9300e500c25a0759134c27e9bc9b9eec6d + 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 diff --git a/eng/Versions.props b/eng/Versions.props index 56011947b..243ee7a6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23613.8 - 8.0.200-preview.23613.8 - 8.0.200-preview.23613.8 + 8.0.200-preview.23613.11 + 8.0.200-preview.23613.11 + 8.0.200-preview.23613.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23611.13 + 4.9.0-3.23612.11 From f880dfdb0c4514cbb6f1312b5a69f8fbc2527986 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Dec 2023 11:14:34 -0600 Subject: [PATCH 10/29] Fixes SDK diff after release of Aspire (#17893) --- .../assets/SdkFileDiffExclusions.txt | 1 - .../assets/baselines/MsftToSbSdkFiles.diff | 8 -------- 2 files changed, 9 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt index 3000c80e8..6cf694f75 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt @@ -45,7 +45,6 @@ sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*? # missing workload manifests - https://github.com/dotnet/source-build/issues/3242 msft,./sdk-manifests/x.y.z/microsoft.net.sdk.android/* -msft,./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.ios/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.macos/* diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff index 434883537..4c2d7775b 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff @@ -44,14 +44,6 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ -@@ ------------ @@ - ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll - ./sdk-manifests/ - ./sdk-manifests/x.y.z/ --./sdk-manifests/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/ - ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/WorkloadManifest.json @@ ------------ @@ ./sdk/x.y.z/.version ./sdk/x.y.z/AppHostTemplate/ From 461c7766428ba2782725d89d95d3f4f414ff8c92 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Dec 2023 11:14:56 -0600 Subject: [PATCH 11/29] Do not reuse existing installation of .NET CLI in SB prep script (#17892) --- src/SourceBuild/content/prep.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh index 472c348ae..a842566b2 100755 --- a/src/SourceBuild/content/prep.sh +++ b/src/SourceBuild/content/prep.sh @@ -156,6 +156,7 @@ function BootstrapArtifacts { # Check for the version of dotnet to install if [ "$installDotnet" == true ]; then echo " Installing dotnet..." + use_installed_dotnet_cli=false (source ./eng/common/tools.sh && InitializeDotNetCli true) fi From 598774040361d6a942fc31f9dd9cdddbb43ec25e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 18:25:01 +0000 Subject: [PATCH 12/29] Update dependencies from https://github.com/dotnet/sdk build 20231214.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.11 -> To Version 8.0.200-preview.23614.3 --- 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 d662d5b45..53b98a1a3 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 - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 - + https://github.com/dotnet/sdk - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 - + https://github.com/dotnet/sdk - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 - + https://github.com/dotnet/sdk - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 243ee7a6c..bec0a08ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23613.11 - 8.0.200-preview.23613.11 - 8.0.200-preview.23613.11 + 8.0.200-preview.23614.3 + 8.0.200-preview.23614.3 + 8.0.200-preview.23614.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d954a396ff696fad9e24be022eada7094d1cac0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 19:30:47 +0000 Subject: [PATCH 13/29] Update dependencies from https://github.com/dotnet/sdk build 20231214.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.11 -> To Version 8.0.200-preview.23614.5 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.9.0-preview-23613-03 -> To Version 17.9.0-preview-23613-14 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53b98a1a3..60add4c85 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 - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e - + https://github.com/dotnet/sdk - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e - + https://github.com/dotnet/sdk - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e - + https://github.com/dotnet/sdk - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e https://github.com/dotnet/test-templates @@ -155,13 +155,13 @@ 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 - + https://github.com/dotnet/msbuild - eea84ad7cf250b9dbf80f0981c594155d55de0b7 + fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c diff --git a/eng/Versions.props b/eng/Versions.props index bec0a08ee..b94a88920 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23614.3 - 8.0.200-preview.23614.3 - 8.0.200-preview.23614.3 + 8.0.200-preview.23614.5 + 8.0.200-preview.23614.5 + 8.0.200-preview.23614.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-preview.1.52 + 6.9.0-preview.1.54 From d7393e0fb89faed666dc34a3c95354a61ee1486e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 07:39:32 +0000 Subject: [PATCH 14/29] Update dependencies from https://github.com/dotnet/sdk build 20231214.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.5 -> To Version 8.0.200-preview.23614.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23612.11 -> To Version 4.9.0-3.23613.8 (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 60add4c85..d0bff5a06 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 - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 - + https://github.com/dotnet/sdk - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 - + https://github.com/dotnet/sdk - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 - + https://github.com/dotnet/sdk - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 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 - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 01173c5ae735625ac079e08414359ff0e8ea19b6 diff --git a/eng/Versions.props b/eng/Versions.props index b94a88920..b38c17dec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23614.5 - 8.0.200-preview.23614.5 - 8.0.200-preview.23614.5 + 8.0.200-preview.23614.11 + 8.0.200-preview.23614.11 + 8.0.200-preview.23614.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23612.11 + 4.9.0-3.23613.8 From 726df15ef2ff9624d3b7312d013cab44132797b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 08:32:45 +0000 Subject: [PATCH 15/29] Update dependencies from https://github.com/dotnet/sdk build 20231214.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.5 -> To Version 8.0.200-preview.23614.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23613.1 -> To Version 12.8.200-beta.23613.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 d0bff5a06..79e5e1d3c 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 - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f - + https://github.com/dotnet/sdk - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f - + https://github.com/dotnet/sdk - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f - + https://github.com/dotnet/sdk - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f 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 - e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 + 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 - + https://github.com/dotnet/fsharp - e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 + 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 diff --git a/eng/Versions.props b/eng/Versions.props index b38c17dec..561f0b515 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23614.11 - 8.0.200-preview.23614.11 - 8.0.200-preview.23614.11 + 8.0.200-preview.23614.13 + 8.0.200-preview.23614.13 + 8.0.200-preview.23614.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 92881248bf570dc25974e59adfdd0c506a9372ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 16:25:43 +0000 Subject: [PATCH 16/29] Update dependencies from https://github.com/dotnet/symreader build 20231208.1 Microsoft.SourceBuild.Intermediate.symreader From Version 2.1.0-beta.23253.1 -> To Version 2.1.0-beta.23608.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 93aa3ec04..56f6324b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -195,9 +195,9 @@ bc555088c6b4862ad0b93fbc245ef0628e661256 - + https://github.com/dotnet/symreader - 2c8079e2e8e78c0cd11ac75a32014756136ecdb9 + aa31e333b952f53910dc6bd08d80596eaaf89360 From 0b5c084524a48200d9515067143c95d3d16d4012 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 16:45:23 +0000 Subject: [PATCH 17/29] [main] Update dependencies from dotnet/sdk (#17970) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Thalman --- eng/Version.Details.xml | 116 +++++++++--------- eng/Versions.props | 48 ++++---- .../0002-Update-MSBuild-ref-dependency.patch | 23 ---- 3 files changed, 82 insertions(+), 105 deletions(-) delete mode 100644 src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93aa3ec04..4087eb5ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,42 +5,42 @@ 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://github.com/dotnet/windowsdesktop - 696e213652005495ed7a103839772d1c249df7db + 24d29943d978beb39cabb14d63a9954d61826e97 - + https://github.com/dotnet/windowsdesktop - 696e213652005495ed7a103839772d1c249df7db + 24d29943d978beb39cabb14d63a9954d61826e97 - + https://github.com/dotnet/windowsdesktop - 696e213652005495ed7a103839772d1c249df7db + 24d29943d978beb39cabb14d63a9954d61826e97 - + https://github.com/dotnet/windowsdesktop - 696e213652005495ed7a103839772d1c249df7db + 24d29943d978beb39cabb14d63a9954d61826e97 - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 5088789413c6364dccd0f36b3eddc89c4606c42f - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 5088789413c6364dccd0f36b3eddc89c4606c42f - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 5088789413c6364dccd0f36b3eddc89c4606c42f - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 5088789413c6364dccd0f36b3eddc89c4606c42f - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 5088789413c6364dccd0f36b3eddc89c4606c42f - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 5088789413c6364dccd0f36b3eddc89c4606c42f - + https://github.com/dotnet/aspnetcore - 15194b0a34157cdaf7c0e6e0813929aff2356986 + 5088789413c6364dccd0f36b3eddc89c4606c42f - + https://github.com/dotnet/sdk - bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 + af41d3d39a69c7a17b6a3ae22259056100f23f6d - + https://github.com/dotnet/sdk - bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 + af41d3d39a69c7a17b6a3ae22259056100f23f6d - + https://github.com/dotnet/sdk - bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 + af41d3d39a69c7a17b6a3ae22259056100f23f6d - + https://github.com/dotnet/sdk - bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 + af41d3d39a69c7a17b6a3ae22259056100f23f6d https://github.com/dotnet/test-templates @@ -132,46 +132,46 @@ https://github.com/dotnet/wpf 8e3e1a550c591a7732df79f075716b88af692b43 - + https://github.com/dotnet/fsharp - bb832169d6b799a62962452212010e66c3fecacf + 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 - + https://github.com/dotnet/fsharp - bb832169d6b799a62962452212010e66c3fecacf + 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 - + https://github.com/microsoft/vstest - 50c0f7889fdd8d13381d325bdbb6d253e33da1ff + dc8fe3865011cef3a0891f5f55c1fc5c7f401066 - + https://github.com/dotnet/runtime - ab1a8224cdf115b65e0db5dc88d11f205068f444 + 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 - + https://github.com/dotnet/roslyn - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/msbuild - 2f3d37672a69142a13a62856b09034a915bedc70 + f97064d3b83485628dec0769659e786b55f6835a - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - f0e25ac1b9cf1df8bbe6e873993ad74ce3ca8d26 + 487a0a43dbe6e83f07b200b7523447222bb2137b diff --git a/eng/Versions.props b/eng/Versions.props index b0844a215..4ae3963b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,50 +73,50 @@ - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 - 9.0.0-alpha.1.23612.5 + 9.0.0-alpha.1.23614.6 + 9.0.0-alpha.1.23614.6 + 9.0.0-alpha.1.23614.6 + 9.0.0-alpha.1.23614.6 + 9.0.0-alpha.1.23614.6 + 9.0.0-alpha.1.23614.6 + 9.0.0-alpha.1.23614.6 0.2.0 - 9.0.100-alpha.1.23613.6 - 9.0.100-alpha.1.23613.6 - 9.0.100-alpha.1.23613.6 + 9.0.100-alpha.1.23615.3 + 9.0.100-alpha.1.23615.3 + 9.0.100-alpha.1.23615.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23612.11 + 4.9.0-3.23614.9 - 9.0.0-alpha.1.23612.13 + 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23612.13 - 9.0.0-alpha.1.23612.13 - 9.0.0-alpha.1.23612.13 - 9.0.0-alpha.1.23612.13 - 9.0.0-alpha.1.23612.13 + 9.0.0-alpha.1.23614.10 + 9.0.0-alpha.1.23614.10 + 9.0.0-alpha.1.23614.10 + 9.0.0-alpha.1.23614.10 + 9.0.0-alpha.1.23614.10 8.0.0-rc.1.23414.4 2.1.0 - 9.0.0-alpha.1.23612.1 - 9.0.0-alpha.1.23612.1 - 9.0.0-alpha.1.23612.1 - 9.0.0-alpha.1.23612.1 + 9.0.0-alpha.1.23613.1 + 9.0.0-alpha.1.23613.1 + 9.0.0-alpha.1.23613.1 + 9.0.0-alpha.1.23613.1 @@ -128,7 +128,7 @@ - 6.9.0-preview.1.52 + 6.9.0-preview.1.54 @@ -246,7 +246,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23610-02 + 17.9.0-preview-23612-01 8.0.0-alpha.1.22557.12 9.0.0-preview.23613.1 @@ -262,7 +262,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 9.0.0-alpha.1.23611.2 + 9.0.0-alpha.1.23613.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch b/src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch deleted file mode 100644 index 631903885..000000000 --- a/src/SourceBuild/patches/roslyn/0002-Update-MSBuild-ref-dependency.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Mon, 4 Dec 2023 11:03:10 -0600 -Subject: [PATCH] Update MSBuild ref dependency - -Backport: https://github.com/dotnet/roslyn/pull/71069 ---- - eng/Versions.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 618bcbcbe5b..cc204cbb20c 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -32,7 +32,7 @@ - 17.8.9-preview - 17.8.36711 - -- 16.10.0 -+ 17.3.2 - - 17.5.0 - - 8.0.200-preview.23614.13 - 8.0.200-preview.23614.13 - 8.0.200-preview.23614.13 + 8.0.200-preview.23615.6 + 8.0.200-preview.23615.6 + 8.0.200-preview.23615.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c60ffd6fd8db86ee71a90cc517816e10422382a7 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Fri, 15 Dec 2023 13:17:16 -0800 Subject: [PATCH 20/29] Add nuget-client patch for shortening sb inner clone path (#17991) --- ...-source-build-inner-clone-paths-5543.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch diff --git a/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch b/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch new file mode 100644 index 000000000..340c374c1 --- /dev/null +++ b/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> +Date: Fri, 15 Dec 2023 10:01:14 -0800 +Subject: [PATCH] Shorten source-build inner clone paths (#5543) + +Backport: https://github.com/NuGet/NuGet.Client/pull/5543 +--- + eng/pipelines/templates/Source_Build.yml | 2 +- + eng/source-build/build.sh | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/eng/pipelines/templates/Source_Build.yml b/eng/pipelines/templates/Source_Build.yml +index 7163c617e..842904c4f 100644 +--- a/eng/pipelines/templates/Source_Build.yml ++++ b/eng/pipelines/templates/Source_Build.yml +@@ -12,7 +12,7 @@ steps: + condition: "or(failed(), eq(variables['System.debug'], 'true'))" + continueOnError: true + inputs: +- PathToPublish: "artifacts/source-build/self/log/source-build.binlog" ++ PathToPublish: "artifacts/sb/log/source-build.binlog" + ArtifactName: "Source-build log" + ArtifactType: Container + +diff --git a/eng/source-build/build.sh b/eng/source-build/build.sh +index 292b0fff8..cdf226b06 100755 +--- a/eng/source-build/build.sh ++++ b/eng/source-build/build.sh +@@ -85,7 +85,7 @@ ReadGlobalVersion Microsoft.DotNet.Arcade.Sdk + export ARCADE_VERSION=$_ReadGlobalVersion + + if [ -z "$DotNetBuildFromSourceFlavor" ] || [ "$DotNetBuildFromSourceFlavor" != "Product" ]; then +- export NUGET_PACKAGES=$scriptroot/../../artifacts/source-build/self/package-cache/ ++ export NUGET_PACKAGES=$scriptroot/../../artifacts/sb/package-cache/ + fi + +-"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" $args ++"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/sb/log/source-build.binlog" $args From 22839d007b44c5640df385470ff0a006107b6a89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 22:54:42 +0000 Subject: [PATCH 21/29] Update dependencies from https://github.com/dotnet/sdk build 20231215.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.13 -> To Version 8.0.200-preview.23615.8 --- 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 020e64f37..a5a3d3aac 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 - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 - + https://github.com/dotnet/sdk - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 - + https://github.com/dotnet/sdk - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 - + https://github.com/dotnet/sdk - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 187e47fb2..982af7ded 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23615.6 - 8.0.200-preview.23615.6 - 8.0.200-preview.23615.6 + 8.0.200-preview.23615.8 + 8.0.200-preview.23615.8 + 8.0.200-preview.23615.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ef89c6bb5659892d874a7aa0dd4ff10a8a0e4ea3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 23:51:20 +0000 Subject: [PATCH 22/29] Update dependencies from https://github.com/dotnet/sdk build 20231215.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.13 -> To Version 8.0.200-preview.23615.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.200-beta.23613.4 -> To Version 12.8.200-beta.23614.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5a3d3aac..f95ef5580 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 - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 - + https://github.com/dotnet/sdk - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 - + https://github.com/dotnet/sdk - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 - + https://github.com/dotnet/sdk - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 https://github.com/dotnet/test-templates @@ -132,32 +132,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a - + https://github.com/microsoft/vstest - dc8fe3865011cef3a0891f5f55c1fc5c7f401066 + 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 01173c5ae735625ac079e08414359ff0e8ea19b6 + 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/msbuild - fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa + b0e2b79230019c8f28ad7bedd82ecaa85a114761 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 982af7ded..e8b5bd4da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23615.8 - 8.0.200-preview.23615.8 - 8.0.200-preview.23615.8 + 8.0.200-preview.23615.10 + 8.0.200-preview.23615.10 + 8.0.200-preview.23615.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23613.8 + 4.9.0-3.23614.9 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23612-01 + 17.9.0-preview-23614-02 8.0.0-alpha.1.22557.12 From 9279b070cd297b91e8eb358aaf9e1a62ed151d09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 00:53:31 +0000 Subject: [PATCH 23/29] [main] Update dependencies from dotnet/sdk (#17990) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 9.0.0-alpha.1.23613.1 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23613.1 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23613.1 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 9.0.0-alpha.1.23614.6 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23613.1 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-alpha.1.23613.1 to 9.0.0-alpha.1.23615.2 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 12.8.200-beta.23613.4 to 12.8.200-beta.23614.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23613.4 to 8.0.200-beta.23614.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.9.0-preview-23612-01 to 17.9.0-preview-23614-02 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.10.0-preview-23613-04 to 17.10.0-preview-23615-03 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.9.0-preview.1.54 to 6.9.0-preview.1.63 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62557d883..1cc9696e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ 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://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 - + https://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 - + https://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 - + https://github.com/dotnet/windowsdesktop - 24d29943d978beb39cabb14d63a9954d61826e97 + ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 https://github.com/dotnet/runtime @@ -52,51 +52,51 @@ https://github.com/dotnet/runtime 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/aspnetcore - 5088789413c6364dccd0f36b3eddc89c4606c42f + f36a970bfcaa512e3eefb0d8e7dc8061de09f112 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 - + https://github.com/dotnet/sdk - af41d3d39a69c7a17b6a3ae22259056100f23f6d + da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://github.com/dotnet/wpf 8e3e1a550c591a7732df79f075716b88af692b43 - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a - + https://github.com/microsoft/vstest - dc8fe3865011cef3a0891f5f55c1fc5c7f401066 + 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 @@ -155,14 +155,14 @@ 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/msbuild - f97064d3b83485628dec0769659e786b55f6835a + abc2f4620f6749289cafeed7c9a9a80eaeb38e28 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 diff --git a/eng/Versions.props b/eng/Versions.props index 4ae3963b4..66a788056 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,22 +73,22 @@ - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 - 9.0.0-alpha.1.23614.6 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 0.2.0 - 9.0.100-alpha.1.23615.3 - 9.0.100-alpha.1.23615.3 - 9.0.100-alpha.1.23615.3 + 9.0.100-alpha.1.23615.9 + 9.0.100-alpha.1.23615.9 + 9.0.100-alpha.1.23615.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,10 +113,10 @@ - 9.0.0-alpha.1.23613.1 - 9.0.0-alpha.1.23613.1 - 9.0.0-alpha.1.23613.1 - 9.0.0-alpha.1.23613.1 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.2 @@ -128,7 +128,7 @@ - 6.9.0-preview.1.54 + 6.9.0-preview.1.63 @@ -246,7 +246,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23612-01 + 17.9.0-preview-23614-02 8.0.0-alpha.1.22557.12 9.0.0-preview.23613.1 From 4ee18b14edc2c741b286fe9ea347989a4790a764 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 00:54:38 +0000 Subject: [PATCH 24/29] [main] Update dependencies from dotnet/source-build-reference-packages (#17992) [main] Update dependencies from dotnet/source-build-reference-packages --- 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 1cc9696e3..b60b35e3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -240,9 +240,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - a9a44d16c43525b354da1808ab73c514b3b05e7d + ad274914920e8e51c5269d215a641e592af8182c From 9e820eb7bb33582161f959359960b7e0eb0fcc77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 00:19:40 +0000 Subject: [PATCH 25/29] [main] Update dependencies from dotnet/arcade (#17995) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/sdl/trim-assets-version.ps1 | 2 -- global.json | 6 +++--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b60b35e3f..329da5abc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ https://github.com/dotnet/arcade-services 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade - 8b2b5e29c86eaa76e6e3d6d93a1a99dce3bff27d + 2f7acdc5f9b87f260119bb32d01c24d2773773eb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 66a788056..4539c4946 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23614.6 + 9.0.0-beta.23615.2 diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 index 1f3c531b2..0daa2a9e9 100644 --- a/eng/common/sdl/trim-assets-version.ps1 +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -61,8 +61,6 @@ try { ExitWithExitCode 1 } - # Remove the ROLL FORWARD env var with a future Arcade.Sdk update in Arcade. - $env:DOTNET_ROLL_FORWARD = "Major" Exec-BlockVerbosely { & "$dotnet" $CliToolName trim-assets-version ` --assets-path $InputPath ` diff --git a/global.json b/global.json index 88ad3b49e..88f595d05 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-alpha.1.23613.1", + "dotnet": "9.0.100-alpha.1.23615.4", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23614.6", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23614.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23615.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23615.2" } } From 72eaeded6d49d32984191518cee4c2bc7a9e6321 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 00:20:03 +0000 Subject: [PATCH 26/29] [main] Update dependencies from dotnet/sdk (#17994) [main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 9.0.0-alpha.1.23615.2 to 9.0.0-alpha.1.23615.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.9.0-3.23614.9 to 4.9.0-3.23615.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-alpha.1.23614.10 to 9.0.0-alpha.1.23615.12 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 329da5abc..087fafcdc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,26 +21,26 @@ https://github.com/dotnet/windowsdesktop ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/aspnetcore - f36a970bfcaa512e3eefb0d8e7dc8061de09f112 + 3659474fa496208fbc527f9c9367051841d822dd - + https://github.com/dotnet/sdk - da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 + 91a440681da35b13a1528bd6dcf35c64a2c221ab - + https://github.com/dotnet/sdk - da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 + 91a440681da35b13a1528bd6dcf35c64a2c221ab - + https://github.com/dotnet/sdk - da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 + 91a440681da35b13a1528bd6dcf35c64a2c221ab - + https://github.com/dotnet/sdk - da76bb8d58a38d186c51fe97f7ee5eb5fbff7922 + 91a440681da35b13a1528bd6dcf35c64a2c221ab https://github.com/dotnet/test-templates @@ -146,13 +146,13 @@ 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 - + https://github.com/dotnet/runtime - 99cfd79e7c8e8d42bc2c55f6662d64c74cbe8428 + 09536ba2fd01335f140047b15660d12ca76d6872 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 diff --git a/eng/Versions.props b/eng/Versions.props index 4539c4946..bc830baa2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,41 +73,41 @@ - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23615.3 0.2.0 - 9.0.100-alpha.1.23615.9 - 9.0.100-alpha.1.23615.9 - 9.0.100-alpha.1.23615.9 + 9.0.100-alpha.1.23616.1 + 9.0.100-alpha.1.23616.1 + 9.0.100-alpha.1.23616.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23614.9 + 4.9.0-3.23615.7 - 9.0.0-alpha.1.23614.10 + 9.0.0-alpha.1.23615.12 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 - 9.0.0-alpha.1.23614.10 + 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23615.12 8.0.0-rc.1.23414.4 2.1.0 From dc0381c8fa6475f124c4784173563e32cb2c6110 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Dec 2023 03:04:29 +0000 Subject: [PATCH 27/29] Update dependencies from https://github.com/dotnet/sdk build 20231217.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.13 -> To Version 8.0.200-preview.23617.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.200-beta.23613.4 -> To Version 12.8.200-beta.23615.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f95ef5580..c6b5f5467 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 - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 - + https://github.com/dotnet/sdk - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 - + https://github.com/dotnet/sdk - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 - + https://github.com/dotnet/sdk - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 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 - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 - + https://github.com/dotnet/fsharp - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 https://github.com/dotnet/msbuild b0e2b79230019c8f28ad7bedd82ecaa85a114761 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + 2a234707a663f731e4de93cba4014ed1a8259def diff --git a/eng/Versions.props b/eng/Versions.props index e8b5bd4da..4bb59dadb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23615.10 - 8.0.200-preview.23615.10 - 8.0.200-preview.23615.10 + 8.0.200-preview.23617.3 + 8.0.200-preview.23617.3 + 8.0.200-preview.23617.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23614.9 + 4.9.0-3.23615.7 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.54 + 6.9.0-preview.1.64 From fae23c657143810dcbd2c950109631ed8787e972 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 18 Dec 2023 07:02:42 -0600 Subject: [PATCH 28/29] Remove Arcade net9.0 workarounds (#17987) --- src/SourceBuild/content/Directory.Build.props | 2 - src/SourceBuild/content/build.sh | 7 ++- .../0001-Explicitly-set-TFM-to-net9.0.patch | 51 ------------------- .../0001-Explicitly-set-net9.0-TFM.patch | 23 --------- ...plicitly-target-net9.0-for-NoOp-proj.patch | 23 --------- .../0001-Explicitly-use-net9.0-TFM.patch | 51 ------------------- 6 files changed, 6 insertions(+), 151 deletions(-) delete mode 100644 src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch delete mode 100644 src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch delete mode 100644 src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch delete mode 100644 src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 2efe17577..9d05322e9 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -8,8 +8,6 @@ - - net9.0 netstandard2.0 diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index a1224e436..c56c5085d 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -259,7 +259,12 @@ if [ "$alternateTarget" == "true" ]; then export NUGET_PACKAGES=$NUGET_PACKAGES/smoke-tests "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildTests_$LogDateStamp.binlog" -flp:"LogFile=$SCRIPT_ROOT/artifacts/logs/BuildTests_$LogDateStamp.log" -clp:v=m ${MSBUILD_ARGUMENTS[@]} "$@" else - "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # BuildXPlatTasks uses NetCurrent but that is not set since Arcade isn't used here. + # Bootstrap NetCurrent by deriving it from the installed .NET CLI version. + netCurrent="$($CLI_ROOT/dotnet --version | while IFS='.' read major minor _; do echo "net$major.$minor"; done)" + + "$CLI_ROOT/dotnet" msbuild "$SCRIPT_ROOT/eng/tools/init-build.proj" -p:NetCurrent=$netCurrent -bl:"$SCRIPT_ROOT/artifacts/log/Debug/BuildXPlatTasks_$LogDateStamp.binlog" -flp:LogFile="$SCRIPT_ROOT/artifacts/logs/BuildXPlatTasks_$LogDateStamp.log" -t:PrepareOfflineLocalTools ${MSBUILD_ARGUMENTS[@]} "$@" + # kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver "$CLI_ROOT/dotnet" build-server shutdown diff --git a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch b/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch deleted file mode 100644 index ac34d9338..000000000 --- a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 18 Oct 2023 12:50:21 -0500 -Subject: [PATCH] Explicitly set TFM to net9.0 - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - perf/dotnet-format.Performance.csproj | 2 +- - src/dotnet-format.csproj | 2 +- - tests/dotnet-format.UnitTests.csproj | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj -index 677b7b9a..3e1387d1 100644 ---- a/perf/dotnet-format.Performance.csproj -+++ b/perf/dotnet-format.Performance.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Exe - true - Release -diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj -index 5549fb71..8a77d03f 100644 ---- a/src/dotnet-format.csproj -+++ b/src/dotnet-format.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Exe - Microsoft.CodeAnalysis.Tools - true -diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj -index c4311a1a..5b1bcfb9 100644 ---- a/tests/dotnet-format.UnitTests.csproj -+++ b/tests/dotnet-format.UnitTests.csproj -@@ -1,7 +1,7 @@ -  - - -- $(NetCurrent) -+ net9.0 - Microsoft.CodeAnalysis.Tools.Tests - - diff --git a/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch b/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch deleted file mode 100644 index 295561075..000000000 --- a/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Wed, 18 Oct 2023 10:58:11 -0500 -Subject: [PATCH] Explicitly set net9.0 TFM - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index bf6754f23..d76f449be 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -66,7 +66,7 @@ - --> - - -- $(NetCurrent) -+ net9.0 - $(DefaultNetCoreTargetFramework) - - diff --git a/src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch b/src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch deleted file mode 100644 index 6438c7678..000000000 --- a/src/SourceBuild/patches/source-build-reference-packages/0001-Explicitly-target-net9.0-for-NoOp-proj.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Tue, 7 Nov 2023 12:40:49 -0600 -Subject: [PATCH] Explicitly target net9.0 for NoOp proj - -https://github.com/dotnet/source-build/issues/3663 ---- - eng/NoOp.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/NoOp.csproj b/eng/NoOp.csproj -index 659aa00a..3ecefd43 100644 ---- a/eng/NoOp.csproj -+++ b/eng/NoOp.csproj -@@ -5,7 +5,7 @@ - - - -- $(NetCurrent) -+ net9.0 - - - diff --git a/src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch b/src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch deleted file mode 100644 index 78ebca72a..000000000 --- a/src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Thu, 19 Oct 2023 08:29:45 -0500 -Subject: [PATCH] Explicitly use net9.0 TFM - -Backport: https://github.com/dotnet/source-build/issues/3663 ---- - Directory.Build.targets | 2 +- - .../Microsoft.TestPlatform.Build.csproj | 2 +- - .../Microsoft.TestPlatform.CLI.csproj | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index b720568b..617ca4fc 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -6,7 +6,7 @@ - - - -- $(NetCurrent) -+ net9.0 - - $(NetCurrent) - -diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -index a93852ce..945b1ac2 100644 ---- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj -@@ -12,7 +12,7 @@ - - - -- $(NetCurrent) -+ net9.0 - - - -diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -index b8f6849b..b56b993c 100644 ---- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj -@@ -31,7 +31,7 @@ - - - -- -+ - - - From b75062f476bebd9b971ae3c0fdfffdfd1ad99978 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 15:05:09 +0100 Subject: [PATCH 29/29] [main] Update dependencies from dotnet/sdk (#17996) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai Co-authored-by: Viktor Hofer --- eng/Version.Details.xml | 112 +++++++++--------- eng/Versions.props | 48 ++++---- ...-source-build-inner-clone-paths-5543.patch | 38 ------ ...ride-of-build-tool-framework-version.patch | 28 ----- 4 files changed, 80 insertions(+), 146 deletions(-) delete mode 100644 src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch delete mode 100644 src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21d285e64..9295b0217 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,42 +5,42 @@ 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://github.com/dotnet/windowsdesktop - ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/windowsdesktop - ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/windowsdesktop - ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/windowsdesktop - ab56ae7e6669971a3a2808b98afc7a4724a9c8d1 + 418db4267f07091b065fd5065b24207876bcc89f - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e @@ -48,55 +48,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/aspnetcore - 3659474fa496208fbc527f9c9367051841d822dd + 889b89f6000b60ac6310c152f799e90a3f1ee245 - + https://github.com/dotnet/sdk - 91a440681da35b13a1528bd6dcf35c64a2c221ab + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 - + https://github.com/dotnet/sdk - 91a440681da35b13a1528bd6dcf35c64a2c221ab + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 - + https://github.com/dotnet/sdk - 91a440681da35b13a1528bd6dcf35c64a2c221ab + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 - + https://github.com/dotnet/sdk - 91a440681da35b13a1528bd6dcf35c64a2c221ab + 6ced0bc9a370d3b2ed9fe3350a19cd86aa94d184 https://github.com/dotnet/test-templates @@ -124,21 +124,21 @@ ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/winforms - e1393ed208a58a6a2f864ac5ae9cd8ae965d236c + 338ec5bd57538304c4cf372c4389b7c9c57cbecd - + https://github.com/dotnet/wpf - 8e3e1a550c591a7732df79f075716b88af692b43 + 4fc9cd4d737f87b4b0604c80961a32aab47feb0b - + https://github.com/dotnet/fsharp - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 - + https://github.com/dotnet/fsharp - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 @@ -146,9 +146,9 @@ 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 - + https://github.com/dotnet/runtime - 09536ba2fd01335f140047b15660d12ca76d6872 + 7bb99e9f58d7bbaac53e7cf48c8ca1a9d17e216e https://github.com/dotnet/roslyn @@ -160,18 +160,18 @@ abc2f4620f6749289cafeed7c9a9a80eaeb38e28 - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 487a0a43dbe6e83f07b200b7523447222bb2137b + e5721f8f058db60052ff7298d1a5acd69347b5db diff --git a/eng/Versions.props b/eng/Versions.props index bc830baa2..0b2f1d577 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-alpha.1.23605.3 + 9.0.0-alpha.1.23616.1 - 9.0.0-alpha.1.23606.2 + 9.0.0-alpha.1.23616.2 @@ -73,22 +73,22 @@ - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 - 9.0.0-alpha.1.23615.3 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 + 9.0.0-alpha.1.23617.2 0.2.0 - 9.0.100-alpha.1.23616.1 - 9.0.100-alpha.1.23616.1 - 9.0.100-alpha.1.23616.1 + 9.0.100-alpha.1.23618.1 + 9.0.100-alpha.1.23618.1 + 9.0.100-alpha.1.23618.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -99,24 +99,24 @@ - 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23617.4 - 9.0.0-alpha.1.23615.12 - 9.0.0-alpha.1.23615.12 - 9.0.0-alpha.1.23615.12 - 9.0.0-alpha.1.23615.12 - 9.0.0-alpha.1.23615.12 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 + 9.0.0-alpha.1.23617.4 8.0.0-rc.1.23414.4 2.1.0 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 - 9.0.0-alpha.1.23615.2 + 9.0.0-alpha.1.23617.1 + 9.0.0-alpha.1.23617.1 + 9.0.0-alpha.1.23617.1 + 9.0.0-alpha.1.23617.1 @@ -128,7 +128,7 @@ - 6.9.0-preview.1.63 + 6.9.0-preview.1.64 @@ -262,7 +262,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 9.0.0-alpha.1.23613.1 + 9.0.0-alpha.1.23617.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch b/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch deleted file mode 100644 index 340c374c1..000000000 --- a/src/SourceBuild/patches/nuget-client/0001-Shorten-source-build-inner-clone-paths-5543.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> -Date: Fri, 15 Dec 2023 10:01:14 -0800 -Subject: [PATCH] Shorten source-build inner clone paths (#5543) - -Backport: https://github.com/NuGet/NuGet.Client/pull/5543 ---- - eng/pipelines/templates/Source_Build.yml | 2 +- - eng/source-build/build.sh | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/eng/pipelines/templates/Source_Build.yml b/eng/pipelines/templates/Source_Build.yml -index 7163c617e..842904c4f 100644 ---- a/eng/pipelines/templates/Source_Build.yml -+++ b/eng/pipelines/templates/Source_Build.yml -@@ -12,7 +12,7 @@ steps: - condition: "or(failed(), eq(variables['System.debug'], 'true'))" - continueOnError: true - inputs: -- PathToPublish: "artifacts/source-build/self/log/source-build.binlog" -+ PathToPublish: "artifacts/sb/log/source-build.binlog" - ArtifactName: "Source-build log" - ArtifactType: Container - -diff --git a/eng/source-build/build.sh b/eng/source-build/build.sh -index 292b0fff8..cdf226b06 100755 ---- a/eng/source-build/build.sh -+++ b/eng/source-build/build.sh -@@ -85,7 +85,7 @@ ReadGlobalVersion Microsoft.DotNet.Arcade.Sdk - export ARCADE_VERSION=$_ReadGlobalVersion - - if [ -z "$DotNetBuildFromSourceFlavor" ] || [ "$DotNetBuildFromSourceFlavor" != "Product" ]; then -- export NUGET_PACKAGES=$scriptroot/../../artifacts/source-build/self/package-cache/ -+ export NUGET_PACKAGES=$scriptroot/../../artifacts/sb/package-cache/ - fi - --"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/source-build/self/log/source-build.binlog" $args -+"$DOTNET" msbuild "$scriptroot/source-build.proj" /p:Configuration=$configuration /p:DotNetBuildFromSource=true /p:ArcadeBuildFromSource=true "/p:RepoRoot=$scriptroot/../../" "/bl:$scriptroot/../../artifacts/sb/log/source-build.binlog" $args diff --git a/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch b/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch deleted file mode 100644 index 4a351587d..000000000 --- a/src/SourceBuild/patches/xdt/0001-Allow-override-of-build-tool-framework-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 30 Oct 2023 22:52:31 +0000 -Subject: [PATCH] Allow override of build tool framework version - -Backport: https://github.com/dotnet/aspnetcore/issues/51753 ---- - eng/common/tools.sh | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/eng/common/tools.sh b/eng/common/tools.sh -index 17f0a36..343490c 100755 ---- a/eng/common/tools.sh -+++ b/eng/common/tools.sh -@@ -312,7 +312,12 @@ function InitializeBuildTool { - # return values - _InitializeBuildTool="$_InitializeDotNetCli/dotnet" - _InitializeBuildToolCommand="msbuild" -- _InitializeBuildToolFramework="netcoreapp3.1" -+ # use override if it exists - commonly set by source-build -+ if [[ -z "${_OverrideArcadeInitializeBuildToolFramework}" ]]; then -+ _InitializeBuildToolFramework="netcoreapp3.1" -+ else -+ _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" -+ fi - } - - # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116