Skip to content

Commit 077ca44

Browse files
neueccneuecc
authored
Merge pull request #165 from filzrev/chore-add-editorconfig-settings
chore: Add `.editorconfig` file and apply settings
2 parents 26bd037 + 4fdde6a commit 077ca44

File tree

65 files changed

+297
-250
lines changed

Some content is hidden

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

65 files changed

+297
-250
lines changed

‎.editorconfig‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# top-most EditorConfig file
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 4
8+
insert_final_newline=true
9+
trim_trailing_whitespace=true
10+
11+
# Visual Studio Spell checker configs (https://learn.microsoft.com/en-us/visualstudio/ide/text-spell-checker?view=vs-2022#how-to-customize-the-spell-checker)
12+
spelling_exclusion_path = ./exclusion.dic
13+
14+
# Solution files
15+
[*.{sln,slnx}]
16+
indent_size = 2
17+
18+
# MSBuild project files
19+
[*.{csproj,props,targets}]
20+
indent_size = 2
21+
22+
# Xml config files
23+
[*.{ruleset,config,nuspec,resx,runsettings,DotSettings}]
24+
indent_size = 2
25+
26+
# JSON files
27+
[*.json]
28+
indent_size = 2
29+
30+
# YAML files
31+
[*.{yml]
32+
indent_size = 2
33+
34+
# PowerShell files
35+
[*.ps1]
36+
indent_size = 2
37+
38+
# Markdown files
39+
[*.md]
40+
charset = utf-8-bom
41+
trim_trailing_whitespace = false
42+
43+
# C# code style settings
44+
[*.{cs}]
45+
46+
## TODO: Define custom settings

‎ConsoleAppFramework.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6DF6534A-0F9D-44A4-BF89-AE1F3B243914}"
1313
ProjectSection(SolutionItems) = preProject
1414
.dockerignore = .dockerignore
15+
.editorconfig = .editorconfig
1516
.gitignore = .gitignore
1617
Directory.Build.props = Directory.Build.props
1718
ReadMe.md = ReadMe.md
18-
exclusion.dic = exclusion.dic
19+
exclusion.dic = exclusion.dic
1920
EndProjectSection
2021
EndProject
2122
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppFramework", "src\ConsoleAppFramework\ConsoleAppFramework.csproj", "{09BEEA7B-B6D3-4011-BCAB-6DF976713695}"

‎ReadMe.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ConsoleAppFramework
1+
ConsoleAppFramework
22
===
33
[![GitHub Actions](https://github.com/Cysharp/ConsoleAppFramework/workflows/Build-Debug/badge.svg)](https://github.com/Cysharp/ConsoleAppFramework/actions) [![Releases](https://img.shields.io/github/release/Cysharp/ConsoleAppFramework.svg)](https://github.com/Cysharp/ConsoleAppFramework/releases)
44

‎exclusion.dic‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
abcd
1+
abcd
22
abcde
33
abcdefg
44
aiueo

‎sandbox/CliFrameworkBenchmark/Benchmark.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,4 @@ public void ExecuteSpectreConsoleCli()
124124
// app.Add("", ConsoleAppFrameworkCommand.Execute);
125125
// app.Run(Arguments);
126126
//}
127-
}
127+
}

‎sandbox/CliFrameworkBenchmark/CliFrameworkBenchmark.csproj‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<nullable>annotations</nullable>
8-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9-
<IsPackable>false</IsPackable>
10-
<Configurations>Debug;Release</Configurations>
11-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<nullable>annotations</nullable>
8+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
9+
<IsPackable>false</IsPackable>
10+
<Configurations>Debug;Release</Configurations>
11+
</PropertyGroup>
1212

13-
<ItemGroup>
14-
<Compile Include="..\GeneratorSandbox\Filters.cs" />
15-
</ItemGroup>
13+
<ItemGroup>
14+
<Compile Include="..\GeneratorSandbox\Filters.cs" />
15+
</ItemGroup>
1616

17-
<ItemGroup>
18-
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
19-
<PackageReference Include="CliFx" Version="2.3.5" />
20-
<PackageReference Include="clipr" Version="1.6.1" />
21-
<PackageReference Include="Cocona" Version="2.2.0" />
22-
<PackageReference Include="Cocona.Lite" Version="2.2.0" />
23-
<PackageReference Include="CommandLineParser" Version="2.9.1" />
24-
<!--<PackageReference Include="ConsoleAppFramework" Version="4.2.4" />-->
25-
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
26-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
27-
<PackageReference Include="PowerArgs" Version="4.0.3" />
28-
<PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
29-
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
30-
<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
31-
</ItemGroup>
17+
<ItemGroup>
18+
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
19+
<PackageReference Include="CliFx" Version="2.3.5" />
20+
<PackageReference Include="clipr" Version="1.6.1" />
21+
<PackageReference Include="Cocona" Version="2.2.0" />
22+
<PackageReference Include="Cocona.Lite" Version="2.2.0" />
23+
<PackageReference Include="CommandLineParser" Version="2.9.1" />
24+
<!--<PackageReference Include="ConsoleAppFramework" Version="4.2.4" />-->
25+
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
27+
<PackageReference Include="PowerArgs" Version="4.0.3" />
28+
<PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
29+
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
30+
<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
31+
</ItemGroup>
3232

3333

34-
<ItemGroup>
35-
<ProjectReference Include="..\..\src\ConsoleAppFramework\ConsoleAppFramework.csproj">
36-
<OutputItemType>Analyzer</OutputItemType>
37-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
38-
</ProjectReference>
39-
</ItemGroup>
34+
<ItemGroup>
35+
<ProjectReference Include="..\..\src\ConsoleAppFramework\ConsoleAppFramework.csproj">
36+
<OutputItemType>Analyzer</OutputItemType>
37+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
38+
</ProjectReference>
39+
</ItemGroup>
4040

4141
</Project>

‎sandbox/CliFrameworkBenchmark/Commands/CliFxCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ public class CliFxCommand : CliFx.ICommand
1414

1515
[CommandOption("bool", 'b')]
1616
public bool BoolOption { get; set; }
17-
17+
1818
public ValueTask ExecuteAsync(IConsole console) => ValueTask.CompletedTask;
1919
}

‎sandbox/CliFrameworkBenchmark/Commands/CliprCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ public class CliprCommand
1616
public void Execute()
1717
{
1818
}
19-
}
19+
}

‎sandbox/CliFrameworkBenchmark/Commands/CoconaCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ public void Execute(
1111
bool boolOption)
1212
{
1313
}
14-
}
14+
}

‎sandbox/CliFrameworkBenchmark/Commands/CommandLineParserCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ public class CommandLineParserCommand
1414
public void Execute()
1515
{
1616
}
17-
}
17+
}

0 commit comments

Comments
 (0)