Skip to content

Commit eb8b23d

Browse files
Bart Koelmanmaurei
Bart Koelman
authored and
maurei
committed
Reformat project files
1 parent 94f3c87 commit eb8b23d

File tree

2 files changed

+83
-105
lines changed

2 files changed

+83
-105
lines changed

Diff for: ‎test/OpenApiClientTests/OpenApiClientTests.csproj

+60-76
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,66 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
4-
</PropertyGroup>
2+
<PropertyGroup>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
4+
</PropertyGroup>
55

6-
<ItemGroup>
7-
<ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi.Client\JsonApiDotNetCore.OpenApi.Client.csproj"/>
8-
<ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj"/>
9-
</ItemGroup>
6+
<ItemGroup>
7+
<ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi.Client\JsonApiDotNetCore.OpenApi.Client.csproj" />
8+
<ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
9+
</ItemGroup>
1010

11-
<ItemGroup>
12-
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All"/>
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)"/>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)"/>
15-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
16-
<PackageReference Include="NSwag.ApiDescription.Client" Version="13.10.9">
17-
<PrivateAssets>all</PrivateAssets>
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19-
</PackageReference>
20-
<PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="5.0.9">
21-
<PrivateAssets>all</PrivateAssets>
22-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23-
</PackageReference>
24-
<PackageReference Include="NSwag.ApiDescription.Client" Version="13.13.2">
25-
<PrivateAssets>all</PrivateAssets>
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
</PackageReference>
28-
</ItemGroup>
11+
<ItemGroup>
12+
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
13+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
15+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
16+
<PackageReference Include="NSwag.ApiDescription.Client" Version="13.10.9">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
20+
<PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="5.0.9">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
24+
<PackageReference Include="NSwag.ApiDescription.Client" Version="13.13.2">
25+
<PrivateAssets>all</PrivateAssets>
26+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27+
</PackageReference>
28+
</ItemGroup>
2929

30-
<ItemGroup>
31-
<OpenApiReference Include="..\OpenApiTests\LegacyOpenApiIntegration\swagger.json">
32-
<Namespace>OpenApiClientTests.LegacyClient.GeneratedCode</Namespace>
33-
<ClassName>OpenApiClient</ClassName>
34-
<OutputPath>OpenApiClient.cs</OutputPath>
35-
<CodeGenerator>NSwagCSharp</CodeGenerator>
36-
<Options>/UseBaseUrl:false /GenerateClientInterfaces:true /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:JsonApiDotNetCore.OpenApi.Client.Exceptions</Options>
37-
</OpenApiReference>
38-
</ItemGroup>
30+
<ItemGroup>
31+
<OpenApiReference Include="..\OpenApiTests\LegacyOpenApiIntegration\swagger.json">
32+
<Namespace>OpenApiClientTests.LegacyClient.GeneratedCode</Namespace>
33+
<ClassName>OpenApiClient</ClassName>
34+
<OutputPath>OpenApiClient.cs</OutputPath>
35+
<CodeGenerator>NSwagCSharp</CodeGenerator>
36+
<Options>/UseBaseUrl:false /GenerateClientInterfaces:true /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:JsonApiDotNetCore.OpenApi.Client.Exceptions</Options>
37+
</OpenApiReference>
38+
<OpenApiReference Include="..\OpenApiTests\NamingConvention\KebabCase\swagger.json">
39+
<Namespace>OpenApiClientTests.NamingConvention.KebabCase.GeneratedCode</Namespace>
40+
<ClassName>KebabCaseClient</ClassName>
41+
<OutputPath>KebabCaseClient.cs</OutputPath>
42+
<CodeGenerator>NSwagCSharp</CodeGenerator>
43+
<Options>/UseBaseUrl:false /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:JsonApiDotNetCore.OpenApi.Client.Exceptions</Options>
44+
</OpenApiReference>
45+
<OpenApiReference Include="..\OpenApiTests\NamingConvention\CamelCase\swagger.json">
46+
<Namespace>OpenApiClientTests.NamingConvention.CamelCase.GeneratedCode</Namespace>
47+
<ClassName>CamelCaseClient</ClassName>
48+
<OutputPath>CamelCaseClient.cs</OutputPath>
49+
<CodeGenerator>NSwagCSharp</CodeGenerator>
50+
<Options>/UseBaseUrl:false /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:JsonApiDotNetCore.OpenApi.Client.Exceptions</Options>
51+
</OpenApiReference>
52+
<OpenApiReference Include="..\OpenApiTests\NamingConvention\PascalCase\swagger.json">
53+
<Namespace>OpenApiClientTests.NamingConvention.PascalCase.GeneratedCode</Namespace>
54+
<ClassName>PascalCaseClient</ClassName>
55+
<OutputPath>PascalCaseClient.cs</OutputPath>
56+
<CodeGenerator>NSwagCSharp</CodeGenerator>
57+
<Options>/UseBaseUrl:false /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:JsonApiDotNetCore.OpenApi.Client.Exceptions</Options>
58+
</OpenApiReference>
59+
</ItemGroup>
3960

40-
<ItemGroup>
41-
<OpenApiReference Include="..\OpenApiTests\NamingConvention\KebabCase\swagger.json">
42-
<Namespace>OpenApiClientTests.NamingConvention.KebabCase.GeneratedCode</Namespace>
43-
<ClassName>KebabCaseClient</ClassName>
44-
<OutputPath>KebabCaseClient.cs</OutputPath>
45-
<CodeGenerator>NSwagCSharp</CodeGenerator>
46-
<Options>/UseBaseUrl:false /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:JsonApiDotNetCore.OpenApi.Client.Exceptions</Options>
47-
</OpenApiReference>
48-
</ItemGroup>
49-
50-
<ItemGroup>
51-
<OpenApiReference Include="..\OpenApiTests\NamingConvention\CamelCase\swagger.json">
52-
<Namespace>OpenApiClientTests.NamingConvention.CamelCase.GeneratedCode</Namespace>
53-
<ClassName>CamelCaseClient</ClassName>
54-
<OutputPath>CamelCaseClient.cs</OutputPath>
55-
<CodeGenerator>NSwagCSharp</CodeGenerator>
56-
<Options>/UseBaseUrl:false /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:JsonApiDotNetCore.OpenApi.Client.Exceptions</Options>
57-
</OpenApiReference>
58-
</ItemGroup>
59-
60-
<ItemGroup>
61-
<OpenApiReference Include="..\OpenApiTests\NamingConvention\PascalCase\swagger.json">
62-
<Namespace>OpenApiClientTests.NamingConvention.PascalCase.GeneratedCode</Namespace>
63-
<ClassName>PascalCaseClient</ClassName>
64-
<OutputPath>PascalCaseClient.cs</OutputPath>
65-
<CodeGenerator>NSwagCSharp</CodeGenerator>
66-
<Options>/UseBaseUrl:false /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:JsonApiDotNetCore.OpenApi.Client.Exceptions</Options>
67-
</OpenApiReference>
68-
</ItemGroup>
69-
70-
<ItemGroup>
71-
<None Update="xunit.runner.json">
72-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
73-
</None>
74-
</ItemGroup>
75-
76-
<!-- Fixes IntelliSense errors on openapi.json in Visual Studio 2019, which uses the schema for OpenAPI 3.1 by default. -->
77-
<ProjectExtensions>
78-
<VisualStudio>
79-
<UserProperties swagger_1json__JsonSchema="https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.0/schema.json"/>
80-
</VisualStudio>
81-
</ProjectExtensions>
61+
<ItemGroup>
62+
<None Update="xunit.runner.json">
63+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
64+
</None>
65+
</ItemGroup>
8266
</Project>

Diff for: ‎test/OpenApiTests/OpenApiTests.csproj

+23-29
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,29 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
4-
</PropertyGroup>
2+
<PropertyGroup>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
4+
</PropertyGroup>
55

6-
<ItemGroup>
7-
<ProjectReference Include="..\..\src\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
8-
<ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj"/>
9-
<ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj"/>
10-
</ItemGroup>
6+
<ItemGroup>
7+
<ProjectReference Include="..\..\src\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
8+
ReferenceOutputAssembly="false" />
9+
<ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj" />
10+
<ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
11+
</ItemGroup>
1112

12-
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All"/>
14-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)"/>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)"/>
16-
<PackageReference Include="BlushingPenguin.JsonPath" Version="1.0.*"/>
17-
</ItemGroup>
13+
<ItemGroup>
14+
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
15+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
17+
<PackageReference Include="BlushingPenguin.JsonPath" Version="1.0.*" />
18+
</ItemGroup>
1819

19-
<ItemGroup>
20-
<EmbeddedResource Include="LegacyOpenApiIntegration\swagger.json"/>
21-
</ItemGroup>
20+
<ItemGroup>
21+
<EmbeddedResource Include="LegacyOpenApiIntegration\swagger.json" />
22+
</ItemGroup>
2223

23-
<ItemGroup>
24-
<None Update="xunit.runner.json">
25-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
26-
</None>
27-
</ItemGroup>
28-
29-
<!-- Fixes IntelliSense errors on openapi.json in Visual Studio 2019, which uses the schema for OpenAPI 3.1 by default. -->
30-
<ProjectExtensions>
31-
<VisualStudio>
32-
<UserProperties swagger_1json__JsonSchema="https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.0/schema.json"/>
33-
</VisualStudio>
34-
</ProjectExtensions>
24+
<ItemGroup>
25+
<None Update="xunit.runner.json">
26+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27+
</None>
28+
</ItemGroup>
3529
</Project>

0 commit comments

Comments
 (0)