Skip to content

Commit 3ec62e0

Browse files
committed
refs
1 parent cdd7528 commit 3ec62e0

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

src/.editorconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ csharp_new_line_before_finally = true
134134
csharp_new_line_before_members_in_object_initializers = true
135135
csharp_new_line_before_members_in_anonymous_types = true
136136
resharper_wrap_before_first_type_parameter_constraint = true
137-
resharper_wrap_extends_list_style = chop_always
137+
resharper_wrap_extends_list_style = chop_always
138138
resharper_wrap_after_dot_in_method_calls = false
139139
resharper_wrap_before_binary_pattern_op = false
140140
resharper_wrap_object_and_collection_initializer_style = chop_always
@@ -161,11 +161,12 @@ resharper_braces_for_fixed = required
161161
resharper_braces_for_for = required
162162

163163
# Xml files
164-
[*.{xml,config,nuspec,resx,vsixmanifest,csproj,targets,props}]
164+
[*.{xml,config,nuspec,resx,vsixmanifest,csproj,targets,props,fsproj}]
165165
indent_size = 2
166166
# https://www.jetbrains.com/help/resharper/EditorConfig_XML_XmlCodeStylePageSchema.html#resharper_xml_blank_line_after_pi
167167
resharper_blank_line_after_pi = false
168168
resharper_space_before_self_closing = true
169+
ij_xml_space_inside_empty_tag = true
169170

170171
[*.json]
171172
indent_size = 2

src/EmptyFiles.Tool/EmptyFiles.Tool.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<ProjectReference Include="..\EmptyFiles\EmptyFiles.csproj" PrivateAssets="None" />
16-
<PackageReference Include="ProjectDefaults" Version="1.0.102" PrivateAssets="all" />
16+
<PackageReference Include="ProjectDefaults" Version="1.0.106" PrivateAssets="all" />
1717
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
1818
<None Include="$(ProjectDir)..\..\files\**\empty.*">
1919
<Pack>true</Pack>

src/EmptyFiles/EmptyFiles.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageReference Include="System.Memory" Version="4.5.5" Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' OR '$(TargetFrameworkIdentifier)' == '.NETFramework'" />
10-
<PackageReference Include="ProjectDefaults" Version="1.0.102" PrivateAssets="all" />
10+
<PackageReference Include="ProjectDefaults" Version="1.0.106" PrivateAssets="all" />
1111
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
1212
<PackageReference Include="Polyfill" Version="1.33.1" PrivateAssets="all" />
1313
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="$(TargetFramework) =='net461'" />

src/Shared.sln.DotSettings

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantUsingDirective_002EGlobal/@EntryIndexedValue">ERROR</s:String>
3737
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceAsyncWithTaskReturn/@EntryIndexedValue">ERROR</s:String>
3838
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SeparateLocalFunctionsWithJumpStatement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
39+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SimplifyConditionalTernaryExpression/@EntryIndexedValue">DO_NOT_SHOW</s:String>
3940
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringLiteralAsInterpolationArgument/@EntryIndexedValue">ERROR</s:String>
4041
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=TryStatementsCanBeMerged/@EntryIndexedValue">ERROR</s:String>
4142
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedParameter_002EGlobal/@EntryIndexedValue">ERROR</s:String>
@@ -151,7 +152,10 @@
151152
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
152153
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
153154
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
155+
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_FIRST_METHOD_CALL/@EntryValue">True</s:Boolean>
156+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_METHOD_CALLS/@EntryValue">CHOP_ALWAYS</s:String>
154157
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LINES/@EntryValue">False</s:Boolean>
158+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
155159
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/WRAP_LINES/@EntryValue">False</s:Boolean>
156160
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/ProtobufCodeFormatting/WRAP_LINES/@EntryValue">False</s:Boolean>
157161
<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/IndentSubtags/@EntryValue">RemoveIndent</s:String>

src/Tests/Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="Polyfill" Version="1.33.1" PrivateAssets="all" />
1212
<PackageReference Include="NUnit" Version="4.0.1" />
1313
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
14-
<PackageReference Include="ProjectDefaults" Version="1.0.102" PrivateAssets="all" />
14+
<PackageReference Include="ProjectDefaults" Version="1.0.106" PrivateAssets="all" />
1515
<ProjectReference Include="..\EmptyFiles\EmptyFiles.csproj" />
1616
<Using Include="NUnit.Framework.Legacy.ClassicAssert" Static="True" />
1717
<Using Include="NUnit.Framework.Assert" Static="True" />

0 commit comments

Comments
 (0)