Skip to content

Commit 2b81942

Browse files
committed
Remove stylecope
1 parent 33ff04d commit 2b81942

4 files changed

+13
-36
lines changed

.editorconfig

+9-10
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ indent_style = space
1010

1111
# Code files
1212
[*.{cs,csx,vb,vbx}]
13+
file_header_template = "Copyright (c) Jacob Viau. All rights reserved.\nLicensed under the Apache License 2.0. See LICENSE file in the project root for full license information."
1314
indent_size = 4
1415
insert_final_newline = true
1516
charset = utf-8-bom
17+
trim_trailing_whitespace = true
1618

1719
[*.xaml]
1820
indent_size = 4
@@ -123,6 +125,9 @@ dotnet_naming_style.pascal_case_and_prefix_with_I_style.capitalization
123125
# CSharp code style settings:
124126
[*.cs]
125127

128+
# Modifier preferences
129+
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:warning
130+
126131
# Prefer "var" only when the type is apparent
127132
csharp_style_var_for_built_in_types = false:suggestion
128133
csharp_style_var_when_type_is_apparent = true:suggestion
@@ -157,6 +162,9 @@ dotnet_style_prefer_conditional_expression_over_return = false
157162
dotnet_style_prefer_conditional_expression_over_assignment = false
158163
dotnet_style_prefer_auto_properties = false
159164

165+
# 'using' directive preferences
166+
csharp_using_directive_placement = outside_namespace:warning
167+
160168
# Newline settings
161169
csharp_new_line_before_open_brace = all
162170
csharp_new_line_before_else = true
@@ -170,7 +178,7 @@ csharp_new_line_between_query_expression_clauses = true
170178
csharp_indent_case_contents = true
171179
csharp_indent_case_contents_when_block = false
172180
csharp_indent_switch_labels = true
173-
csharp_indent_labels = no_change
181+
csharp_indent_labels = one_less_than_current
174182
csharp_indent_block_contents = true
175183
csharp_indent_braces = false
176184

@@ -242,15 +250,6 @@ dotnet_diagnostic.CA2007.severity = none # Consider calling ConfigureAwait on th
242250
dotnet_diagnostic.CA2326.severity = none # Do not use TypeNameHandling values other than None
243251
dotnet_diagnostic.CA2327.severity = none # Do not use insecure JsonSerializerSettings
244252

245-
# StyleCop rules
246-
dotnet_diagnostic.SA1101.severity = none # Prefix local calls with this
247-
dotnet_diagnostic.SA1308.severity = none # Variable names should not be prefixed
248-
dotnet_diagnostic.SA1309.severity = none # Field names should not begin with underscore
249-
dotnet_diagnostic.SA1311.severity = none # Static readonly fields should begin with upper-case letter
250-
dotnet_diagnostic.SX1101.severity = error # Do not prefix local calls with 'this.'
251-
dotnet_diagnostic.SX1309.severity = error # Field names should begin with underscore
252-
dotnet_diagnostic.SX1309S.severity = none # Static field names should begin with underscore
253-
254253
[**/*Tests/**/*.cs]
255254
# We allow usage of "var" inside tests as it reduces churn as we remove/rename types
256255
csharp_style_var_for_built_in_types = true:none

Directory.Packages.props

-7
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
3636
</ItemGroup>
3737

38-
<!-- Nuget -->
39-
<ItemGroup>
40-
</ItemGroup>
41-
4238
<!-- Test projects -->
4339
<ItemGroup>
4440
<PackageVersion Include="Bogus" Version="27.0.1" />
@@ -57,9 +53,6 @@
5753
<!-- Global -->
5854
<ItemGroup>
5955
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" Condition="'$(EnableGitVersioning)' != 'false'" />
60-
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406" Condition="'$(EnableStyleCop)' != 'false'" />
61-
<GlobalPackageReference Include="StyleCop.CSharp.Async.Rules" Version="6.1.41" Condition="'$(EnableStyleCop)' != 'false'" />
62-
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" Condition="'$(IsPackable)' != 'false'" />
6356
</ItemGroup>
6457

6558
</Project>

src/DurableTask.Hosting.sln

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29911.98
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.12.35506.116 d17.12
55
MinimumVisualStudioVersion = 15.0.26124.0
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DurableTask.DependencyInjection", "DurableTask.DependencyInjection", "{F7C54D09-8F90-40A6-A7ED-DBF11FD97354}"
77
EndProject
@@ -220,8 +220,10 @@ Global
220220
{971A0F3F-135E-4F8A-AAE0-9D1EDE7CA6B6} = {27F8590A-1B83-49D9-A5B9-E7CF7E106FE6}
221221
{0BF2E951-4F1F-46DC-9518-20565E3FD11A} = {428F76B3-2E22-43A4-ADBE-273B42492BE3}
222222
{09A0BB2C-379F-4F62-AE98-955978CA5A66} = {428F76B3-2E22-43A4-ADBE-273B42492BE3}
223+
{13175B27-AEBC-4535-8B0F-E2A6A7E98E96} = {796C6FFF-5FB6-4918-88B7-61B6EA4D2801}
223224
{052B06E1-0268-446A-BA1A-57B8A8AD8B22} = {2CEE0150-2FD3-4246-82DA-2EB68A95FCF3}
224225
{E1AD91B6-6458-4502-9AC1-0FFE93D2FBE6} = {2CEE0150-2FD3-4246-82DA-2EB68A95FCF3}
226+
{A51D0C94-E0B9-4063-A8C9-7424362CDB80} = {796C6FFF-5FB6-4918-88B7-61B6EA4D2801}
225227
EndGlobalSection
226228
GlobalSection(ExtensibilityGlobals) = postSolution
227229
SolutionGuid = {65A5E590-4609-44E1-B012-0EA997E18DB7}

stylecop.json

-17
This file was deleted.

0 commit comments

Comments
 (0)