Skip to content

Commit 6b73b2d

Browse files
maureimaurei
committed
--fixup
1 parent 58a556b commit 6b73b2d

File tree

3 files changed

+48
-1275
lines changed

3 files changed

+48
-1275
lines changed

‎test/OpenApiClientTests/OpenApiClientTests.csproj

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
4-
</PropertyGroup>
2+
<PropertyGroup>
3+
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
4+
</PropertyGroup>
55

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

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

31-
<ItemGroup>
32-
<OpenApiReference Include="..\OpenApiTests\SwaggerDocuments\LegacyOpenApiIntegration.json">
33-
<Namespace>OpenApiClientTests.LegacyClient.GeneratedCode</Namespace>
34-
<ClassName>OpenApiClient</ClassName>
35-
<CodeGenerator>NSwagCSharp</CodeGenerator>
36-
<Options>/UseBaseUrl:false /GenerateClientInterfaces:true /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:OpenApiClientTests.Exceptions</Options>
37-
</OpenApiReference>
38-
</ItemGroup>
31+
<ItemGroup>
32+
<OpenApiReference Include="..\OpenApiTests\LegacyOpenApiIntegration\LegacyOpenApiIntegration.json">
33+
<Namespace>OpenApiClientTests.LegacyClient.GeneratedCode</Namespace>
34+
<ClassName>OpenApiClient</ClassName>
35+
<CodeGenerator>NSwagCSharp</CodeGenerator>
36+
<Options>/UseBaseUrl:false /GenerateClientInterfaces:true /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:OpenApiClientTests.Exceptions</Options>
37+
</OpenApiReference>
38+
</ItemGroup>
3939

40-
<ItemGroup>
41-
<OpenApiReference Include="..\OpenApiTests\SwaggerDocuments\KebabCase.json">
42-
<Namespace>OpenApiClientTests.NamingConvention.KebabCase.GeneratedCode</Namespace>
43-
<ClassName>KebabCaseClient</ClassName>
44-
<CodeGenerator>NSwagCSharp</CodeGenerator>
45-
<Options>/UseBaseUrl:false /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:OpenApiClientTests.Exceptions</Options>
46-
</OpenApiReference>
47-
</ItemGroup>
40+
<ItemGroup>
41+
<OpenApiReference Include="..\OpenApiTests\NamingConvention\KebabCase\KebabCase.json">
42+
<Namespace>OpenApiClientTests.NamingConvention.KebabCase.GeneratedCode</Namespace>
43+
<ClassName>KebabCaseClient</ClassName>
44+
<CodeGenerator>NSwagCSharp</CodeGenerator>
45+
<Options>/UseBaseUrl:false /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:OpenApiClientTests.Exceptions</Options>
46+
</OpenApiReference>
47+
</ItemGroup>
4848

49-
<!-- Fixes IntelliSense errors on openapi.json in Visual Studio 2019, which uses the schema for OpenAPI 3.1 by default. -->
50-
<ProjectExtensions>
51-
<VisualStudio>
52-
<UserProperties swagger_1json__JsonSchema="https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.0/schema.json" />
53-
</VisualStudio>
54-
</ProjectExtensions>
49+
<!-- Fixes IntelliSense errors on openapi.json in Visual Studio 2019, which uses the schema for OpenAPI 3.1 by default. -->
50+
<ProjectExtensions>
51+
<VisualStudio>
52+
<UserProperties swagger_1json__JsonSchema="https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.0/schema.json"/>
53+
</VisualStudio>
54+
</ProjectExtensions>
5555
</Project>

‎test/OpenApiTests/SwaggerDocuments/LegacyOpenApiIntegration.json renamed to ‎test/OpenApiTests/LegacyOpenApiIntegration/LegacyOpenApiIntegration.json

File renamed without changes.

0 commit comments

Comments
 (0)