Skip to content

Commit f442111

Browse files
committed
Merge branch 'main' into 1.0.0
# Conflicts: # Directory.Build.props # Src/CSharpier.Cli.Tests/CliTests.cs # Src/CSharpier.Cli/CommandLineFormatter.cs # Src/CSharpier.Cli/EditorConfig/EditorConfigSections.cs # Src/CSharpier.Cli/Options/ConfigurationFileOptions.cs # Src/CSharpier.Cli/Options/OptionsProvider.cs # Src/CSharpier.Cli/Server/CSharpierServiceImplementation.cs # Src/CSharpier.Tests/OptionsProviderTests.cs # Src/CSharpier/DocPrinter/DocFitter.cs
2 parents d0ca389 + e4d504c commit f442111

File tree

70 files changed

+18684
-745
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+18684
-745
lines changed

.csharpierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ build
33
Uploads/
44

55
Tests/MsBuild/TestCases/
6+
7+
Src/CSharpier.Benchmarks/CodeSamples/

.editorconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@ csharp_style_var_for_built_in_types = true
1010
csharp_style_var_when_type_is_apparent = true
1111

1212
[*.{cs,vb}]
13+
dotnet_diagnostic.CA1707.severity = none
14+
dotnet_diagnostic.CA1848.severity = none
15+
dotnet_diagnostic.CA2201.severity = none
16+
dotnet_diagnostic.CA2254.severity = none
17+
1318
dotnet_diagnostic.RS0041.severity = warning
19+
1420
dotnet_diagnostic.IDE0007.severity = warning
1521
dotnet_diagnostic.IDE0018.severity = warning
1622
dotnet_diagnostic.IDE0019.severity = warning

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1010
<EnableNETAnalyzers>true</EnableNETAnalyzers>
1111
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
12+
<AnalysisMode>Recommended</AnalysisMode>
1213
</PropertyGroup>
1314
</Project>

Src/CSharpier.Benchmarks/CSharpier.Benchmarks.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@
1111
<ItemGroup>
1212
<ProjectReference Include="..\CSharpier\CSharpier.Core.csproj" />
1313
</ItemGroup>
14+
<ItemGroup>
15+
<Compile Remove="CodeSamples/*.*" />
16+
<None Include="CodeSamples/*.*" />
17+
</ItemGroup>
1418
</Project>

0 commit comments

Comments
 (0)