Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[csharp] bump version to .net8 #20384

Merged
merged 1 commit into from
Dec 30, 2024
Merged

[csharp] bump version to .net8 #20384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions ...lows/samples-dotnet6-client-echo-api.yaml → ...lows/samples-dotnet8-client-echo-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Samples C# .Net 6 Client Echo API
name: Samples C# .Net 8 Client Echo API

on:
push:
paths:
- samples/client/echo_api/csharp-restsharp/**
- samples/client/echo_api/csharp/restsharp/net8/**
pull_request:
paths:
- samples/client/echo_api/csharp-restsharp/**
- samples/client/echo_api/csharp/restsharp/net8/**
jobs:
build:
name: Build .Net clients
Expand All @@ -16,12 +16,12 @@ jobs:
matrix:
sample:
# clients
- samples/client/echo_api/csharp-restsharp/
- samples/client/echo_api/csharp/restsharp/net8/EchoApi
steps:
- uses: actions/checkout@v4
- uses: actions/[email protected]
with:
dotnet-version: '6.0.x'
dotnet-version: '8.0.x'
- name: Run echo server
run: |
git clone https://github.com/wing328/http-echo-server -b openapi-generator-test-server
Expand Down
10 changes: 5 additions & 5 deletions ...hub/workflows/samples-dotnet6-client.yaml → ...hub/workflows/samples-dotnet8-client.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Samples C# .Net 6 Client
name: Samples C# .Net 8 Client

on:
push:
paths:
- samples/client/petstore/csharp/restsharp/net6/**
- samples/client/petstore/csharp/restsharp/net8/**
pull_request:
paths:
- samples/client/petstore/csharp/restsharp/net6/**
- samples/client/petstore/csharp/restsharp/net8/**
jobs:
build:
name: Build .Net clients
Expand All @@ -15,12 +15,12 @@ jobs:
fail-fast: false
matrix:
sample:
- samples/client/petstore/csharp/restsharp/net6/ParameterMappings/
- samples/client/petstore/csharp/restsharp/net8/ParameterMappings/
steps:
- uses: actions/checkout@v4
- uses: actions/[email protected]
with:
dotnet-version: '6.0.x'
dotnet-version: '8.0.x'
- name: Build
working-directory: ${{ matrix.sample }}
run: dotnet build Org.OpenAPITools.sln
8 changes: 4 additions & 4 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ test_script:
- dotnet test samples\client\petstore\csharp\restsharp\net4.7\MultipleFrameworks\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\net4.7\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\net4.8\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\net6\ParameterMappings\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\net7\EnumMappings\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\net7\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\net7\UseDateTimeForDate\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\net8\ParameterMappings\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\net8\EnumMappings\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\net8\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\net8\UseDateTimeForDate\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\standard2.0\ConditionalSerialization\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
- dotnet test samples\client\petstore\csharp\restsharp\standard2.0\Petstore\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj

Expand Down
4 changes: 2 additions & 2 deletions ...p-restsharp-net7.0-compareNetObjects.yaml → ...arp-restsharp-net8-compareNetObjects.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
generatorName: csharp
outputDir: samples/client/petstore/csharp/restsharp/net7/Petstore
outputDir: samples/client/petstore/csharp/restsharp/net8/Petstore
inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
templateDir: modules/openapi-generator/src/main/resources/csharp
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
targetFramework: net7.0
targetFramework: net8.0
useCompareNetObjects: "true"
equatable: true
4 changes: 2 additions & 2 deletions bin/configs/csharp-restsharp-echo-api.yaml → ...nfigs/csharp-restsharp-net8-echo-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
generatorName: csharp
outputDir: samples/client/echo_api/csharp-restsharp
outputDir: samples/client/echo_api/csharp/restsharp/net8/EchoApi
inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
templateDir: modules/openapi-generator/src/main/resources/csharp
additionalProperties:
packageGuid: '{322C8CAF-0156-40C1-AE42-D59761FB9B6C}'
targetFramework: net6.0
targetFramework: net8.0
setCompareNetObjects: "true"
hideGenerationTimestamp: "true"
equatable: true
4 changes: 2 additions & 2 deletions ...sharp-restsharp-net6.0-name-mappings.yaml → .../csharp-restsharp-net8-name-mappings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
generatorName: csharp
outputDir: samples/client/petstore/csharp/restsharp/net6/ParameterMappings
outputDir: samples/client/petstore/csharp/restsharp/net8/ParameterMappings
inputSpec: modules/openapi-generator/src/test/resources/3_0/name-parameter-mappings.yaml
templateDir: modules/openapi-generator/src/main/resources/csharp
nameMappings:
Expand All @@ -15,5 +15,5 @@ modelNameMappings:
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
hideGenerationTimestamp: "true"
targetFramework: net6.0
targetFramework: net8.0
equatable: true
4 changes: 2 additions & 2 deletions ...-restsharp-net7.0-useDateTimeForDate.yaml → ...rp-restsharp-net8-useDateTimeForDate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# for .net standard
generatorName: csharp
outputDir: samples/client/petstore/csharp/restsharp/net7/UseDateTimeForDate
outputDir: samples/client/petstore/csharp/restsharp/net8/UseDateTimeForDate
inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/dates-api.yaml
templateDir: modules/openapi-generator/src/main/resources/csharp
additionalProperties:
packageGuid: '{D0A67E81-4061-48EB-B4B8-C73BDF8B2D95}'
targetFramework: net7.0
targetFramework: net8.0
useDateTimeForDate: true
4 changes: 2 additions & 2 deletions bin/configs/csharp-restsharp-net7.0.yaml → bin/configs/csharp-restsharp-net8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# for .net standard
generatorName: csharp
outputDir: samples/client/petstore/csharp/restsharp/net7/EnumMappings
outputDir: samples/client/petstore/csharp/restsharp/net8/EnumMappings
inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature-oneof-primitive-types.yaml
templateDir: modules/openapi-generator/src/main/resources/csharp
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
useCompareNetObjects: true
disallowAdditionalPropertiesIfNotPresent: false
useOneOfDiscriminatorLookup: true
targetFramework: net7.0
targetFramework: net8.0
equatable: true
enumNameMappings:
delivered: Shipped
2 changes: 0 additions & 2 deletions samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools.Test/.editorconfig
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools.Test/CustomTest.cs
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions ...es/client/echo_api/csharp-restsharp/src/Org.OpenAPITools.Test/EchoServerResponseParser.cs
View file
Open in desktop

This file was deleted.

0 ...ient/echo_api/csharp-restsharp/.gitignore → .../csharp/restsharp/net8/EchoApi/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...sharp-restsharp/.openapi-generator-ignore → ...rp/net8/EchoApi/.openapi-generator-ignore
View file
Open in desktop
File renamed without changes.
0 ...csharp-restsharp/.openapi-generator/FILES → ...arp/net8/EchoApi/.openapi-generator/FILES
View file
Open in desktop
File renamed without changes.
0 ...harp-restsharp/.openapi-generator/VERSION → ...p/net8/EchoApi/.openapi-generator/VERSION
View file
Open in desktop
File renamed without changes.
0 ...api/csharp-restsharp/Org.OpenAPITools.sln → ...stsharp/net8/EchoApi/Org.OpenAPITools.sln
View file
Open in desktop
File renamed without changes.
0 ...lient/echo_api/csharp-restsharp/README.md → ...i/csharp/restsharp/net8/EchoApi/README.md
View file
Open in desktop
File renamed without changes.
0 ...cho_api/csharp-restsharp/api/openapi.yaml → ...p/restsharp/net8/EchoApi/api/openapi.yaml
View file
Open in desktop
File renamed without changes.
0 ...nt/echo_api/csharp-restsharp/appveyor.yml → ...sharp/restsharp/net8/EchoApi/appveyor.yml
View file
Open in desktop
File renamed without changes.
0 ...echo_api/csharp-restsharp/docs/AuthApi.md → ...rp/restsharp/net8/EchoApi/docs/AuthApi.md
View file
Open in desktop
File renamed without changes.
0 ...nt/echo_api/csharp-restsharp/docs/Bird.md → ...sharp/restsharp/net8/EchoApi/docs/Bird.md
View file
Open in desktop
File renamed without changes.
0 ...echo_api/csharp-restsharp/docs/BodyApi.md → ...rp/restsharp/net8/EchoApi/docs/BodyApi.md
View file
Open in desktop
File renamed without changes.
0 ...cho_api/csharp-restsharp/docs/Category.md → ...p/restsharp/net8/EchoApi/docs/Category.md
View file
Open in desktop
File renamed without changes.
0 ...ho_api/csharp-restsharp/docs/DataQuery.md → .../restsharp/net8/EchoApi/docs/DataQuery.md
View file
Open in desktop
File renamed without changes.
0 ...api/csharp-restsharp/docs/DefaultValue.md → ...stsharp/net8/EchoApi/docs/DefaultValue.md
View file
Open in desktop
File renamed without changes.
0 ...echo_api/csharp-restsharp/docs/FormApi.md → ...rp/restsharp/net8/EchoApi/docs/FormApi.md
View file
Open in desktop
File renamed without changes.
0 ...ho_api/csharp-restsharp/docs/HeaderApi.md → .../restsharp/net8/EchoApi/docs/HeaderApi.md
View file
Open in desktop
File renamed without changes.
0 ...rp-restsharp/docs/NumberPropertiesOnly.md → ...net8/EchoApi/docs/NumberPropertiesOnly.md
View file
Open in desktop
File renamed without changes.
0 ...echo_api/csharp-restsharp/docs/PathApi.md → ...rp/restsharp/net8/EchoApi/docs/PathApi.md
View file
Open in desktop
File renamed without changes.
0 ...ent/echo_api/csharp-restsharp/docs/Pet.md → ...csharp/restsharp/net8/EchoApi/docs/Pet.md
View file
Open in desktop
File renamed without changes.
0 ...t/echo_api/csharp-restsharp/docs/Query.md → ...harp/restsharp/net8/EchoApi/docs/Query.md
View file
Open in desktop
File renamed without changes.
0 ...cho_api/csharp-restsharp/docs/QueryApi.md → ...p/restsharp/net8/EchoApi/docs/QueryApi.md
View file
Open in desktop
File renamed without changes.
0 ...pi/csharp-restsharp/docs/StringEnumRef.md → ...tsharp/net8/EchoApi/docs/StringEnumRef.md
View file
Open in desktop
File renamed without changes.
0 ...ent/echo_api/csharp-restsharp/docs/Tag.md → ...csharp/restsharp/net8/EchoApi/docs/Tag.md
View file
Open in desktop
File renamed without changes.
0 ...s/TestFormObjectMultipartRequestMarker.md → ...s/TestFormObjectMultipartRequestMarker.md
View file
Open in desktop
File renamed without changes.
0 ...odeTrueObjectAllOfQueryObjectParameter.md → ...odeTrueObjectAllOfQueryObjectParameter.md
View file
Open in desktop
File renamed without changes.
0 ...odeTrueArrayStringQueryObjectParameter.md → ...odeTrueArrayStringQueryObjectParameter.md
View file
Open in desktop
File renamed without changes.
0 ...ent/echo_api/csharp-restsharp/git_push.sh → ...csharp/restsharp/net8/EchoApi/git_push.sh
View file
Open in desktop
File renamed without changes.
11 changes: 11 additions & 0 deletions ...Org.OpenAPITools.Test/Api/AuthApiTests.cs → ...Org.OpenAPITools.Test/Api/AuthApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,16 @@ public void TestAuthHttpBasicTest()
//var response = instance.TestAuthHttpBasic();
//Assert.IsType<string>(response);
}

/// <summary>
/// Test TestAuthHttpBearer
/// </summary>
[Fact]
public void TestAuthHttpBearerTest()
{
// TODO uncomment below to test the method and replace null with proper value
//var response = instance.TestAuthHttpBearer();
//Assert.IsType<string>(response);
}
}
}
Loading
Loading