Skip to content

Commit f3f7b91

Browse files
committed
refs
1 parent 3751449 commit f3f7b91

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

src/.editorconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ indent_style = space
1111
indent_size = 4
1212
charset = utf-8
1313

14+
# Redundant accessor body
15+
resharper_redundant_accessor_body_highlighting = error
16+
17+
# Replace with field keyword
18+
resharper_replace_with_field_keyword_highlighting = error
1419

1520
# Declare types in namespaces
1621
dotnet_diagnostic.CA1050.severity = None
@@ -200,7 +205,8 @@ resharper_field_can_be_made_read_only_local_highlighting = none
200205
resharper_merge_into_logical_pattern_highlighting = warning
201206
resharper_merge_into_pattern_highlighting = error
202207
resharper_method_has_async_overload_highlighting = warning
203-
resharper_partial_type_with_single_part_highlighting = error
208+
# because stop rider giving errors before source generators have run
209+
resharper_partial_type_with_single_part_highlighting = warning
204210
resharper_redundant_base_qualifier_highlighting = warning
205211
resharper_redundant_cast_highlighting = error
206212
resharper_redundant_empty_object_creation_argument_list_highlighting = error

src/DiffEngine/DiffTools_Add.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@ public static partial class DiffTools
1010
return null;
1111
}
1212

13-
return AddTool(name, autoRefresh ?? existing.AutoRefresh, isMdi ?? existing.IsMdi, supportsText ?? existing.SupportsText, requiresTarget ?? existing.RequiresTarget, launchArguments ?? existing.LaunchArguments, exePath ?? existing.ExePath, binaryExtensions ?? existing.BinaryExtensions);
13+
return AddTool(
14+
name,
15+
autoRefresh ?? existing.AutoRefresh,
16+
isMdi ?? existing.IsMdi,
17+
supportsText ?? existing.SupportsText,
18+
requiresTarget ?? existing.RequiresTarget,
19+
launchArguments ?? existing.LaunchArguments,
20+
exePath ?? existing.ExePath,
21+
binaryExtensions ?? existing.BinaryExtensions);
1422
}
1523

1624
public static ResolvedTool? AddTool(string name, bool autoRefresh, bool isMdi, bool supportsText, bool requiresTarget, IEnumerable<string> binaryExtensions, OsSupport osSupport) =>

src/Directory.Packages.props

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ItemGroup>
77
<PackageVersion Include="Argon" Version="0.24.2" />
88
<PackageVersion Include="Caseless.Fody" Version="1.9.1" />
9-
<PackageVersion Include="EmptyFiles" Version="8.5.0" />
9+
<PackageVersion Include="EmptyFiles" Version="8.5.1" />
1010
<PackageVersion Include="Fody" Version="6.8.2" />
1111
<PackageVersion Include="MarkdownSnippets.MsBuild" Version="27.0.2" />
1212
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
@@ -16,10 +16,6 @@
1616
<PackageVersion Include="Serilog" Version="4.1.0" />
1717
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
1818
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
19-
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
20-
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
21-
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
22-
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
2319
<PackageVersion Include="System.Globalization.Extensions" Version="4.3.0" />
2420
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
2521
<PackageVersion Include="System.Management" Version="9.0.0" />

0 commit comments

Comments
 (0)