Skip to content

Commit 2cfce7c

Browse files
authored
version bump (OpenAPITools#16657)
1 parent e3958cb commit 2cfce7c

File tree

47 files changed

+118
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+118
-78
lines changed

modules/openapi-generator/src/main/resources/csharp/ClientUtils.mustache

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ namespace {{packageName}}.Client
3131
/// </summary>
3232
static ClientUtils()
3333
{
34-
compareLogic = new CompareLogic();
34+
{{#equatable}}
35+
ComparisonConfig comparisonConfig = new{{^net70OrLater}} ComparisonConfig{{/net70OrLater}}();
36+
comparisonConfig.UseHashCodeIdentifier = true;
37+
{{/equatable}}
38+
compareLogic = new{{^net70OrLater}} CompareLogic{{/net70OrLater}}({{#equatable}}comparisonConfig{{/equatable}});
3539
}
3640

3741
{{/useCompareNetObjects}}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ClientUtils.mustache

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ using System.Runtime.CompilerServices;
3333
/// </summary>
3434
static ClientUtils()
3535
{
36-
compareLogic = new CompareLogic();
36+
{{#equatable}}
37+
ComparisonConfig comparisonConfig = new{{^net70OrLater}} ComparisonConfig{{/net70OrLater}}();
38+
comparisonConfig.UseHashCodeIdentifier = true;
39+
{{/equatable}}
40+
compareLogic = new{{^net70OrLater}} CompareLogic{{/net70OrLater}}({{#equatable}}comparisonConfig{{/equatable}});
3741
}
3842
{{/useCompareNetObjects}}
3943

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<ItemGroup>
2727
{{#useCompareNetObjects}}
28-
<PackageReference Include="CompareNETObjects" Version="4.61.0" />{{! leave at this version until this is fixed https://github.com/GregFinzer/Compare-Net-Objects/issues/282 }}
28+
<PackageReference Include="CompareNETObjects" Version="4.82.0" />
2929
{{/useCompareNetObjects}}
3030
{{^useGenericHost}}
3131
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
@@ -38,7 +38,7 @@
3838
<PackageReference Include="Microsoft.Extensions.Http" Version="{{#lambda.first}}{{#netStandard}}5.0.0 {{/netStandard}}{{#net47}}7.0.0 {{/net47}}{{#net48}}7.0.0 {{/net48}}{{#net6.0}}6.0.0 {{/net6.0}}{{#net70OrLater}}7.0.0{{/net70OrLater}}{{/lambda.first}}" />
3939
<PackageReference Include="Microsoft.Extensions.Hosting" Version="{{#lambda.first}}{{#netStandard}}5.0.0 {{/netStandard}}{{#net47}}7.0.0 {{/net47}}{{#net48}}7.0.0 {{/net48}}{{#net6.0}}6.0.1 {{/net6.0}}{{#net70OrLater}}7.0.1 {{/net70OrLater}}{{/lambda.first}}" />
4040
{{#supportsRetry}}
41-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="{{#lambda.first}}{{#netStandard}}5.0.1 {{/netStandard}}{{#net47}}7.0.0 {{/net47}}{{#net48}}7.0.0 {{/net48}}{{#net6.0}}6.0.19 {{/net6.0}}{{#net70OrLater}}7.0.8 {{/net70OrLater}}{{/lambda.first}}" />
41+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="{{#lambda.first}}{{#netStandard}}5.0.1 {{/netStandard}}{{#net47}}7.0.0 {{/net47}}{{#net48}}7.0.0 {{/net48}}{{#net6.0}}6.0.19 {{/net6.0}}{{#net70OrLater}}7.0.11 {{/net70OrLater}}{{/lambda.first}}" />
4242
{{/supportsRetry}}
4343
{{/useGenericHost}}
4444
{{^useGenericHost}}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="{{^netStandard}}17.6.3{{/netStandard}}{{#netStandard}}15.9.2{{/netStandard}}" />
13-
<PackageReference Include="xunit" Version="{{^netStandard}}2.5.0{{/netStandard}}{{#netStandard}}2.4.2{{/netStandard}}" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="{{^netStandard}}2.5.0{{/netStandard}}{{#netStandard}}2.4.5{{/netStandard}}" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="{{^netStandard}}17.7.2{{/netStandard}}{{#netStandard}}15.9.2{{/netStandard}}" />
13+
<PackageReference Include="xunit" Version="{{^netStandard}}2.5.1{{/netStandard}}{{#netStandard}}2.4.2{{/netStandard}}" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="{{^netStandard}}2.5.1{{/netStandard}}{{#netStandard}}2.4.5{{/netStandard}}" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
13-
<PackageReference Include="xunit" Version="2.5.0" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
13+
<PackageReference Include="xunit" Version="2.5.1" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ClientUtils.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ public static class ClientUtils
3636
/// </summary>
3737
static ClientUtils()
3838
{
39-
compareLogic = new CompareLogic();
39+
ComparisonConfig comparisonConfig = new ComparisonConfig();
40+
comparisonConfig.UseHashCodeIdentifier = true;
41+
compareLogic = new CompareLogic(comparisonConfig);
4042
}
4143

4244
/// <summary>

samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="CompareNETObjects" Version="4.61.0" />
23+
<PackageReference Include="CompareNETObjects" Version="4.82.0" />
2424
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
2525
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2626
<PackageReference Include="RestSharp" Version="110.2.0" />

samples/client/petstore/csharp-restsharp-name-parameter-mappings/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
13-
<PackageReference Include="xunit" Version="2.5.0" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
13+
<PackageReference Include="xunit" Version="2.5.1" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

samples/client/petstore/csharp/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Client/ClientUtils.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ public static class ClientUtils
3636
/// </summary>
3737
static ClientUtils()
3838
{
39-
compareLogic = new CompareLogic();
39+
ComparisonConfig comparisonConfig = new ComparisonConfig();
40+
comparisonConfig.UseHashCodeIdentifier = true;
41+
compareLogic = new CompareLogic(comparisonConfig);
4042
}
4143

4244
/// <summary>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="CompareNETObjects" Version="4.61.0" />
23+
<PackageReference Include="CompareNETObjects" Version="4.82.0" />
2424
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
2525
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2626
<PackageReference Include="RestSharp" Version="110.2.0" />

0 commit comments

Comments
 (0)