Skip to content

Commit 1a3616a

Browse files
BryanAldrichBryanAldrich
committed
update with commits from master
1 parent 681a9c3 commit 1a3616a

File tree

124 files changed

+3979
-995
lines changed

Some content is hidden

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

124 files changed

+3979
-995
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,23 @@
4444
{{/useGenericHost}}
4545
{{#useRestSharp}}
4646
<PackageReference Include="RestSharp" Version="112.1.0" />
47-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
4847
{{/useRestSharp}}
4948
{{#useGenericHost}}
50-
<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}}{{#net7.0}}7.0.0 {{/net7.0}}{{#net8.0}}8.0.0 {{/net8.0}}{{#net9.0}}9.0.0 {{/net9.0}}{{/lambda.first}}" />
51-
<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}}{{#net7.0}}7.0.1 {{/net7.0}}{{#net8.0}}8.0.0 {{/net8.0}}{{#net9.0}}9.0.0 {{/net9.0}}{{/lambda.first}}" />
52-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
49+
<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.1 {{/net6.0}}{{#net7.0}}7.0.0 {{/net7.0}}{{#net8.0}}8.0.1 {{/net8.0}}{{#net9.0}}9.0.1 {{/net9.0}}{{/lambda.first}}" />
50+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="{{#lambda.first}}{{#netStandard}}5.0.0 {{/netStandard}}{{#net47}}7.0.1 {{/net47}}{{#net48}}7.0.1 {{/net48}}{{#net6.0}}6.0.1 {{/net6.0}}{{#net7.0}}7.0.1 {{/net7.0}}{{#net8.0}}8.0.1 {{/net8.0}}{{#net9.0}}9.0.1 {{/net9.0}}{{/lambda.first}}" />
5351
{{#supportsRetry}}
54-
<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}}{{#net7.0}}7.0.11 {{/net7.0}}{{#net8.0}}8.0.8 {{/net8.0}}{{#net9.0}}9.0.0 {{/net9.0}}{{/lambda.first}}" />
52+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="{{#lambda.first}}{{#netStandard}}5.0.1 {{/netStandard}}{{#net47}}7.0.20 {{/net47}}{{#net48}}7.0.20 {{/net48}}{{#net6.0}}6.0.36 {{/net6.0}}{{#net7.0}}7.0.20 {{/net7.0}}{{#net8.0}}8.0.12 {{/net8.0}}{{#net9.0}}9.0.1 {{/net9.0}}{{/lambda.first}}" />
5553
{{/supportsRetry}}
5654
{{#net80OrLater}}
57-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="{{#lambda.first}}{{#net8.0}}8.0.8 {{/net8.0}}{{#net9.0}}9.0.0 {{/net9.0}}{{/lambda.first}}" />
55+
<PackageReference Include="Microsoft.Net.Http.Headers" Version="{{#lambda.first}}{{#net8.0}}8.0.12 {{/net8.0}}{{#net9.0}}9.0.1 {{/net9.0}}{{/lambda.first}}" />
5856
{{/net80OrLater}}
5957
{{^net60OrLater}}
6058
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
6159
{{/net60OrLater}}
6260
{{/useGenericHost}}
6361
{{^useGenericHost}}
6462
{{#supportsRetry}}
65-
<PackageReference Include="Polly" Version="{{^netStandard}}8.1.0{{/netStandard}}{{#netStandard}}8.1.0{{/netStandard}}" />
63+
<PackageReference Include="Polly" Version="8.5.1" />
6664
{{/supportsRetry}}
6765
{{/useGenericHost}}
6866
</ItemGroup>

‎samples/client/echo_api/csharp/restsharp/net8/EchoApi/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<GenerateAssemblyInfo>false</GenerateAssemblyInfo><!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
45
<TargetFramework>net8.0</TargetFramework>
@@ -34,8 +35,7 @@
3435
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
3536
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3637
<PackageReference Include="RestSharp" Version="112.1.0" />
37-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
38-
<PackageReference Include="Polly" Version="8.5.0" />
38+
<PackageReference Include="Polly" Version="8.5.1" />
3939
</ItemGroup>
4040
<ItemGroup>
4141
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

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

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

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
12-
<PackageReference Include="xunit" Version="2.9.2" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
12+
<PackageReference Include="xunit" Version="2.4.2" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<GenerateAssemblyInfo>false</GenerateAssemblyInfo><!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
45
<TargetFramework>netstandard2.0</TargetFramework>
@@ -34,8 +35,7 @@
3435
<PackageReference Include="JsonSubTypes" Version="2.0.1" />
3536
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3637
<PackageReference Include="RestSharp" Version="112.1.0" />
37-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
38-
<PackageReference Include="Polly" Version="8.5.0" />
38+
<PackageReference Include="Polly" Version="8.5.1" />
3939
</ItemGroup>
4040
<ItemGroup>
4141
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

‎samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<GenerateAssemblyInfo>true</GenerateAssemblyInfo> <!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
45
<TargetFramework>net9.0</TargetFramework>
@@ -29,17 +30,17 @@
2930
</When>
3031
<When Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETStandard'"></When>
3132
</Choose>
33+
3234
<ItemGroup>
33-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
34-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
35-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
36-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.0" />
37-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="9.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.1" />
36+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
37+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.1" />
38+
<PackageReference Include="Microsoft.Net.Http.Headers" Version="9.0.1" />
3839
</ItemGroup>
3940
<ItemGroup>
4041
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
4142
</ItemGroup>
42-
43+
4344
<ItemGroup Condition="$(IsNetFramework) == 'true'">
4445
<None Remove="System.Web" />
4546
<Reference Include="System.Web" />

‎samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<GenerateAssemblyInfo>true</GenerateAssemblyInfo> <!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
45
<TargetFramework>net47</TargetFramework>
@@ -31,10 +32,9 @@
3132

3233
<ItemGroup>
3334
<PackageReference Include="CompareNETObjects" Version="4.83.0" />
34-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0 " />
35-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1 " />
36-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
37-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.20 " />
35+
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
37+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.20" />
3838
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
3939
</ItemGroup>
4040
<ItemGroup>

‎samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<GenerateAssemblyInfo>true</GenerateAssemblyInfo> <!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
45
<TargetFramework>net47</TargetFramework>
@@ -31,10 +32,9 @@
3132

3233
<ItemGroup>
3334
<PackageReference Include="CompareNETObjects" Version="4.83.0" />
34-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0 " />
35-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1 " />
36-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
37-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.20 " />
35+
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
37+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.20" />
3838
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
3939
</ItemGroup>
4040
<ItemGroup>

‎samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<GenerateAssemblyInfo>true</GenerateAssemblyInfo> <!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
45
<TargetFramework>net47</TargetFramework>
@@ -30,10 +31,9 @@
3031
</Choose>
3132

3233
<ItemGroup>
33-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0 " />
34-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1 " />
35-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
36-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.20 " />
34+
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
36+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.20" />
3737
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
3838
</ItemGroup>
3939
<ItemGroup>

‎samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<GenerateAssemblyInfo>true</GenerateAssemblyInfo> <!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
45
<TargetFramework>net47</TargetFramework>
@@ -31,10 +32,9 @@
3132

3233
<ItemGroup>
3334
<PackageReference Include="CompareNETObjects" Version="4.83.0" />
34-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0 " />
35-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1 " />
36-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
37-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.20 " />
35+
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
37+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.20" />
3838
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
3939
</ItemGroup>
4040
<ItemGroup>

‎samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Org.OpenAPITools.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<GenerateAssemblyInfo>true</GenerateAssemblyInfo> <!-- setting GenerateAssemblyInfo to false causes this bug https://github.com/dotnet/project-system/issues/3934 -->
45
<TargetFramework>net47</TargetFramework>
@@ -31,10 +32,9 @@
3132

3233
<ItemGroup>
3334
<PackageReference Include="CompareNETObjects" Version="4.83.0" />
34-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0 " />
35-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1 " />
36-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
37-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.20 " />
35+
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
37+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.20" />
3838
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
3939
</ItemGroup>
4040
<ItemGroup>

0 commit comments

Comments
 (0)