Skip to content

Move to newer CodeStyle, dotnet-format and compiler toolset NuGet packages #68608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mavasani merged 1 commit into from
Jun 14, 2023
Merged

Move to newer CodeStyle, dotnet-format and compiler toolset NuGet packages #68608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"isRoot": true,
"tools": {
"dotnet-format": {
"version": "6.4.326609",
"version": "7.0.360304",
"commands": [
"dotnet-format"
]
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
Keep the setting conditional. The toolset sets the assembly version to 42.42.42.42 if not set explicitly.
-->
<AssemblyVersion Condition="'$(OfficialBuild)' == 'true' or '$(DotNetUseShippingVersions)' == 'true'">$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
<MicrosoftNetCompilersToolsetVersion>4.5.0</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetVersion>4.6.0</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Versions used by several individual references below -->
Expand All @@ -24,7 +24,7 @@
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23163.2</MicrosoftCodeAnalysisTestingVersion>
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.149-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
<!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
<CodeStyleAnalyzerVersion>4.3.0-1.final</CodeStyleAnalyzerVersion>
<CodeStyleAnalyzerVersion>4.6.0</CodeStyleAnalyzerVersion>
<VisualStudioEditorPackagesVersion>17.7.38-preview</VisualStudioEditorPackagesVersion>
<!-- This should generally be set to $(VisualStudioEditorPackagesVersion),
but sometimes EditorFeatures.Cocoa specifically requires a newer editor build. -->
Expand Down
8 changes: 4 additions & 4 deletions src/Analyzers/CSharp/Tests/HideBase/HideBaseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -185,8 +185,8 @@ class App : Application
""");

[Fact]
public async Task TestAddNewToOrderedModifiersWithTrivia() =>
await TestInRegularAndScript1Async(
public async Task TestAddNewToOrderedModifiersWithTrivia()
=> await TestInRegularAndScript1Async(
"""
class Application
{
Expand Down
10 changes: 5 additions & 5 deletions src/Features/Core/Portable/EditAndContinue/Utilities/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
4 changes: 2 additions & 2 deletions src/VisualStudio/Core/Test.Next/Remote/SnapshotSerializationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down