Skip to content

Commit 07cee6f

Browse files
halgarihalgari
authored
Update submodules
1 parent 5865036 commit 07cee6f

10 files changed

+112
-81
lines changed

‎.editorconfig

+23-64
Original file line numberDiff line numberDiff line change
@@ -2,76 +2,35 @@ root = true
22

33
[*]
44
charset = utf-8
5+
end_of_line = lf
56
insert_final_newline = true
6-
trim_trailing_whitespace = true
7-
max_line_length = 120
8-
9-
# Microsoft .NET properties
10-
csharp_new_line_before_members_in_object_initializers = false
11-
csharp_preferred_modifier_order = public, private, protected, internal, file, new, static, abstract, virtual, sealed, readonly, override, extern, unsafe, volatile, async, required:suggestion
12-
csharp_style_prefer_utf8_string_literals = true:suggestion
13-
csharp_style_var_elsewhere = true:warning
14-
csharp_style_var_for_built_in_types = true:warning
15-
csharp_style_var_when_type_is_apparent = true:warning
16-
dotnet_naming_rule.unity_serialized_field_rule.import_to_resharper = True
17-
dotnet_naming_rule.unity_serialized_field_rule.resharper_description = Unity serialized field
18-
dotnet_naming_rule.unity_serialized_field_rule.resharper_guid = 5f0fdb63-c892-4d2c-9324-15c80b22a7ef
19-
dotnet_naming_rule.unity_serialized_field_rule.severity = warning
20-
dotnet_naming_rule.unity_serialized_field_rule.style = lower_camel_case_style
21-
dotnet_naming_rule.unity_serialized_field_rule.symbols = unity_serialized_field_symbols
22-
dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
23-
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_accessibilities = *
24-
dotnet_naming_symbols.unity_serialized_field_symbols.applicable_kinds =
25-
dotnet_naming_symbols.unity_serialized_field_symbols.resharper_applicable_kinds = unity_serialised_field
26-
dotnet_naming_symbols.unity_serialized_field_symbols.resharper_required_modifiers = instance
27-
dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
28-
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none
29-
dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
30-
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
31-
dotnet_style_predefined_type_for_member_access = true:suggestion
32-
dotnet_style_qualification_for_event = false:warning
33-
dotnet_style_qualification_for_field = false:warning
34-
dotnet_style_qualification_for_method = false:warning
35-
dotnet_style_qualification_for_property = false:warning
36-
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
37-
38-
# ReSharper properties
39-
resharper_apply_auto_detected_rules = false
40-
resharper_autodetect_indent_settings = true
41-
resharper_csharp_empty_block_style = together_same_line
42-
resharper_csharp_stick_comment = false
43-
resharper_outdent_statement_labels = true
44-
resharper_show_autodetect_configure_formatting_tip = false
45-
resharper_use_indent_from_vs = false
46-
resharper_wrap_lines = true
47-
48-
# ReSharper inspection severities
49-
resharper_arrange_redundant_parentheses_highlighting = hint
50-
resharper_arrange_type_member_modifiers_highlighting = hint
51-
resharper_arrange_type_modifiers_highlighting = hint
52-
resharper_built_in_type_reference_style_for_member_access_highlighting = hint
53-
resharper_built_in_type_reference_style_highlighting = hint
54-
55-
[*.cs]
56-
indent_size = 4
577
indent_style = space
58-
tab_width = 4
59-
60-
# CS4014: Task not awaited
61-
dotnet_diagnostic.cs4014.severity = error
62-
63-
# CS8509: Missing switch case for named enum value
64-
dotnet_diagnostic.CS8509.severity = error
65-
66-
# CS824: Missing switch case for unnamed enum value
67-
dotnet_diagnostic.CS8524.severity = none
8+
indent_size = 4
689

69-
# Enums should not have duplicate values
70-
dotnet_diagnostic.CA1069.severity = error
10+
[{*.har,*.jsb2,*.jsb3,*.json,*.jsonc,*.postman_collection,*.postman_collection.json,*.postman_environment,*.postman_environment.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,jest.config}]
11+
indent_style = space
12+
indent_size = 2
7113

7214
[{*.yaml,*.yml}]
7315
indent_style = space
7416
indent_size = 2
7517

76-
[*.csproj]
18+
[{*.bash,*.sh,*.zsh}]
19+
indent_style = space
20+
indent_size = 2
21+
22+
[*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,c++m,cc,ccm,cginc,compute,cp,cpp,cppm,cs,cshtml,cu,cuh,cxx,cxxm,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,ixx,master,ml,mli,mpp,mq4,mq5,mqh,mxx,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,uxml,vb,xaml,xamlx,xoml,xsd}]
23+
indent_style = space
7724
indent_size = 4
25+
tab_width = 4
26+
27+
# Verify settings
28+
[*.{received,verified}.{txt,xml,json}]
29+
charset = "utf-8-bom"
30+
end_of_line = lf
31+
indent_size =
32+
indent_style =
33+
insert_final_newline = false
34+
tab_width =
35+
trim_trailing_whitespace = false
36+

‎.globalconfig

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
is_global = true
2+
3+
# CS4014: Task not awaited
4+
dotnet_diagnostic.cs4014.severity = error
5+
6+
# CS8509: Missing switch case for named enum value
7+
dotnet_diagnostic.CS8509.severity = error
8+
9+
# CS824: Missing switch case for unnamed enum value
10+
dotnet_diagnostic.CS8524.severity = none
11+
12+
# Enums should not have duplicate values
13+
dotnet_diagnostic.CA1069.severity = error
14+
15+
# Non-constant fields should not be visible
16+
dotnet_diagnostic.CA2211.severity = error
17+
18+
# Don't call Enumerable.Cast<T> or Enumerable.OfType<T> with incompatible types
19+
dotnet_diagnostic.CA2021.severity = error
20+

‎Directory.Build.props

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<IsPackable>false</IsPackable>
5-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
65
</PropertyGroup>
76

87
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
@@ -20,4 +19,8 @@
2019
<!-- SYSLIB1006: Multiple logging methods cannot use the same event ID -->
2120
<NoWarn>$(NoWarn);SYSLIB1006</NoWarn>
2221
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<PackageReference Include="JetBrains.Annotations" Version="2023.*" PrivateAssets="all" />
25+
</ItemGroup>
2326
</Project>

‎Directory.Build.targets

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<Project>
22
<PropertyGroup>
33
<Nullable>enable</Nullable>
4-
<LangVersion>13</LangVersion>
4+
<LangVersion>11</LangVersion>
55
<ImplicitUsings>false</ImplicitUsings>
66
<WarningsAsErrors>Nullable</WarningsAsErrors>
7-
<TargetFramework>net9.0</TargetFramework>
87
</PropertyGroup>
98
</Project>

‎NuGet.Build.props

+7-5
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
1313
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1414

15-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
16-
1715
<!-- This is the URL to the main project, not the individual package. -->
18-
<PackageProjectUrl>https://github.com/Nexus-Mods/NexusMods.Cascade</PackageProjectUrl>
16+
<PackageProjectUrl>https://github.com/Nexus-Mods/NexusMods.App</PackageProjectUrl>
1917
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2018

2119
<IncludeSymbols>true</IncludeSymbols>
@@ -30,7 +28,11 @@
3028
</PropertyGroup>
3129

3230
<ItemGroup>
33-
<None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="assets"/>
34-
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="docs"/>
31+
<None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="assets" />
32+
<None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="docs" />
33+
</ItemGroup>
34+
35+
<ItemGroup>
36+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="all" />
3537
</ItemGroup>
3638
</Project>

‎docs/Nexus

‎extern/meta

‎tests/Directory.Build.props

+48-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,51 @@
11
<Project>
2-
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
33

4+
<PropertyGroup>
5+
<IsPackable>false</IsPackable>
6+
<IsTestProject>true</IsTestProject>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="Moq" Version="4.*" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="AutoFixture" Version="4.*" />
15+
<PackageReference Include="AutoFixture.AutoMoq" Version="4.*" />
16+
<PackageReference Include="AutoFixture.Xunit2" Version="4.*" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<PackageReference Include="FluentAssertions" Version="6.*" />
21+
<PackageReference Include="FluentAssertions.OneOf" Version="0.0.5" />
22+
<PackageReference Include="FluentAssertions.Analyzers" Version="0.18.0">
23+
<PrivateAssets>all</PrivateAssets>
24+
<IncludeAssets>runtime; build; contentfiles; analyzers; buildtransitive</IncludeAssets>
25+
</PackageReference>
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<PackageReference Include="xunit" Version="2.4.*" />
30+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.*">
31+
<PrivateAssets>all</PrivateAssets>
32+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
33+
</PackageReference>
34+
<PackageReference Include="Xunit.SkippableFact" Version="1.4.*" />
35+
<PackageReference Include="Xunit.DependencyInjection" Version="8.*" />
36+
<PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.*" />
37+
<PackageReference Include="Xunit.DependencyInjection.SkippableFact" Version="8.*" />
38+
</ItemGroup>
39+
40+
<ItemGroup>
41+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.*" />
42+
<PackageReference Include="coverlet.collector" Version="6.*">
43+
<PrivateAssets>all</PrivateAssets>
44+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
45+
</PackageReference>
46+
<PackageReference Include="GitHubActionsTestLogger" Version="2.*">
47+
<PrivateAssets>all</PrivateAssets>
48+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
49+
</PackageReference>
50+
</ItemGroup>
451
</Project>

‎tests/SharedAssemblyAttributes.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
// ReSharper disable once RedundantNameQualifier
2-
3-
using System.Diagnostics.CodeAnalysis;
4-
5-
[assembly: ExcludeFromCodeCoverage]
2+
[assembly: global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]

‎tests/SharedUsings.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
1+
// ReSharper disable RedundantUsingDirective.Global
2+
global using Xunit;
3+
global using FluentAssertions;
4+
global using AutoFixture;
5+
global using AutoFixture.Xunit2;

0 commit comments

Comments
 (0)