Skip to content

Commit b7b0090

Browse files
wing328wing328
authored
Update csharp-netcore dependencies to the latest stable version (#7194)
* update csharp-netcore dependencies * update test sdk version * set tests.sdk version to 15.9.2 * rearrange test * vs 2019 image * rollback to v4.61.0 * update Microsoft.NET.Test.Sdk version * Revert "update Microsoft.NET.Test.Sdk version" This reverts commit 7a86bfc. * rollback Microsoft.NET.Test.Sdk
1 parent e26a422 commit b7b0090

File tree

15 files changed

+137
-60
lines changed

15 files changed

+137
-60
lines changed

‎appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: '{branch}-{build}'
2-
image: Visual Studio 2017
2+
image: Visual Studio 2019
33
hosts:
44
petstore.swagger.io: 127.0.0.1
55
install:
@@ -53,8 +53,8 @@ build_script:
5353
- gradle -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --stacktrace
5454
test_script:
5555
# test c# API client (netcore)
56-
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
5756
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
57+
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
5858
# test c# API client
5959
- nunit3-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
6060
# test c# API client (with PropertyChanged)

‎modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -383,14 +383,27 @@ namespace {{packageName}}.Client
383383
var existingDeserializer = req.JsonSerializer as IDeserializer;
384384
if (existingDeserializer != null)
385385
{
386-
client.AddHandler(() => existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
386+
client.AddHandler("application/json", () => existingDeserializer);
387+
client.AddHandler("text/json", () => existingDeserializer);
388+
client.AddHandler("text/x-json", () => existingDeserializer);
389+
client.AddHandler("text/javascript", () => existingDeserializer);
390+
client.AddHandler("*+json", () => existingDeserializer);
387391
}
388392
else
389393
{
390-
client.AddHandler(() => new CustomJsonCodec(configuration), "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
394+
var customDeserializer = new CustomJsonCodec(configuration);
395+
client.AddHandler("application/json", () => customDeserializer);
396+
client.AddHandler("text/json", () => customDeserializer);
397+
client.AddHandler("text/x-json", () => customDeserializer);
398+
client.AddHandler("text/javascript", () => customDeserializer);
399+
client.AddHandler("*+json", () => customDeserializer);
391400
}
392401
393-
client.AddHandler(() => new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
402+
var xmlDeserializer = new XmlDeserializer();
403+
client.AddHandler("application/xml", () => xmlDeserializer);
404+
client.AddHandler("text/xml", () => xmlDeserializer);
405+
client.AddHandler("*+xml", () => xmlDeserializer);
406+
client.AddHandler("*", () => xmlDeserializer);
394407
395408
client.Timeout = configuration.Timeout;
396409
@@ -454,14 +467,27 @@ namespace {{packageName}}.Client
454467
var existingDeserializer = req.JsonSerializer as IDeserializer;
455468
if (existingDeserializer != null)
456469
{
457-
client.AddHandler(() => existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
470+
client.AddHandler("application/json", () => existingDeserializer);
471+
client.AddHandler("text/json", () => existingDeserializer);
472+
client.AddHandler("text/x-json", () => existingDeserializer);
473+
client.AddHandler("text/javascript", () => existingDeserializer);
474+
client.AddHandler("*+json", () => existingDeserializer);
458475
}
459476
else
460477
{
461-
client.AddHandler(() => new CustomJsonCodec(configuration), "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
478+
var customDeserializer = new CustomJsonCodec(configuration);
479+
client.AddHandler("application/json", () => customDeserializer);
480+
client.AddHandler("text/json", () => customDeserializer);
481+
client.AddHandler("text/x-json", () => customDeserializer);
482+
client.AddHandler("text/javascript", () => customDeserializer);
483+
client.AddHandler("*+json", () => customDeserializer);
462484
}
463485
464-
client.AddHandler(() => new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
486+
var xmlDeserializer = new XmlDeserializer();
487+
client.AddHandler("application/xml", () => xmlDeserializer);
488+
client.AddHandler("text/xml", () => xmlDeserializer);
489+
client.AddHandler("*+xml", () => xmlDeserializer);
490+
client.AddHandler("*", () => xmlDeserializer);
465491
466492
client.Timeout = configuration.Timeout;
467493

‎modules/openapi-generator/src/main/resources/csharp-netcore/README.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
2727
<a name="dependencies"></a>
2828
## Dependencies
2929

30-
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.10.1 or later
31-
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.1 or later
32-
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.5.2 or later
30+
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.11.4 or later
31+
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.3 or later
32+
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.7.0 or later
3333
{{#useCompareNetObjects}}
34-
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.57.0 or later
34+
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
3535
{{/useCompareNetObjects}}
3636
{{#validatable}}
37-
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.5.0 or later
37+
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.7.0 or later
3838
{{/validatable}}
3939

4040
The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:

‎modules/openapi-generator/src/main/resources/csharp-netcore/TestProject.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<FileAlignment>512</FileAlignment>
2323
</PropertyGroup>
2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
2626
<PackageReference Include="xunit" Version="2.4.1" />
2727
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
2828
</ItemGroup>

‎modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323

2424
<ItemGroup>
2525
{{#useCompareNetObjects}}
26-
<PackageReference Include="CompareNETObjects" Version="4.57.0" />
26+
<PackageReference Include="CompareNETObjects" Version="4.61.0" />
2727
{{/useCompareNetObjects}}
28-
<PackageReference Include="JsonSubTypes" Version="1.5.2" />
29-
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
30-
<PackageReference Include="RestSharp" Version="106.10.1" />
28+
<PackageReference Include="JsonSubTypes" Version="1.7.0" />
29+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
30+
<PackageReference Include="RestSharp" Version="106.11.4" />
3131
{{#validatable}}
32-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
32+
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
3333
{{/validatable}}
3434
</ItemGroup>
3535

‎modules/openapi-generator/src/main/resources/csharp-netcore/netcore_testproject.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
1414
</ItemGroup>

‎modules/openapi-generator/src/main/resources/csharp-netcore/nuspec.mustache

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
<!-- Dependencies are automatically installed when the package is installed -->
3131
<dependencies>
3232

33-
<dependency id="Newtonsoft.Json" version="12.0.1" />
34-
<dependency id="RestSharp" version="106.10.1" />
33+
<dependency id="Newtonsoft.Json" version="12.0.3" />
34+
<dependency id="RestSharp" version="106.11.4" />
3535
{{#useCompareNetObjects}}
36-
<dependency id="CompareNETObjects" version="4.57.0" />
36+
<dependency id="CompareNETObjects" version="4.61.0" />
3737
{{/useCompareNetObjects}}
38-
<dependency id="JsonSubTypes" version="1.5.2" />
38+
<dependency id="JsonSubTypes" version="1.7.0" />
3939
{{#validatable}}
40-
<dependency id="System.ComponentModel.Annotations" version="4.5.0" />
40+
<dependency id="System.ComponentModel.Annotations" version="4.7.0" />
4141
{{/validatable}}
4242

4343
</dependencies>

‎samples/client/petstore/csharp-netcore/OpenAPIClient/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
1717
<a name="dependencies"></a>
1818
## Dependencies
1919

20-
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.10.1 or later
21-
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.1 or later
22-
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.5.2 or later
23-
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.57.0 or later
24-
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.5.0 or later
20+
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.11.4 or later
21+
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.3 or later
22+
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.7.0 or later
23+
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
24+
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.7.0 or later
2525

2626
The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
2727
```

‎samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@ OpenAPI spec version: 1.0.0
1717

1818
<ItemGroup>
1919
<ProjectReference Include="..\Org.OpenAPITools\Org.OpenAPITools.csproj">
20-
<Name>Org.OpenAPITools</Name>
2120
</ProjectReference>
2221
</ItemGroup>
2322
<ItemGroup>
2423
<EmbeddedResource Include="linux-logo.png" />
2524
</ItemGroup>
2625
<ItemGroup>
27-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
2827
<PackageReference Include="xunit" Version="2.4.1" />
2928
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
3029
</ItemGroup>

‎samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -387,14 +387,27 @@ private ApiResponse<T> Exec<T>(RestRequest req, IReadableConfiguration configura
387387
var existingDeserializer = req.JsonSerializer as IDeserializer;
388388
if (existingDeserializer != null)
389389
{
390-
client.AddHandler(() => existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
390+
client.AddHandler("application/json", () => existingDeserializer);
391+
client.AddHandler("text/json", () => existingDeserializer);
392+
client.AddHandler("text/x-json", () => existingDeserializer);
393+
client.AddHandler("text/javascript", () => existingDeserializer);
394+
client.AddHandler("*+json", () => existingDeserializer);
391395
}
392396
else
393397
{
394-
client.AddHandler(() => new CustomJsonCodec(configuration), "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
398+
var customDeserializer = new CustomJsonCodec(configuration);
399+
client.AddHandler("application/json", () => customDeserializer);
400+
client.AddHandler("text/json", () => customDeserializer);
401+
client.AddHandler("text/x-json", () => customDeserializer);
402+
client.AddHandler("text/javascript", () => customDeserializer);
403+
client.AddHandler("*+json", () => customDeserializer);
395404
}
396405

397-
client.AddHandler(() => new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
406+
var xmlDeserializer = new XmlDeserializer();
407+
client.AddHandler("application/xml", () => xmlDeserializer);
408+
client.AddHandler("text/xml", () => xmlDeserializer);
409+
client.AddHandler("*+xml", () => xmlDeserializer);
410+
client.AddHandler("*", () => xmlDeserializer);
398411

399412
client.Timeout = configuration.Timeout;
400413

@@ -457,14 +470,27 @@ private ApiResponse<T> Exec<T>(RestRequest req, IReadableConfiguration configura
457470
var existingDeserializer = req.JsonSerializer as IDeserializer;
458471
if (existingDeserializer != null)
459472
{
460-
client.AddHandler(() => existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
473+
client.AddHandler("application/json", () => existingDeserializer);
474+
client.AddHandler("text/json", () => existingDeserializer);
475+
client.AddHandler("text/x-json", () => existingDeserializer);
476+
client.AddHandler("text/javascript", () => existingDeserializer);
477+
client.AddHandler("*+json", () => existingDeserializer);
461478
}
462479
else
463480
{
464-
client.AddHandler(() => new CustomJsonCodec(configuration), "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
481+
var customDeserializer = new CustomJsonCodec(configuration);
482+
client.AddHandler("application/json", () => customDeserializer);
483+
client.AddHandler("text/json", () => customDeserializer);
484+
client.AddHandler("text/x-json", () => customDeserializer);
485+
client.AddHandler("text/javascript", () => customDeserializer);
486+
client.AddHandler("*+json", () => customDeserializer);
465487
}
466488

467-
client.AddHandler(() => new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
489+
var xmlDeserializer = new XmlDeserializer();
490+
client.AddHandler("application/xml", () => xmlDeserializer);
491+
client.AddHandler("text/xml", () => xmlDeserializer);
492+
client.AddHandler("*+xml", () => xmlDeserializer);
493+
client.AddHandler("*", () => xmlDeserializer);
468494

469495
client.Timeout = configuration.Timeout;
470496

‎samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="CompareNETObjects" Version="4.57.0" />
24-
<PackageReference Include="JsonSubTypes" Version="1.5.2" />
25-
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
26-
<PackageReference Include="RestSharp" Version="106.10.1" />
27-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
23+
<PackageReference Include="CompareNETObjects" Version="4.61.0" />
24+
<PackageReference Include="JsonSubTypes" Version="1.7.0" />
25+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
26+
<PackageReference Include="RestSharp" Version="106.11.4" />
27+
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
2828
</ItemGroup>
2929

3030
</Project>

‎samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
1414
<a name="dependencies"></a>
1515
## Dependencies
1616

17-
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.10.1 or later
18-
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.1 or later
19-
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.5.2 or later
20-
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.57.0 or later
21-
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.5.0 or later
17+
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.11.4 or later
18+
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.3 or later
19+
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.7.0 or later
20+
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
21+
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.7.0 or later
2222

2323
The DLLs included in the package may not be the latest version. We recommend using [NuGet](https://docs.nuget.org/consume/installing-nuget) to obtain the latest version of the packages:
2424
```

‎samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ OpenAPI spec version: 1.0.0
2424
<EmbeddedResource Include="linux-logo.png" />
2525
</ItemGroup>
2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
2828
<PackageReference Include="xunit" Version="2.4.1" />
2929
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
3030
</ItemGroup>

0 commit comments

Comments
 (0)