From b10d6ced2694b931b6c0d24033d2ed609a1396e2 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Fri, 16 Jun 2023 12:19:02 +0200 Subject: [PATCH 1/4] Update sdk version to bump pulled runtime --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 4bd9c24c01e..47927f8835a 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "allowPrerelease": true }, "tools": { - "dotnet": "7.0.200", + "dotnet": "7.0.304", "vs": { "version": "17.4.1" }, From 56c7c701dcdd84cedfc88be634a78eeec85ce4a4 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Tue, 20 Jun 2023 07:47:17 +0200 Subject: [PATCH 2/4] Fix build --- .editorconfig | 6 ++++++ eng/Packages.props | 1 + eng/Version.Details.xml | 17 +++++++++-------- eng/Versions.props | 6 +++--- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.editorconfig b/.editorconfig index fc8b2d155df..044208a0a78 100644 --- a/.editorconfig +++ b/.editorconfig @@ -295,6 +295,9 @@ dotnet_diagnostic.IDE0049.severity = suggestion # Use compound assignment dotnet_diagnostic.IDE0054.severity = suggestion +# Fix formatting +dotnet_diagnostic.IDE0055.severity = suggestion + # Indexing can be simplified dotnet_diagnostic.IDE0056.severity = suggestion @@ -387,6 +390,9 @@ dotnet_diagnostic.IDE0241.severity = suggestion # Struct can be made 'readonly' dotnet_diagnostic.IDE0250.severity = suggestion +# Struct methods can be made 'readonly' +dotnet_diagnostic.IDE0251.severity = suggestion + # Null check can be simplified dotnet_diagnostic.IDE0270.severity = suggestion diff --git a/eng/Packages.props b/eng/Packages.props index 5623df27263..08b6d66cf10 100644 --- a/eng/Packages.props +++ b/eng/Packages.props @@ -13,6 +13,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d597e2605e..9a93f382a0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,22 +1,23 @@ - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/nuget/nuget.client - ca5029046d7b6e55f322c45abb7b342054543710 + f3bb337e310ce44abda4ad73cdb0755ed940809d - + https://github.com/dotnet/roslyn - 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 + 4cbfec964e59687cd9cc8601df42b936c9c06f63 + - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 91616785a1a6578c83f7e93d98c34a1eb83d6223 diff --git a/eng/Versions.props b/eng/Versions.props index 8de5b9dafe7..efda9ed0342 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,11 +49,11 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 6.0.0-beta.23167.1 + 6.0.0-beta.23313.5 7.0.0 6.0.0 - 4.6.0-2.23166.9 - 6.5.0-rc.149 + 4.7.0-3.23311.1 + 6.7.0-preview.2.51 6.0.0 7.0.0 7.0.0 From 6296550347ef2a96af769b581165d1c1f69d316d Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Tue, 20 Jun 2023 13:01:23 +0200 Subject: [PATCH 3/4] Update arcade --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 47927f8835a..34686e17a45 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "xcopy-msbuild": "17.4.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5" } } From d54bf903779299ac2352cec2743efef07761ada6 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Tue, 20 Jun 2023 13:31:21 +0200 Subject: [PATCH 4/4] Link roslyn --- src/Tasks/Microsoft.Build.Tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.Build.Tasks.csproj b/src/Tasks/Microsoft.Build.Tasks.csproj index 63d564f81e6..98a5bcc42c7 100644 --- a/src/Tasks/Microsoft.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.Build.Tasks.csproj @@ -1016,7 +1016,7 @@ - +