Skip to content

Commit 3bb551c

Browse files
SimonCroppSimonCropp
committed
cleanup
1 parent 2e5c20d commit 3bb551c

30 files changed

+261
-112
lines changed

‎.gitattributes

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
# Auto detect text files and perform LF normalization
22
* text=auto eol=crlf
3-
*.xml -text
3+
.editorconfig -text
4+
*.sln.DotSettings -text
5+
*.xml -text
46
*.targets -text
57
*.txt -text
68
*.json -text
79

8-
# Custom for Visual Studio
9-
*.cs diff=csharp
10-
*.sln merge=union
11-
*.csproj merge=union
12-
*.vbproj merge=union
13-
*.fsproj merge=union
14-
*.dbproj merge=union
1510

1611
# Denote all files that are truly binary and should not be modified.
1712
*.dll binary

‎.gitignore

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
.vs
2-
3-
*.DotSettings
4-
5-
Nugets/
6-
7-
[Bb]in
8-
[Oo]bj
9-
*.received.*
10-
src/Verify.Tests/Tests.StreamNegative.verified.bin
11-
src/Verify.Tests/Tests.StreamMultipleNegative.00.verified.bin
12-
src/Verify.Tests/Tests.StreamMultipleNegative.01.verified.bin
13-
src/Verify.Tests/Tests.TextNegative.verified.tmp
14-
.idea
15-
.DS_Store
16-
src/Verify.sln.DotSettings.user
1+
*.suo
172
*.user
3+
bin/
4+
obj/
5+
.vs/
6+
*.DotSettings.user
7+
.idea/
8+
*.received.*
9+
nugets/

‎src/.editorconfig

Lines changed: 98 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,95 @@
1+
root = true
12
# EditorConfig: http://EditorConfig.org
23

34
# top-most EditorConfig file
4-
root = true
55

66
[*]
77
indent_style = space:error
88

9+
# Microsoft .NET properties
10+
csharp_new_line_before_members_in_object_initializers = false
11+
csharp_preferred_modifier_order = public, private, protected, internal, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async:suggestion
12+
csharp_style_namespace_declarations = file_scoped:error
13+
csharp_style_var_elsewhere = true:suggestion
14+
csharp_style_var_for_built_in_types = true:suggestion
15+
csharp_style_var_when_type_is_apparent = true:suggestion
16+
dotnet_naming_rule.private_constants_rule.import_to_resharper = as_predefined
17+
dotnet_naming_rule.private_constants_rule.severity = warning
18+
dotnet_naming_rule.private_constants_rule.style = upper_camel_case_style
19+
dotnet_naming_rule.private_constants_rule.symbols = private_constants_symbols
20+
dotnet_naming_rule.private_instance_fields_rule.import_to_resharper = as_predefined
21+
dotnet_naming_rule.private_instance_fields_rule.severity = warning
22+
dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style
23+
dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols
24+
dotnet_naming_rule.private_static_fields_rule.import_to_resharper = as_predefined
25+
dotnet_naming_rule.private_static_fields_rule.severity = warning
26+
dotnet_naming_rule.private_static_fields_rule.style = lower_camel_case_style
27+
dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols
28+
dotnet_naming_rule.private_static_readonly_rule.import_to_resharper = as_predefined
29+
dotnet_naming_rule.private_static_readonly_rule.severity = warning
30+
dotnet_naming_rule.private_static_readonly_rule.style = upper_camel_case_style
31+
dotnet_naming_rule.private_static_readonly_rule.symbols = private_static_readonly_symbols
32+
dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
33+
dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
34+
dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private
35+
dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field
36+
dotnet_naming_symbols.private_constants_symbols.required_modifiers = const
37+
dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private
38+
dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field
39+
dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private
40+
dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
41+
dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
42+
dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
43+
dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
44+
dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static, readonly
45+
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
46+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none
47+
dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
48+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
49+
dotnet_style_predefined_type_for_member_access = true:suggestion
50+
dotnet_style_qualification_for_event = false:suggestion
51+
dotnet_style_qualification_for_field = false:suggestion
52+
dotnet_style_qualification_for_method = false:suggestion
53+
dotnet_style_qualification_for_property = false:suggestion
54+
55+
# ReSharper properties
56+
resharper_apply_on_completion = true
57+
resharper_csharp_wrap_lines = false
58+
resharper_object_creation_when_type_not_evident = target_typed
59+
60+
# ReSharper inspection severities
61+
resharper_arrange_object_creation_when_type_evident_highlighting = error
62+
resharper_arrange_object_creation_when_type_not_evident_highlighting = error
63+
resharper_arrange_redundant_parentheses_highlighting = error
64+
resharper_arrange_static_member_qualifier_highlighting = error
65+
resharper_arrange_this_qualifier_highlighting = hint
66+
resharper_arrange_type_member_modifiers_highlighting = none
67+
resharper_built_in_type_reference_style_for_member_access_highlighting = hint
68+
resharper_built_in_type_reference_style_highlighting = hint
69+
resharper_check_namespace_highlighting = none
70+
resharper_convert_to_using_declaration_highlighting = error
71+
resharper_css_not_resolved_highlighting = warning
72+
resharper_field_can_be_made_read_only_local_highlighting = none
73+
resharper_merge_into_logical_pattern_highlighting = warning
74+
resharper_merge_into_pattern_highlighting = error
75+
resharper_method_has_async_overload_highlighting = warning
76+
resharper_partial_type_with_single_part_highlighting = error
77+
resharper_redundant_base_qualifier_highlighting = warning
78+
resharper_redundant_cast_highlighting = error
79+
resharper_redundant_empty_object_creation_argument_list_highlighting = error
80+
resharper_redundant_empty_object_or_collection_initializer_highlighting = error
81+
resharper_redundant_name_qualifier_highlighting = error
82+
resharper_redundant_suppress_nullable_warning_expression_highlighting = error
83+
resharper_redundant_using_directive_highlighting = error
84+
resharper_redundant_verbatim_string_prefix_highlighting = error
85+
resharper_replace_substring_with_range_indexer_highlighting = warning
86+
resharper_suggest_var_or_type_built_in_types_highlighting = hint
87+
resharper_suggest_var_or_type_elsewhere_highlighting = hint
88+
resharper_suggest_var_or_type_simple_types_highlighting = hint
89+
resharper_unnecessary_whitespace_highlighting = error
90+
resharper_use_await_using_highlighting = warning
91+
resharper_use_deconstruction_highlighting = warning
92+
993
[*.cs]
1094
indent_size = 4:error
1195
charset = utf-8-bom:error
@@ -60,18 +144,23 @@ csharp_new_line_before_finally = true:error
60144
csharp_new_line_before_members_in_object_initializers = true:error
61145
csharp_new_line_before_members_in_anonymous_types = true:error
62146

63-
#braces
64-
#csharp_prefer_braces = true:error
147+
dotnet_style_require_accessibility_modifiers = never:error
65148

66-
# msbuild
67-
[*.{csproj,targets,props}]
68-
indent_size = 2
149+
#braces https://www.jetbrains.com/help/resharper/EditorConfig_CSHARP_CSharpCodeStylePageImplSchema.html#Braces
150+
braces_for_ifelse = required
151+
braces_for_foreach = required
152+
braces_for_while = required
153+
braces_for_dowhile = required
154+
braces_for_lock = required
155+
braces_for_fixed = required
156+
braces_for_for = required
69157

70158
# Xml files
71-
[*.{xml,config,nuspec,resx,vsixmanifest}]
159+
[*.{xml,config,nuspec,resx,vsixmanifest,csproj,targets,props}]
72160
indent_size = 2
73-
resharper_xml_wrap_tags_and_pi = true:error
161+
# https://www.jetbrains.com/help/resharper/EditorConfig_XML_XmlCodeStylePageSchema.html#resharper_xml_blank_line_after_pi
162+
blank_line_after_pi = false
74163

75-
# JSON files
76164
[*.json]
77165
indent_size = 2
166+

‎src/DiffEngine.Tests/AssemblyLocation.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
static class AssemblyLocation
1+
// ReSharper disable RedundantSuppressNullableWarningExpression
2+
static class AssemblyLocation
23
{
34
static AssemblyLocation()
45
{

‎src/DiffEngine.Tests/DefinitionsTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void WriteFoundTools()
6464
File.Delete(md);
6565
using var writer = File.CreateText(md);
6666

67-
writer.WriteLine($@"
67+
writer.WriteLine(@"
6868
6969
## Non-MDI tools
7070
@@ -73,20 +73,20 @@ public void WriteFoundTools()
7373
");
7474

7575
foreach (var tool in Definitions.Tools
76-
.Where(x => !x.IsMdi)
77-
.OrderBy(x => x.Tool.ToString()))
76+
.Where(x => !x.IsMdi)
77+
.OrderBy(x => x.Tool.ToString()))
7878
{
7979
AddTool(writer, tool);
8080
}
8181

82-
writer.WriteLine($@"
82+
writer.WriteLine(@"
8383
8484
## MDI tools
8585
8686
");
8787
foreach (var tool in Definitions.Tools
88-
.Where(x => x.IsMdi)
89-
.OrderBy(x => x.Tool.ToString()))
88+
.Where(x => x.IsMdi)
89+
.OrderBy(x => x.Tool.ToString()))
9090
{
9191
AddTool(writer, tool);
9292
}

‎src/DiffEngine.Tests/DiffEngine.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
1515
<PackageReference Include="Xunit" Version="2.4.1" />
1616
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
17-
<PackageReference Include="ProjectDefaults" Version="1.0.68" PrivateAssets="all" />
17+
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all" />
1818
<PackageReference Include="XunitContext" Version="3.2.1" />
1919
<ProjectReference Include="..\DiffEngine\DiffEngine.csproj" />
2020
</ItemGroup>

‎src/DiffEngine.Tests/DiffToolsTest.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ public void MaxInstancesToLaunch()
1717
public void AddTool()
1818
{
1919
var diffToolPath = FakeDiffTool.Exe;
20+
2021
#region AddTool
22+
2123
var resolvedTool = DiffTools.AddTool(
2224
name: "MyCustomDiffTool",
2325
autoRefresh: true,
@@ -27,8 +29,10 @@ public void AddTool()
2729
targetLeftArguments: (tempFile, targetFile) => $"\"{targetFile}\" \"{tempFile}\"",
2830
targetRightArguments: (tempFile, targetFile) => $"\"{tempFile}\" \"{targetFile}\"",
2931
exePath: diffToolPath,
30-
binaryExtensions: new[] { "jpg" })!;
32+
binaryExtensions: new[] {"jpg"})!;
33+
3134
#endregion
35+
3236
Assert.Equal(resolvedTool.Name, DiffTools.Resolved.First().Name);
3337
Assert.True(DiffTools.TryFindByExtension("jpg", out var forExtension));
3438
Assert.Equal(resolvedTool.Name, forExtension!.Name);
@@ -78,13 +82,15 @@ public void AddToolBasedOn()
7882
async Task AddToolAndLaunch()
7983
{
8084
#region AddToolAndLaunch
85+
8186
var resolvedTool = DiffTools.AddToolBasedOn(
8287
DiffTool.VisualStudio,
8388
name: "MyCustomDiffTool",
8489
targetLeftArguments: (temp, target) => $"\"custom args \"{target}\" \"{temp}\"",
8590
targetRightArguments: (temp, target) => $"\"custom args \"{temp}\" \"{target}\"");
8691

8792
await DiffRunner.LaunchAsync(resolvedTool!, "PathToTempFile", "PathToTargetFile");
93+
8894
#endregion
8995
}
9096

@@ -111,7 +117,6 @@ async Task AddToolAndLaunch()
111117
//}
112118

113119
#if DEBUG
114-
115120
[Fact]
116121
public void ChangeOrder()
117122
{

‎src/DiffEngine.sln.DotSettings

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=_002A_002Ereceived_002E_002A/@EntryIndexedValue">*.received.*</s:String>
3+
<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=_002A_002Everified_002E_002A/@EntryIndexedValue">*.verified.*</s:String>
4+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantSuppressNullableWarningExpression/@EntryIndexedValue">WARNING</s:String>
5+
6+
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Solution_003A_0020Full_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Solution: Full Cleanup"&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeCodeBodyStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" /&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;JSStringLiteralQuotesDescriptor&gt;True&lt;/JSStringLiteralQuotesDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;OptimizeReferenceCommentsTs&gt;True&lt;/OptimizeReferenceCommentsTs&gt;&lt;PublicModifierStyleTs&gt;True&lt;/PublicModifierStyleTs&gt;&lt;ExplicitAnyTs&gt;True&lt;/ExplicitAnyTs&gt;&lt;TypeAnnotationStyleTs&gt;True&lt;/TypeAnnotationStyleTs&gt;&lt;RelativePathStyleTs&gt;True&lt;/RelativePathStyleTs&gt;&lt;AsInsteadOfCastTs&gt;True&lt;/AsInsteadOfCastTs&gt;&lt;RemoveCodeRedundanciesVB&gt;True&lt;/RemoveCodeRedundanciesVB&gt;&lt;Xaml.RedundantFreezeAttribute&gt;True&lt;/Xaml.RedundantFreezeAttribute&gt;&lt;Xaml.RemoveRedundantModifiersAttribute&gt;True&lt;/Xaml.RemoveRedundantModifiersAttribute&gt;&lt;Xaml.RemoveRedundantNameAttribute&gt;True&lt;/Xaml.RemoveRedundantNameAttribute&gt;&lt;Xaml.RemoveRedundantResource&gt;True&lt;/Xaml.RemoveRedundantResource&gt;&lt;Xaml.RemoveRedundantCollectionProperty&gt;True&lt;/Xaml.RemoveRedundantCollectionProperty&gt;&lt;Xaml.RemoveRedundantAttachedPropertySetter&gt;True&lt;/Xaml.RemoveRedundantAttachedPropertySetter&gt;&lt;Xaml.RemoveRedundantStyledValue&gt;True&lt;/Xaml.RemoveRedundantStyledValue&gt;&lt;Xaml.RemoveRedundantNamespaceAlias&gt;True&lt;/Xaml.RemoveRedundantNamespaceAlias&gt;&lt;Xaml.RemoveForbiddenResourceName&gt;True&lt;/Xaml.RemoveForbiddenResourceName&gt;&lt;Xaml.RemoveRedundantGridDefinitionsAttribute&gt;True&lt;/Xaml.RemoveRedundantGridDefinitionsAttribute&gt;&lt;Xaml.RemoveRedundantUpdateSourceTriggerAttribute&gt;True&lt;/Xaml.RemoveRedundantUpdateSourceTriggerAttribute&gt;&lt;Xaml.RemoveRedundantBindingModeAttribute&gt;True&lt;/Xaml.RemoveRedundantBindingModeAttribute&gt;&lt;Xaml.RemoveRedundantGridSpanAttribut&gt;True&lt;/Xaml.RemoveRedundantGridSpanAttribut&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;VBOptimizeImports&gt;True&lt;/VBOptimizeImports&gt;&lt;VBShortenReferences&gt;True&lt;/VBShortenReferences&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;VBReformatCode&gt;True&lt;/VBReformatCode&gt;&lt;VBFormatDocComments&gt;True&lt;/VBFormatDocComments&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;/Profile&gt;</s:String>
7+
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
8+
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
9+
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/WRAP_LINES/@EntryValue">False</s:Boolean>
10+
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/ProtobufCodeFormatting/WRAP_LINES/@EntryValue">False</s:Boolean>
11+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/IndentSubtags/@EntryValue">RemoveIndent</s:String>
12+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/IndentTagContent/@EntryValue">RemoveIndent</s:String>
13+
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/WRAP_LINES/@EntryValue">False</s:Boolean>
14+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
15+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
16+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
17+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎src/DiffEngine/BuildServerDetector.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ static BuildServerDetector()
8181
if (Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") == "true")
8282
{
8383
Detected = true;
84-
return;
8584
}
8685
}
8786

‎src/DiffEngine/ClsCompliant.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly:CLSCompliant(true)]
1+
[assembly: CLSCompliant(true)]

‎src/DiffEngine/Definitions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static Definitions()
2929
Implementation.SublimeMerge(),
3030
Implementation.CodeCompare(),
3131
Implementation.VsCode(),
32-
Implementation.VisualStudio(),
32+
Implementation.VisualStudio()
3333
};
3434
}
3535
}

‎src/DiffEngine/DiffEngine.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="EmptyFiles" Version="2.8.0" PrivateAssets="None" />
1212
<PackageReference Include="Fody" Version="6.6.0" PrivateAssets="all" />
1313
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
14-
<PackageReference Include="ProjectDefaults" Version="1.0.68" PrivateAssets="all" />
14+
<PackageReference Include="ProjectDefaults" Version="1.0.72" PrivateAssets="all" />
1515
<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
1616
<PackageReference Include="IndexRange" Version="1.0.0" PrivateAssets="All" />
1717
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Condition="$(TargetFramework) == 'net461'" />

‎src/DiffEngine/DiffTools.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ public static class DiffTools
99
static Dictionary<string, ResolvedTool> PathLookup = new();
1010
static List<ResolvedTool> resolved = new();
1111

12-
public static IEnumerable<ResolvedTool> Resolved
13-
{
14-
get => resolved;
15-
}
12+
public static IEnumerable<ResolvedTool> Resolved => resolved;
1613

1714
public static ResolvedTool? AddTool(
1815
string name,
@@ -176,6 +173,7 @@ static void AddResolvedToolAtStart(ResolvedTool resolvedTool)
176173
var cleanedExtension = Extensions.GetExtension(extension);
177174
ExtensionLookup[cleanedExtension] = resolvedTool;
178175
}
176+
179177
PathLookup[resolvedTool.ExePath] = resolvedTool;
180178
}
181179

@@ -277,8 +275,8 @@ public static bool TryFind(
277275
}
278276

279277
public static bool TryFindByName(
280-
DiffTool tool,
281-
[NotNullWhen(true)] out ResolvedTool? resolvedTool)
278+
DiffTool tool,
279+
[NotNullWhen(true)] out ResolvedTool? resolvedTool)
282280
{
283281
resolvedTool = resolved.SingleOrDefault(x => x.Tool == tool);
284282
return resolvedTool != null;

0 commit comments

Comments
 (0)