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 2a05962cfa7..9a93f382a0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,13 +6,14 @@ 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/nuget/nuget.client - d22c6743bf6237c39b98d5d680e06e6c33e97f1c + f3bb337e310ce44abda4ad73cdb0755ed940809d - + https://github.com/dotnet/roslyn - 85f9dbfea5955ec9cdad3417dba40034da74fb93 + 4cbfec964e59687cd9cc8601df42b936c9c06f63 + https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index da594622975..aa56262bf95 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 diff --git a/global.json b/global.json index 4bd9c24c01e..34686e17a45 100644 --- a/global.json +++ b/global.json @@ -3,13 +3,13 @@ "allowPrerelease": true }, "tools": { - "dotnet": "7.0.200", + "dotnet": "7.0.304", "vs": { "version": "17.4.1" }, "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" } } 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 @@ - +