From 9422bdd2c37f593a388693c0991541299b5598be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Nov 2023 12:10:44 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/arcade build 20231101.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23531.4 -> To Version 9.0.0-beta.23551.1 --- NuGet.config | 1 - eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82d49e25523..857df94b458 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4c567d6ae5..21b51715053 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,14 +29,14 @@ - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + aa96cf38432123dc5de1a2ad877e3ff6b079c928 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + aa96cf38432123dc5de1a2ad877e3ff6b079c928 diff --git a/global.json b/global.json index 72dca048024..6515821febd 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23531.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23551.1" } } From e4c814d8167d960ab07ea27238c888ddf3fcafe0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Nov 2023 12:11:20 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/arcade build 20231102.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23531.4 -> To Version 9.0.0-beta.23552.4 --- eng/Version.Details.xml | 8 ++++---- eng/common/tools.sh | 7 ++++++- global.json | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21b51715053..a9b73005a4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,14 +29,14 @@ - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 710e64df967..e7ec245bc4a 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -341,7 +341,12 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="net8.0" + # use override if it exists - commonly set by source-build + if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then + _InitializeBuildToolFramework="net8.0" + else + _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" + fi } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/global.json b/global.json index 6515821febd..69b4ebc72fe 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23551.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23552.4" } } From ba3273617a7626699ae10d5a5f32131144cef4b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Nov 2023 12:10:24 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/arcade build 20231103.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23531.4 -> To Version 9.0.0-beta.23553.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9b73005a4f..7f269123015 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,14 +29,14 @@ - + https://github.com/dotnet/arcade - 215ead44de53294bc1223b593a36bda5493df4ba + 1f067970472e5eb1877797bc4304dd13f284c7ba - + https://github.com/dotnet/arcade - 215ead44de53294bc1223b593a36bda5493df4ba + 1f067970472e5eb1877797bc4304dd13f284c7ba diff --git a/global.json b/global.json index 69b4ebc72fe..4a466846126 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23552.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23553.1" } } From 77c16d81608ccc78ea4ab55379e53f406163e605 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 Nov 2023 13:09:20 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/arcade build 20231103.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23531.4 -> To Version 9.0.0-beta.23553.1 From 41c69474669a7cf59cd3a8d9cf4eda7e8d59e08b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Nov 2023 13:10:02 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/arcade build 20231103.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23531.4 -> To Version 9.0.0-beta.23553.1 From b63512fe24ea8479dde3d588d112d3afcbb12e46 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Nov 2023 13:12:07 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/arcade build 20231106.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23531.4 -> To Version 9.0.0-beta.23556.4 --- eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f269123015..cb7efcfd7c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,14 +29,14 @@ - + https://github.com/dotnet/arcade - 1f067970472e5eb1877797bc4304dd13f284c7ba + 21c8b7373b7e4845f7df0ad15654529c1f41b66d - + https://github.com/dotnet/arcade - 1f067970472e5eb1877797bc4304dd13f284c7ba + 21c8b7373b7e4845f7df0ad15654529c1f41b66d diff --git a/global.json b/global.json index 4a466846126..ca01fcc863f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23553.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23556.4" } }