Skip to content

Commit 0196f4a

Browse files
authored
Solution and editor configuration cleanup (bitwarden#3099)
* Solution and editor configuration cleanup * Editor tweaks
1 parent 1d9aeb3 commit 0196f4a

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

.editorconfig

+5-6
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,17 @@ root = true
55

66
# Don't use tabs for indentation.
77
[*]
8-
end_of_line = lf
98
indent_style = space
9+
end_of_line = lf
10+
charset = utf-8
11+
trim_trailing_whitespace = true
12+
insert_final_newline = true
13+
guidelines = 120
1014
# (Please don't specify an indent_size here; that has too many unintended consequences.)
1115

1216
# Code files
1317
[*.{cs,csx,vb,vbx}]
1418
indent_size = 4
15-
insert_final_newline = true
1619
charset = utf-8-bom
1720

1821
# Xml project files
@@ -120,7 +123,3 @@ csharp_style_namespace_declarations = file_scoped:warning
120123
# Switch expression
121124
dotnet_diagnostic.CS8509.severity = error # missing switch case for named enum value
122125
dotnet_diagnostic.CS8524.severity = none # missing switch case for unnamed enum value
123-
124-
# All files
125-
[*]
126-
guidelines = 120

Directory.Build.props

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
5-
<!--2022.6.2-->
65
<Version>2023.7.0</Version>
76
<RootNamespace>Bit.$(MSBuildProjectName)</RootNamespace>
87
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
@@ -64,4 +63,4 @@
6463
</ItemGroup>
6564
</Target>
6665

67-
</Project>
66+
</Project>

bitwarden-server.sln

+11-9
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DD5BD056-4
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{458155D3-BCBC-481D-B37A-40D2ED10F0A4}"
1313
ProjectSection(SolutionItems) = preProject
14-
.editorconfig = .editorconfig
15-
.gitignore = .gitignore
16-
build.sh = build.sh
17-
.github\workflows\build.yml = .github\workflows\build.yml
1814
Directory.Build.props = Directory.Build.props
19-
dotnet-tools.json = dotnet-tools.json
20-
LICENSE.txt = LICENSE.txt
21-
LICENSE_AGPL.txt = LICENSE_AGPL.txt
22-
LICENSE_BITWARDEN.txt = LICENSE_BITWARDEN.txt
23-
NuGet.Config = NuGet.Config
15+
global.json = global.json
16+
.gitignore = .gitignore
2417
README.md = README.md
18+
.editorconfig = .editorconfig
19+
TRADEMARK_GUIDELINES.md = TRADEMARK_GUIDELINES.md
2520
SECURITY.md = SECURITY.md
21+
NuGet.Config = NuGet.Config
22+
LICENSE_FAQ.md = LICENSE_FAQ.md
23+
LICENSE_BITWARDEN.txt = LICENSE_BITWARDEN.txt
24+
LICENSE_AGPL.txt = LICENSE_AGPL.txt
25+
LICENSE.txt = LICENSE.txt
26+
CONTRIBUTING.md = CONTRIBUTING.md
27+
.dockerignore = .dockerignore
2628
EndProjectSection
2729
EndProject
2830
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{3973D21B-A692-4B60-9B70-3631C057423A}"

0 commit comments

Comments
 (0)