forked from loafle/openapi-generator-original
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 7a86bfc4151d5d23667129e242ad911db5d33598. * rollback Microsoft.NET.Test.Sdk
This commit is contained in:
parent
e26a4222c7
commit
b7b009082a
@ -1,5 +1,5 @@
|
|||||||
version: '{branch}-{build}'
|
version: '{branch}-{build}'
|
||||||
image: Visual Studio 2017
|
image: Visual Studio 2019
|
||||||
hosts:
|
hosts:
|
||||||
petstore.swagger.io: 127.0.0.1
|
petstore.swagger.io: 127.0.0.1
|
||||||
install:
|
install:
|
||||||
@ -53,8 +53,8 @@ build_script:
|
|||||||
- gradle -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --stacktrace
|
- gradle -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --stacktrace
|
||||||
test_script:
|
test_script:
|
||||||
# test c# API client (netcore)
|
# test c# API client (netcore)
|
||||||
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
|
|
||||||
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
|
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClientCore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
|
||||||
|
- dotnet test samples\client\petstore\csharp-netcore\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
|
||||||
# test c# API client
|
# test c# API client
|
||||||
- nunit3-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
|
- nunit3-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
|
||||||
# test c# API client (with PropertyChanged)
|
# test c# API client (with PropertyChanged)
|
||||||
|
@ -383,14 +383,27 @@ namespace {{packageName}}.Client
|
|||||||
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
||||||
if (existingDeserializer != null)
|
if (existingDeserializer != null)
|
||||||
{
|
{
|
||||||
client.AddHandler(() => existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
client.AddHandler("application/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => existingDeserializer);
|
||||||
|
client.AddHandler("*+json", () => existingDeserializer);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
client.AddHandler(() => new CustomJsonCodec(configuration), "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
var customDeserializer = new CustomJsonCodec(configuration);
|
||||||
|
client.AddHandler("application/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => customDeserializer);
|
||||||
|
client.AddHandler("*+json", () => customDeserializer);
|
||||||
}
|
}
|
||||||
|
|
||||||
client.AddHandler(() => new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
|
var xmlDeserializer = new XmlDeserializer();
|
||||||
|
client.AddHandler("application/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("text/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*+xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*", () => xmlDeserializer);
|
||||||
|
|
||||||
client.Timeout = configuration.Timeout;
|
client.Timeout = configuration.Timeout;
|
||||||
|
|
||||||
@ -454,14 +467,27 @@ namespace {{packageName}}.Client
|
|||||||
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
||||||
if (existingDeserializer != null)
|
if (existingDeserializer != null)
|
||||||
{
|
{
|
||||||
client.AddHandler(() => existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
client.AddHandler("application/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => existingDeserializer);
|
||||||
|
client.AddHandler("*+json", () => existingDeserializer);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
client.AddHandler(() => new CustomJsonCodec(configuration), "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
var customDeserializer = new CustomJsonCodec(configuration);
|
||||||
|
client.AddHandler("application/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => customDeserializer);
|
||||||
|
client.AddHandler("*+json", () => customDeserializer);
|
||||||
}
|
}
|
||||||
|
|
||||||
client.AddHandler(() => new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
|
var xmlDeserializer = new XmlDeserializer();
|
||||||
|
client.AddHandler("application/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("text/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*+xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*", () => xmlDeserializer);
|
||||||
|
|
||||||
client.Timeout = configuration.Timeout;
|
client.Timeout = configuration.Timeout;
|
||||||
|
|
||||||
|
@ -27,14 +27,14 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
|
|||||||
<a name="dependencies"></a>
|
<a name="dependencies"></a>
|
||||||
## Dependencies
|
## Dependencies
|
||||||
|
|
||||||
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.10.1 or later
|
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.11.4 or later
|
||||||
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.1 or later
|
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.3 or later
|
||||||
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.5.2 or later
|
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.7.0 or later
|
||||||
{{#useCompareNetObjects}}
|
{{#useCompareNetObjects}}
|
||||||
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.57.0 or later
|
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
|
||||||
{{/useCompareNetObjects}}
|
{{/useCompareNetObjects}}
|
||||||
{{#validatable}}
|
{{#validatable}}
|
||||||
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.5.0 or later
|
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.7.0 or later
|
||||||
{{/validatable}}
|
{{/validatable}}
|
||||||
|
|
||||||
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:
|
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:
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
|
||||||
<PackageReference Include="xunit" Version="2.4.1" />
|
<PackageReference Include="xunit" Version="2.4.1" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
@ -23,13 +23,13 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
{{#useCompareNetObjects}}
|
{{#useCompareNetObjects}}
|
||||||
<PackageReference Include="CompareNETObjects" Version="4.57.0" />
|
<PackageReference Include="CompareNETObjects" Version="4.61.0" />
|
||||||
{{/useCompareNetObjects}}
|
{{/useCompareNetObjects}}
|
||||||
<PackageReference Include="JsonSubTypes" Version="1.5.2" />
|
<PackageReference Include="JsonSubTypes" Version="1.7.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||||
<PackageReference Include="RestSharp" Version="106.10.1" />
|
<PackageReference Include="RestSharp" Version="106.11.4" />
|
||||||
{{#validatable}}
|
{{#validatable}}
|
||||||
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
|
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
|
||||||
{{/validatable}}
|
{{/validatable}}
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
|
||||||
<PackageReference Include="xunit" Version="2.4.1" />
|
<PackageReference Include="xunit" Version="2.4.1" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
@ -30,14 +30,14 @@
|
|||||||
<!-- Dependencies are automatically installed when the package is installed -->
|
<!-- Dependencies are automatically installed when the package is installed -->
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<dependency id="Newtonsoft.Json" version="12.0.1" />
|
<dependency id="Newtonsoft.Json" version="12.0.3" />
|
||||||
<dependency id="RestSharp" version="106.10.1" />
|
<dependency id="RestSharp" version="106.11.4" />
|
||||||
{{#useCompareNetObjects}}
|
{{#useCompareNetObjects}}
|
||||||
<dependency id="CompareNETObjects" version="4.57.0" />
|
<dependency id="CompareNETObjects" version="4.61.0" />
|
||||||
{{/useCompareNetObjects}}
|
{{/useCompareNetObjects}}
|
||||||
<dependency id="JsonSubTypes" version="1.5.2" />
|
<dependency id="JsonSubTypes" version="1.7.0" />
|
||||||
{{#validatable}}
|
{{#validatable}}
|
||||||
<dependency id="System.ComponentModel.Annotations" version="4.5.0" />
|
<dependency id="System.ComponentModel.Annotations" version="4.7.0" />
|
||||||
{{/validatable}}
|
{{/validatable}}
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@ -17,11 +17,11 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
|
|||||||
<a name="dependencies"></a>
|
<a name="dependencies"></a>
|
||||||
## Dependencies
|
## Dependencies
|
||||||
|
|
||||||
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.10.1 or later
|
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.11.4 or later
|
||||||
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.1 or later
|
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.3 or later
|
||||||
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.5.2 or later
|
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.7.0 or later
|
||||||
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.57.0 or later
|
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
|
||||||
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.5.0 or later
|
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.7.0 or later
|
||||||
|
|
||||||
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:
|
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:
|
||||||
```
|
```
|
||||||
|
@ -17,14 +17,13 @@ OpenAPI spec version: 1.0.0
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Org.OpenAPITools\Org.OpenAPITools.csproj">
|
<ProjectReference Include="..\Org.OpenAPITools\Org.OpenAPITools.csproj">
|
||||||
<Name>Org.OpenAPITools</Name>
|
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Include="linux-logo.png" />
|
<EmbeddedResource Include="linux-logo.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
|
||||||
<PackageReference Include="xunit" Version="2.4.1" />
|
<PackageReference Include="xunit" Version="2.4.1" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
@ -387,14 +387,27 @@ namespace Org.OpenAPITools.Client
|
|||||||
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
||||||
if (existingDeserializer != null)
|
if (existingDeserializer != null)
|
||||||
{
|
{
|
||||||
client.AddHandler(() => existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
client.AddHandler("application/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => existingDeserializer);
|
||||||
|
client.AddHandler("*+json", () => existingDeserializer);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
client.AddHandler(() => new CustomJsonCodec(configuration), "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
var customDeserializer = new CustomJsonCodec(configuration);
|
||||||
|
client.AddHandler("application/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => customDeserializer);
|
||||||
|
client.AddHandler("*+json", () => customDeserializer);
|
||||||
}
|
}
|
||||||
|
|
||||||
client.AddHandler(() => new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
|
var xmlDeserializer = new XmlDeserializer();
|
||||||
|
client.AddHandler("application/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("text/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*+xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*", () => xmlDeserializer);
|
||||||
|
|
||||||
client.Timeout = configuration.Timeout;
|
client.Timeout = configuration.Timeout;
|
||||||
|
|
||||||
@ -457,14 +470,27 @@ namespace Org.OpenAPITools.Client
|
|||||||
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
||||||
if (existingDeserializer != null)
|
if (existingDeserializer != null)
|
||||||
{
|
{
|
||||||
client.AddHandler(() => existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
client.AddHandler("application/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => existingDeserializer);
|
||||||
|
client.AddHandler("*+json", () => existingDeserializer);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
client.AddHandler(() => new CustomJsonCodec(configuration), "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
var customDeserializer = new CustomJsonCodec(configuration);
|
||||||
|
client.AddHandler("application/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => customDeserializer);
|
||||||
|
client.AddHandler("*+json", () => customDeserializer);
|
||||||
}
|
}
|
||||||
|
|
||||||
client.AddHandler(() => new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
|
var xmlDeserializer = new XmlDeserializer();
|
||||||
|
client.AddHandler("application/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("text/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*+xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*", () => xmlDeserializer);
|
||||||
|
|
||||||
client.Timeout = configuration.Timeout;
|
client.Timeout = configuration.Timeout;
|
||||||
|
|
||||||
|
@ -20,11 +20,11 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CompareNETObjects" Version="4.57.0" />
|
<PackageReference Include="CompareNETObjects" Version="4.61.0" />
|
||||||
<PackageReference Include="JsonSubTypes" Version="1.5.2" />
|
<PackageReference Include="JsonSubTypes" Version="1.7.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||||
<PackageReference Include="RestSharp" Version="106.10.1" />
|
<PackageReference Include="RestSharp" Version="106.11.4" />
|
||||||
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
|
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -14,11 +14,11 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap
|
|||||||
<a name="dependencies"></a>
|
<a name="dependencies"></a>
|
||||||
## Dependencies
|
## Dependencies
|
||||||
|
|
||||||
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.10.1 or later
|
- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.11.4 or later
|
||||||
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.1 or later
|
- [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 12.0.3 or later
|
||||||
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.5.2 or later
|
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.7.0 or later
|
||||||
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.57.0 or later
|
- [CompareNETObjects](https://www.nuget.org/packages/CompareNETObjects) - 4.61.0 or later
|
||||||
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.5.0 or later
|
- [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 4.7.0 or later
|
||||||
|
|
||||||
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:
|
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:
|
||||||
```
|
```
|
||||||
|
@ -24,7 +24,7 @@ OpenAPI spec version: 1.0.0
|
|||||||
<EmbeddedResource Include="linux-logo.png" />
|
<EmbeddedResource Include="linux-logo.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
|
||||||
<PackageReference Include="xunit" Version="2.4.1" />
|
<PackageReference Include="xunit" Version="2.4.1" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
@ -388,14 +388,27 @@ namespace Org.OpenAPITools.Client
|
|||||||
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
||||||
if (existingDeserializer != null)
|
if (existingDeserializer != null)
|
||||||
{
|
{
|
||||||
client.AddHandler(() => existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
client.AddHandler("application/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => existingDeserializer);
|
||||||
|
client.AddHandler("*+json", () => existingDeserializer);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
client.AddHandler(() => new CustomJsonCodec(configuration), "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
var customDeserializer = new CustomJsonCodec(configuration);
|
||||||
|
client.AddHandler("application/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => customDeserializer);
|
||||||
|
client.AddHandler("*+json", () => customDeserializer);
|
||||||
}
|
}
|
||||||
|
|
||||||
client.AddHandler(() => new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
|
var xmlDeserializer = new XmlDeserializer();
|
||||||
|
client.AddHandler("application/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("text/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*+xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*", () => xmlDeserializer);
|
||||||
|
|
||||||
client.Timeout = configuration.Timeout;
|
client.Timeout = configuration.Timeout;
|
||||||
|
|
||||||
@ -458,14 +471,27 @@ namespace Org.OpenAPITools.Client
|
|||||||
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
var existingDeserializer = req.JsonSerializer as IDeserializer;
|
||||||
if (existingDeserializer != null)
|
if (existingDeserializer != null)
|
||||||
{
|
{
|
||||||
client.AddHandler(() => existingDeserializer, "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
client.AddHandler("application/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => existingDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => existingDeserializer);
|
||||||
|
client.AddHandler("*+json", () => existingDeserializer);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
client.AddHandler(() => new CustomJsonCodec(configuration), "application/json", "text/json", "text/x-json", "text/javascript", "*+json");
|
var customDeserializer = new CustomJsonCodec(configuration);
|
||||||
|
client.AddHandler("application/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/x-json", () => customDeserializer);
|
||||||
|
client.AddHandler("text/javascript", () => customDeserializer);
|
||||||
|
client.AddHandler("*+json", () => customDeserializer);
|
||||||
}
|
}
|
||||||
|
|
||||||
client.AddHandler(() => new XmlDeserializer(), "application/xml", "text/xml", "*+xml", "*");
|
var xmlDeserializer = new XmlDeserializer();
|
||||||
|
client.AddHandler("application/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("text/xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*+xml", () => xmlDeserializer);
|
||||||
|
client.AddHandler("*", () => xmlDeserializer);
|
||||||
|
|
||||||
client.Timeout = configuration.Timeout;
|
client.Timeout = configuration.Timeout;
|
||||||
|
|
||||||
|
@ -20,11 +20,11 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CompareNETObjects" Version="4.57.0" />
|
<PackageReference Include="CompareNETObjects" Version="4.61.0" />
|
||||||
<PackageReference Include="JsonSubTypes" Version="1.5.2" />
|
<PackageReference Include="JsonSubTypes" Version="1.7.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
|
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||||
<PackageReference Include="RestSharp" Version="106.10.1" />
|
<PackageReference Include="RestSharp" Version="106.11.4" />
|
||||||
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
|
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user