diff --git a/dotnet-tools.json b/dotnet-tools.json index b81fdc2997f8c..4577fa79bb69f 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -2,7 +2,7 @@ "isRoot": true, "tools": { "dotnet-format": { - "version": "6.4.326609", + "version": "7.0.360304", "commands": [ "dotnet-format" ] diff --git a/eng/Versions.props b/eng/Versions.props index ae924cd630e00..c7ad58cd2af4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,7 +15,7 @@ Keep the setting conditional. The toolset sets the assembly version to 42.42.42.42 if not set explicitly. --> $(MajorVersion).$(MinorVersion).0.0 - 4.5.0 + 4.6.0 @@ -24,7 +24,7 @@ 1.1.2-beta1.23163.2 0.1.149-beta - 4.3.0-1.final + 4.6.0 17.7.38-preview diff --git a/src/Analyzers/CSharp/Tests/HideBase/HideBaseTests.cs b/src/Analyzers/CSharp/Tests/HideBase/HideBaseTests.cs index ae95adef076ec..4bf97282ed7ca 100644 --- a/src/Analyzers/CSharp/Tests/HideBase/HideBaseTests.cs +++ b/src/Analyzers/CSharp/Tests/HideBase/HideBaseTests.cs @@ -159,8 +159,8 @@ class A { internal const int i = 0; } } [Fact] - public async Task TestAddNewToDisorderedModifiers() => - await TestInRegularAndScript1Async( + public async Task TestAddNewToDisorderedModifiers() + => await TestInRegularAndScript1Async( """ class Application { @@ -185,8 +185,8 @@ class App : Application """); [Fact] - public async Task TestAddNewToOrderedModifiersWithTrivia() => - await TestInRegularAndScript1Async( + public async Task TestAddNewToOrderedModifiersWithTrivia() + => await TestInRegularAndScript1Async( """ class Application { diff --git a/src/Features/Core/Portable/EditAndContinue/Utilities/Extensions.cs b/src/Features/Core/Portable/EditAndContinue/Utilities/Extensions.cs index 33d5e330ac14f..d9eb7ecc5cfdb 100644 --- a/src/Features/Core/Portable/EditAndContinue/Utilities/Extensions.cs +++ b/src/Features/Core/Portable/EditAndContinue/Utilities/Extensions.cs @@ -139,11 +139,11 @@ public static ManagedHotReloadDiagnostic ToHotReloadDiagnostic(this DiagnosticDa return new( data.Id, data.Message ?? FeaturesResources.Unknown_error_occurred, - updateStatus == ModuleUpdateStatus.RestartRequired ? - ManagedHotReloadDiagnosticSeverity.RestartRequired : - (data.Severity == DiagnosticSeverity.Error) ? - ManagedHotReloadDiagnosticSeverity.Error : - ManagedHotReloadDiagnosticSeverity.Warning, + updateStatus == ModuleUpdateStatus.RestartRequired + ? ManagedHotReloadDiagnosticSeverity.RestartRequired + : (data.Severity == DiagnosticSeverity.Error) + ? ManagedHotReloadDiagnosticSeverity.Error + : ManagedHotReloadDiagnosticSeverity.Warning, fileSpan.Path ?? "", fileSpan.Span.ToSourceSpan()); } diff --git a/src/VisualStudio/Core/Test.Next/Remote/SnapshotSerializationTests.cs b/src/VisualStudio/Core/Test.Next/Remote/SnapshotSerializationTests.cs index bb60c5addb4e1..89c12c55bf395 100644 --- a/src/VisualStudio/Core/Test.Next/Remote/SnapshotSerializationTests.cs +++ b/src/VisualStudio/Core/Test.Next/Remote/SnapshotSerializationTests.cs @@ -705,8 +705,8 @@ private static AnalyzerFileReference CreateShadowCopiedAnalyzerReference(TempRoo private class MissingAnalyzerLoader : AnalyzerAssemblyLoader { - protected override string PreparePathToLoad(string fullPath) => - throw new FileNotFoundException(fullPath); + protected override string PreparePathToLoad(string fullPath) + => throw new FileNotFoundException(fullPath); } private class MissingMetadataReference : PortableExecutableReference