From 7c24071b75057c1324a31cb7560036f8ab300aba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 10:24:56 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/sdk build 20230330.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.6.0-3.23178.21 -> To Version 4.6.0-3.23179.15 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cccdfbb76..78590d54d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 - + https://github.com/dotnet/sdk - 4b709262e9ef2369b13cc527f4bb387c5c9c2ee0 + 4188210079afb65359890efd06aa1123f249d7b6 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 1861e34dc30c2d6e1e668c5b3e3a7bf345158fbb + daad346cf905e453a7bb5561dbeb0b1be24a09ca diff --git a/eng/Versions.props b/eng/Versions.props index 4a2e62a14..4b419dd9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23179.16 - 7.0.300-preview.23179.16 - 7.0.300-preview.23179.16 + 7.0.300-preview.23180.1 + 7.0.300-preview.23180.1 + 7.0.300-preview.23180.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a6c6f161441232c79c58895320c2d6b7fc4e00d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Mar 2023 18:54:51 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/sdk build 20230330.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-3.23178.21 -> To Version 4.6.0-3.23179.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 3 +++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d6b197f7..62cb9d6ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78590d54d..efa731d06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 - + https://github.com/dotnet/sdk - 4188210079afb65359890efd06aa1123f249d7b6 + b3f862a37780a0882407788c809b87114cb23b95 @@ -149,9 +149,9 @@ daad346cf905e453a7bb5561dbeb0b1be24a09ca - + https://github.com/dotnet/msbuild - dd5d9f746fe3ec521ed44c6f2b852740d25f51be + 61dd6568446aff7602d37e6a15595371fa057012 diff --git a/eng/Versions.props b/eng/Versions.props index 4b419dd9e..6f777006c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.1 - 7.0.300-preview.23180.1 - 7.0.300-preview.23180.1 + 7.0.300-preview.23180.3 + 7.0.300-preview.23180.3 + 7.0.300-preview.23180.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15ebd54c3466ea3e6232472a3d1930ebe336510d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 03:13:50 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/sdk build 20230330.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.6.0-3.23178.21 -> To Version 4.6.0-3.23180.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efa731d06..3c8014f47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 - + https://github.com/dotnet/sdk - b3f862a37780a0882407788c809b87114cb23b95 + d8a227f2d10e0f471fb777338334ce1e68ebc515 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - daad346cf905e453a7bb5561dbeb0b1be24a09ca + 99e956e42697a6dd886d1e12478ea2b27cceacfa diff --git a/eng/Versions.props b/eng/Versions.props index 6f777006c..a4ef7c925 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.3 - 7.0.300-preview.23180.3 - 7.0.300-preview.23180.3 + 7.0.300-preview.23180.8 + 7.0.300-preview.23180.8 + 7.0.300-preview.23180.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7828afa1fb337646531229c2be2875f2fe44d5da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 04:17:33 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/sdk build 20230330.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23180.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23179.6 -> To Version 12.5.0-beta.23180.1 (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 3c8014f47..7314ffd31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a - + https://github.com/dotnet/sdk - d8a227f2d10e0f471fb777338334ce1e68ebc515 + 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0315841ebb89a21c717002224ad9d39f3c21320a - + https://github.com/dotnet/fsharp - 7681004e60fa33211ed2690d38796788ce4a2df8 + 15e94b3cb730ed90d454141e0d4c10a28d9efe1d - + https://github.com/dotnet/fsharp - 7681004e60fa33211ed2690d38796788ce4a2df8 + 15e94b3cb730ed90d454141e0d4c10a28d9efe1d diff --git a/eng/Versions.props b/eng/Versions.props index a4ef7c925..3d5375e4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.8 - 7.0.300-preview.23180.8 - 7.0.300-preview.23180.8 + 7.0.300-preview.23180.10 + 7.0.300-preview.23180.10 + 7.0.300-preview.23180.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 860b98a189c58d45dac3b71b7f57932f60a24289 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 09:29:06 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/dotnet/sdk build 20230331.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23181.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23179.6 -> To Version 12.5.0-beta.23180.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7314ffd31..881c9ec7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 - + https://github.com/dotnet/sdk - 34e81bcfc44cd9e67c3cc5a9f8f26d9fa54bcc1a + 714e05196d7d9d4eb80c01179ea2a67e93149283 @@ -154,9 +154,9 @@ 61dd6568446aff7602d37e6a15595371fa057012 - + https://github.com/nuget/nuget.client - 545330e99bc4a1c4e1ee3ee1e3d664419cec8efe + 0fa557836fa35aee7d60776ef0c88176dbcd22ac diff --git a/eng/Versions.props b/eng/Versions.props index 3d5375e4c..4f7f6487a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23180.10 - 7.0.300-preview.23180.10 - 7.0.300-preview.23180.10 + 7.0.300-preview.23181.1 + 7.0.300-preview.23181.1 + 7.0.300-preview.23181.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1960b608ee8f400432a52a062ba1e695247df156 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Mar 2023 11:00:09 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/sdk build 20230331.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23179.16 -> To Version 7.0.300-preview.23181.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.23179.6 -> To Version 12.5.0-beta.23180.1 (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 881c9ec7e..df816c265 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ eb937b61acd09d5698e9c16d80e2ad49f4eeaada - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 - + https://github.com/dotnet/sdk - 714e05196d7d9d4eb80c01179ea2a67e93149283 + 6952b7a478462c898db283979964d21bb3607566 diff --git a/eng/Versions.props b/eng/Versions.props index 4f7f6487a..8128e226b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.300-preview.23181.1 - 7.0.300-preview.23181.1 - 7.0.300-preview.23181.1 + 7.0.300-preview.23181.4 + 7.0.300-preview.23181.4 + 7.0.300-preview.23181.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2ff31e8228f397111a3a5fc2538817fa4827c3a5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 31 Mar 2023 16:14:39 +0000 Subject: [PATCH 7/7] Fix source-build issue related to stable versioning --- eng/Version.Details.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df816c265..594ca2a79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -152,6 +152,10 @@ https://github.com/dotnet/msbuild 61dd6568446aff7602d37e6a15595371fa057012 + + + https://github.com/dotnet/msbuild + 61dd6568446aff7602d37e6a15595371fa057012