Skip to content

Commit ad10655

Browse files
committed
Fix writing swagger.json to disk, cleanupcode
1 parent eb8b23d commit ad10655

16 files changed

+4438
-3042
lines changed

Diff for: .editorconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ dotnet_naming_symbols.private_const_fields.required_modifiers = const
102102

103103
dotnet_naming_symbols.private_static_readonly_fields.applicable_kinds = field
104104
dotnet_naming_symbols.private_static_readonly_fields.applicable_accessibilities = private
105-
dotnet_naming_symbols.private_static_readonly_fields.required_modifiers = static, readonly
105+
dotnet_naming_symbols.private_static_readonly_fields.required_modifiers = static,readonly
106106

107107
dotnet_naming_symbols.private_static_or_readonly_fields.applicable_kinds = field
108108
dotnet_naming_symbols.private_static_or_readonly_fields.applicable_accessibilities = private
109109
dotnet_naming_symbols.private_static_or_readonly_fields.required_modifiers = static readonly
110110

111-
dotnet_naming_symbols.locals_and_parameters.applicable_kinds = local, parameter
111+
dotnet_naming_symbols.locals_and_parameters.applicable_kinds = local,parameter
112112
dotnet_naming_symbols.locals_and_parameters.applicable_accessibilities = *
113113

114114
dotnet_naming_symbols.types_and_members.applicable_kinds = *

Diff for: Build.ps1

+1-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ function FetchBaseBranchIfNotMaster() {
104104
FetchBaseBranchIfNotMaster
105105

106106
dotnet tool restore
107-
CheckLastExitCode
107+
CheckLastExitCode
108108

109109
dotnet build -c Release
110110
CheckLastExitCode
@@ -113,7 +113,6 @@ RunInspectCode
113113
RunCleanupCode
114114

115115
dotnet test -c Release --no-build --collect:"XPlat Code Coverage"
116-
117116
CheckLastExitCode
118117

119118
ReportCodeCoverage

Diff for: CSharpGuidelinesAnalyzer.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<cSharpGuidelinesAnalyzerSettings>
3-
<setting rule="AV1561" name="MaxParameterCount" value="6"/>
4-
<setting rule="AV1561" name="MaxConstructorParameterCount" value="13"/>
3+
<setting rule="AV1561" name="MaxParameterCount" value="6" />
4+
<setting rule="AV1561" name="MaxConstructorParameterCount" value="13" />
55
</cSharpGuidelinesAnalyzerSettings>

Diff for: Directory.Build.props

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<Project>
2-
<PropertyGroup>
3-
<TargetFrameworkName>net6.0</TargetFrameworkName>
4-
<AspNetVersion>6.0.*</AspNetVersion>
5-
<EFCoreVersion>6.0.*</EFCoreVersion>
6-
<EFCorePostgresVersion>6.0.*</EFCorePostgresVersion>
7-
<MicrosoftCodeAnalysisVersion>4.*</MicrosoftCodeAnalysisVersion>
8-
<HumanizerVersion>2.*</HumanizerVersion>
9-
<SwashbuckleVersion>6.2.*</SwashbuckleVersion>
10-
<JsonApiDotNetCoreVersionPrefix>5.0.0</JsonApiDotNetCoreVersionPrefix>
11-
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
12-
<WarningLevel>9999</WarningLevel>
13-
<Nullable>enable</Nullable>
14-
<ImplicitUsings>enable</ImplicitUsings>
15-
<IsPackable>false</IsPackable>
16-
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
17-
</PropertyGroup>
2+
<PropertyGroup>
3+
<TargetFrameworkName>net6.0</TargetFrameworkName>
4+
<AspNetVersion>6.0.*</AspNetVersion>
5+
<EFCoreVersion>6.0.*</EFCoreVersion>
6+
<EFCorePostgresVersion>6.0.*</EFCorePostgresVersion>
7+
<MicrosoftCodeAnalysisVersion>4.*</MicrosoftCodeAnalysisVersion>
8+
<HumanizerVersion>2.*</HumanizerVersion>
9+
<SwashbuckleVersion>6.2.*</SwashbuckleVersion>
10+
<JsonApiDotNetCoreVersionPrefix>5.0.0</JsonApiDotNetCoreVersionPrefix>
11+
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
12+
<WarningLevel>9999</WarningLevel>
13+
<Nullable>enable</Nullable>
14+
<ImplicitUsings>enable</ImplicitUsings>
15+
<IsPackable>false</IsPackable>
16+
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
17+
</PropertyGroup>
1818

19-
<ItemGroup>
20-
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All"/>
21-
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.7.1" PrivateAssets="All"/>
22-
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False"/>
23-
</ItemGroup>
19+
<ItemGroup>
20+
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
21+
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.7.1" PrivateAssets="All" />
22+
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
23+
</ItemGroup>
2424

25-
<PropertyGroup Condition="'$(Configuration)'=='Release'">
26-
<NoWarn>$(NoWarn);1591</NoWarn>
27-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
28-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
29-
</PropertyGroup>
25+
<PropertyGroup Condition="'$(Configuration)'=='Release'">
26+
<NoWarn>$(NoWarn);1591</NoWarn>
27+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
28+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
29+
</PropertyGroup>
3030

3131
<!-- Test Project Dependencies -->
3232
<PropertyGroup>

Diff for: test/OpenApiTests/NamingConvention/CamelCase/CamelCaseTests.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
namespace OpenApiTests.NamingConvention.CamelCase;
55

6-
public sealed class CamelCaseTests
7-
: IClassFixture<OpenApiTestContext<CamelCaseNamingConventionStartup<NamingConventionDbContext>, NamingConventionDbContext>>
6+
public sealed class CamelCaseTests : IClassFixture<OpenApiTestContext<CamelCaseNamingConventionStartup<NamingConventionDbContext>, NamingConventionDbContext>>
87
{
98
private readonly OpenApiTestContext<CamelCaseNamingConventionStartup<NamingConventionDbContext>, NamingConventionDbContext> _testContext;
109

@@ -435,4 +434,4 @@ public void Camel_casing_convention_is_applied_to_DeleteRelationship_endpoint()
435434
});
436435
});
437436
}
438-
}
437+
}

0 commit comments

Comments
 (0)