From 9dbefa088c1d068ee68d27b15f9627578a93d4b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 10:57:20 -0800 Subject: [PATCH 1/2] [main] Update dependencies from dotnet/arcade (#16586) * Update dependencies from https://github.com/dotnet/arcade build 20240124.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24073.2 -> To Version 8.0.0-beta.24074.2 * Update dependencies from https://github.com/dotnet/arcade build 20240124.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24073.2 -> To Version 8.0.0-beta.24074.2 * Update dependencies from https://github.com/dotnet/arcade build 20240125.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24073.2 -> To Version 8.0.0-beta.24075.5 * Update dependencies from https://github.com/dotnet/arcade build 20240125.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24073.2 -> To Version 8.0.0-beta.24075.5 * Update dependencies from https://github.com/dotnet/arcade build 20240125.5 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24073.2 -> To Version 8.0.0-beta.24075.5 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 732b37657ea..4be35244cae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ - + https://github.com/dotnet/arcade - 4c941e2e3ae61502bd4ffd711930f662fd808375 + 07cf24f27ee58b5d1a9662334a101d84bd1e07e5 diff --git a/global.json b/global.json index 56134e06fd6..60ffcefc016 100644 --- a/global.json +++ b/global.json @@ -17,7 +17,7 @@ "perl": "5.38.0.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24073.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24075.5", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } } From 3a72f0f40e5680f1e52af2d492d386d56ed914b5 Mon Sep 17 00:00:00 2001 From: Petr Date: Mon, 29 Jan 2024 20:40:49 +0100 Subject: [PATCH 2/2] Fix a script (#16592) --- tests/scripts/update-baselines.fsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scripts/update-baselines.fsx b/tests/scripts/update-baselines.fsx index 06e9c13ef80..6cc8631d898 100644 --- a/tests/scripts/update-baselines.fsx +++ b/tests/scripts/update-baselines.fsx @@ -1,13 +1,13 @@ open System open System.IO -// this script is usefull for tests using a .bsl file (baseline) containing expected compiler output +// this script is useful for tests using a .bsl file (baseline) containing expected compiler output // which is matched against .vserr or .err file aside once the test has run // the script replaces all the .bsl/.bslpp with either .err or .vserr let diff path1 path2 = let result = System.Text.StringBuilder() - let append s = result.AppendLine s |> ignore + let append (s: string) = result.AppendLine s |> ignore if not <| File.Exists(path1) then failwithf "Invalid path %s" path1 if not <| File.Exists(path2) then failwithf "Invalid path %s" path2