Skip to content

Commit

Permalink
Maintainance: latest C# lang version, code style config fixes, nitrox…
Browse files Browse the repository at this point in the history
… underscore patch name spell-check ignore, nitrox.analyzer as nuget (SubnauticaNitrox#2098)
  • Loading branch information
Measurity authored Dec 26, 2023
2 parents 4606d19 + 078063e commit bb510e7
Show file tree
Hide file tree
Showing 21 changed files with 11 additions and 1,018 deletions.
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ indent_style = space
end_of_line = lf

# ReSharper properties
resharper_blank_lines_after_block_statements = 0
resharper_braces_for_ifelse = required_for_multiline
resharper_braces_redundant = false
resharper_keep_existing_attribute_arrangement = true
resharper_wrap_object_and_collection_initializer_style = chop_if_long

[*.{proj, csproj, targets}]
Expand Down
17 changes: 6 additions & 11 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<!-- Set default properties for all projects (can be overridden per project) -->
<PropertyGroup>
<LangVersion>11</LangVersion>
<LangVersion>12</LangVersion>
<Version>1.8.0.0</Version>
<NitroxProject>false</NitroxProject>
<TestLibrary>false</TestLibrary>
Expand All @@ -22,7 +22,7 @@
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectName), '^Nitrox.*$'))">
<NitroxProject>true</NitroxProject>
</PropertyGroup>
<PropertyGroup Condition="'$(NitroxProject)' == 'true' and '$(MSBuildProjectName)' != 'Nitrox.Analyzers'">
<PropertyGroup Condition="'$(NitroxProject)' == 'true'">
<NitroxLibrary>true</NitroxLibrary>
</PropertyGroup>
<PropertyGroup Condition="'$(NitroxLibrary)' == 'true' and '$(MSBuildProjectName)' != 'NitroxModel' and '$(MSBuildProjectName)' != 'NitroxServer' and '$(MSBuildProjectName)' != 'Nitrox.BuildTool'">
Expand All @@ -47,15 +47,6 @@
</When>
</Choose>

<!-- Include our analyzer and code gen library to all Nitrox projects -->
<Choose>
<When Condition="'$(NitroxLibrary)' == 'true'">
<ItemGroup>
<ProjectReference Include="..\Nitrox.Analyzers\Nitrox.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
</When>
</Choose>

<!-- Include default project references to all other "Nitrox*" projects -->
<Choose>
<When Condition="'$(UnityModLibrary)' == 'true'">
Expand All @@ -68,6 +59,10 @@
<ProjectReference Include="$(SolutionDir)NitroxModel\NitroxModel.csproj">
<Name>NitroxModel</Name>
</ProjectReference>
<PackageReference Include="Nitrox.Analyzers" Version="*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</When>
</Choose>
Expand Down
89 changes: 0 additions & 89 deletions Nitrox.Analyzers/Diagnostics/DependencyInjectionMisuseAnalyzer.cs

This file was deleted.

61 changes: 0 additions & 61 deletions Nitrox.Analyzers/Diagnostics/EnumeratorUsageAnalyzer.cs

This file was deleted.

173 changes: 0 additions & 173 deletions Nitrox.Analyzers/Diagnostics/LocalizationAnalyzer.cs

This file was deleted.

Loading

0 comments on commit bb510e7

Please sign in to comment.