diff --git a/.github/workflows/production-tests.yml b/.github/workflows/production-tests.yml index 57dd71d09e..41486dbd9d 100644 --- a/.github/workflows/production-tests.yml +++ b/.github/workflows/production-tests.yml @@ -235,43 +235,11 @@ jobs: working-directory: test - name: Generate code with Kiota - run: | - rapicgen -v csharp kiota ./OpenApi.${{ matrix.format }} GeneratedCode ./GeneratedCode/Kiota/Output.cs --no-logging - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net6/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net7/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net48/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net472/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net462/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net481/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/NetStandard20/Output.cs - working-directory: test - - - name: Build .NET 6 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net6/Net6.csproj + run: rapicgen -v csharp kiota ./OpenApi.${{ matrix.format }} GeneratedCode ./GeneratedCode/Kiota/Output.cs --no-logging working-directory: test - - name: Build .NET 7 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net7/Net7.csproj - working-directory: test - - - name: Build .NET 4.8.1 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net481/Net481.csproj - if: ${{ matrix.os == 'windows-2022' }} - working-directory: test - - - name: Build .NET 4.8 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net48/Net48.csproj - working-directory: test - - - name: Build .NET 4.7.2 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net472/Net472.csproj - working-directory: test - - - name: Build .NET 4.6.2 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net462/Net462.csproj - working-directory: test - - name: Build .NET Standard 2.0 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/NetStandard20/NetStandard20.csproj + - name: Build Kiota generated code + run: dotnet build ./GeneratedCode/Kiota/Kiota.sln working-directory: test JMeter: diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml index d1f3ba6ef4..420f7f27a1 100644 --- a/.github/workflows/regression-tests.yml +++ b/.github/workflows/regression-tests.yml @@ -249,49 +249,11 @@ jobs: working-directory: test - name: Generate code with Kiota - run: | - dotnet run --project ../src/CLI/ApiClientCodeGen.CLI/ApiClientCodeGen.CLI.csproj -- -v csharp kiota ./OpenApi.${{ matrix.format }} GeneratedCode ./GeneratedCode/Kiota/Output.cs --no-logging - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net6/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net7/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net48/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net472/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net462/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net481/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/NetStandard20/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/NetStandard21/Output.cs - working-directory: test - - - name: Build .NET 6 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net6/Net6.csproj - working-directory: test - - - name: Build .NET 7 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net7/Net7.csproj - working-directory: test - - - name: Build .NET 4.8.1 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net481/Net481.csproj - if: ${{ matrix.os == 'windows-2022' }} - working-directory: test - - - name: Build .NET 4.8 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net48/Net48.csproj - working-directory: test - - - name: Build .NET 4.7.2 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net472/Net472.csproj - working-directory: test - - - name: Build .NET 4.6.2 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net462/Net462.csproj - working-directory: test - - - name: Build .NET Standard 2.0 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/NetStandard20/NetStandard20.csproj + run: dotnet run --project ../src/CLI/ApiClientCodeGen.CLI/ApiClientCodeGen.CLI.csproj -- -v csharp kiota ./OpenApi.${{ matrix.format }} GeneratedCode ./GeneratedCode/Kiota/Output.cs --no-logging working-directory: test - - name: Build .NET Standard 2.1 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/NetStandard21/NetStandard21.csproj + - name: Build Kiota generated code + run: dotnet build ./GeneratedCode/Kiota/Kiota.sln working-directory: test - name: Generate code with Refitter diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 35fbb8d533..fa8c782de2 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -55,6 +55,7 @@ jobs: 6.0.x 7.0.x 8.0.x + 9.0.x - name: Prepare Swagger Petstore OpenAPI Spec run: cp ./OpenAPI/${{ matrix.version }}/Swagger.${{ matrix.format }} ./OpenApi.${{ matrix.format }} @@ -247,50 +248,12 @@ jobs: working-directory: test - name: Generate code with Kiota - run: | - dotnet run --project ../src/CLI/ApiClientCodeGen.CLI/ApiClientCodeGen.CLI.csproj -- -v csharp kiota ./OpenApi.${{ matrix.format }} GeneratedCode ./GeneratedCode/Kiota/Output.cs --no-logging - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net6/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net7/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net48/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net472/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net462/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/Net481/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/NetStandard20/Output.cs - cp ./GeneratedCode/Kiota/Output.cs ./GeneratedCode/Kiota/NetStandard21/Output.cs + run: dotnet run --project ../src/CLI/ApiClientCodeGen.CLI/ApiClientCodeGen.CLI.csproj -- -v csharp kiota ./OpenApi.${{ matrix.format }} GeneratedCode ./GeneratedCode/Kiota/Output.cs --no-logging working-directory: test continue-on-error: ${{ matrix.os == 'macos-12' }} - - name: Build .NET 6 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net6/Net6.csproj - working-directory: test - - - name: Build .NET 7 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net7/Net7.csproj - working-directory: test - - - name: Build .NET 4.8.1 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net481/Net481.csproj - if: ${{ matrix.os == 'windows-2022' }} - working-directory: test - - - name: Build .NET 4.8 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net48/Net48.csproj - working-directory: test - - - name: Build .NET 4.7.2 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net472/Net472.csproj - working-directory: test - - - name: Build .NET 4.6.2 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/Net462/Net462.csproj - working-directory: test - - - name: Build .NET Standard 2.0 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/NetStandard20/NetStandard20.csproj - working-directory: test - - - name: Build .NET Standard 2.1 Kiota generated code - run: dotnet build ./GeneratedCode/Kiota/NetStandard21/NetStandard21.csproj + - name: Build Kiota generated code + run: dotnet build ./GeneratedCode/Kiota/Kiota.sln working-directory: test - name: Generate code with Refitter diff --git a/test/GeneratedCode/Kiota/Directory.build.props b/test/GeneratedCode/Kiota/Directory.build.props new file mode 100644 index 0000000000..665713570f --- /dev/null +++ b/test/GeneratedCode/Kiota/Directory.build.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/GeneratedCode/Kiota/Kiota.sln b/test/GeneratedCode/Kiota/Kiota.sln new file mode 100644 index 0000000000..ef9ec0e3a8 --- /dev/null +++ b/test/GeneratedCode/Kiota/Kiota.sln @@ -0,0 +1,76 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net462", "Net462\Net462.csproj", "{A4CC4741-A2A8-4F8A-B41A-844F63949625}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net472", "Net472\Net472.csproj", "{8F0BA70C-F0CD-45DF-82B4-C85364C9F66E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net48", "Net48\Net48.csproj", "{AAF5514B-BFC7-41EC-B57E-2C7C1191AC76}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net481", "Net481\Net481.csproj", "{43E9EB91-1543-423A-8998-DFDA8FE3D8B9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net6", "Net6\Net6.csproj", "{1E861F86-69F2-4A4A-B80E-D116E5AA10F9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net7", "Net7\Net7.csproj", "{0CD12A0B-2B40-4E78-A2FD-6F481498AD44}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net8", "Net8\Net8.csproj", "{E6C8F2A5-1EE2-4F92-A268-D3976EE2D8DB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net9", "Net9\Net9.csproj", "{F8504AFF-4EA9-4044-850B-6E6FE01FA73B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetStandard20", "NetStandard20\NetStandard20.csproj", "{AB5F029F-88FA-40DC-9A3F-49BE8ED68923}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetStandard21", "NetStandard21\NetStandard21.csproj", "{9A2DF2C7-3BDD-41C8-994F-9020F03B7A1C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A4CC4741-A2A8-4F8A-B41A-844F63949625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4CC4741-A2A8-4F8A-B41A-844F63949625}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4CC4741-A2A8-4F8A-B41A-844F63949625}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4CC4741-A2A8-4F8A-B41A-844F63949625}.Release|Any CPU.Build.0 = Release|Any CPU + {8F0BA70C-F0CD-45DF-82B4-C85364C9F66E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8F0BA70C-F0CD-45DF-82B4-C85364C9F66E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8F0BA70C-F0CD-45DF-82B4-C85364C9F66E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8F0BA70C-F0CD-45DF-82B4-C85364C9F66E}.Release|Any CPU.Build.0 = Release|Any CPU + {AAF5514B-BFC7-41EC-B57E-2C7C1191AC76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AAF5514B-BFC7-41EC-B57E-2C7C1191AC76}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AAF5514B-BFC7-41EC-B57E-2C7C1191AC76}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AAF5514B-BFC7-41EC-B57E-2C7C1191AC76}.Release|Any CPU.Build.0 = Release|Any CPU + {43E9EB91-1543-423A-8998-DFDA8FE3D8B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {43E9EB91-1543-423A-8998-DFDA8FE3D8B9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {43E9EB91-1543-423A-8998-DFDA8FE3D8B9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {43E9EB91-1543-423A-8998-DFDA8FE3D8B9}.Release|Any CPU.Build.0 = Release|Any CPU + {1E861F86-69F2-4A4A-B80E-D116E5AA10F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E861F86-69F2-4A4A-B80E-D116E5AA10F9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E861F86-69F2-4A4A-B80E-D116E5AA10F9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E861F86-69F2-4A4A-B80E-D116E5AA10F9}.Release|Any CPU.Build.0 = Release|Any CPU + {0CD12A0B-2B40-4E78-A2FD-6F481498AD44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0CD12A0B-2B40-4E78-A2FD-6F481498AD44}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0CD12A0B-2B40-4E78-A2FD-6F481498AD44}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0CD12A0B-2B40-4E78-A2FD-6F481498AD44}.Release|Any CPU.Build.0 = Release|Any CPU + {E6C8F2A5-1EE2-4F92-A268-D3976EE2D8DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6C8F2A5-1EE2-4F92-A268-D3976EE2D8DB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6C8F2A5-1EE2-4F92-A268-D3976EE2D8DB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6C8F2A5-1EE2-4F92-A268-D3976EE2D8DB}.Release|Any CPU.Build.0 = Release|Any CPU + {F8504AFF-4EA9-4044-850B-6E6FE01FA73B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F8504AFF-4EA9-4044-850B-6E6FE01FA73B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F8504AFF-4EA9-4044-850B-6E6FE01FA73B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F8504AFF-4EA9-4044-850B-6E6FE01FA73B}.Release|Any CPU.Build.0 = Release|Any CPU + {AB5F029F-88FA-40DC-9A3F-49BE8ED68923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AB5F029F-88FA-40DC-9A3F-49BE8ED68923}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AB5F029F-88FA-40DC-9A3F-49BE8ED68923}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AB5F029F-88FA-40DC-9A3F-49BE8ED68923}.Release|Any CPU.Build.0 = Release|Any CPU + {9A2DF2C7-3BDD-41C8-994F-9020F03B7A1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9A2DF2C7-3BDD-41C8-994F-9020F03B7A1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9A2DF2C7-3BDD-41C8-994F-9020F03B7A1C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9A2DF2C7-3BDD-41C8-994F-9020F03B7A1C}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/test/GeneratedCode/Kiota/Net462/Net462.csproj b/test/GeneratedCode/Kiota/Net462/Net462.csproj index 0077bd7dbc..ecf2464fa3 100644 --- a/test/GeneratedCode/Kiota/Net462/Net462.csproj +++ b/test/GeneratedCode/Kiota/Net462/Net462.csproj @@ -14,12 +14,4 @@ - - - - - - - - \ No newline at end of file diff --git a/test/GeneratedCode/Kiota/Net472/Net472.csproj b/test/GeneratedCode/Kiota/Net472/Net472.csproj index 7816ee7aa1..cc2e86a9ad 100644 --- a/test/GeneratedCode/Kiota/Net472/Net472.csproj +++ b/test/GeneratedCode/Kiota/Net472/Net472.csproj @@ -14,12 +14,4 @@ - - - - - - - - \ No newline at end of file diff --git a/test/GeneratedCode/Kiota/Net48/Net48.csproj b/test/GeneratedCode/Kiota/Net48/Net48.csproj index 8dd7e7004f..6730bd4384 100644 --- a/test/GeneratedCode/Kiota/Net48/Net48.csproj +++ b/test/GeneratedCode/Kiota/Net48/Net48.csproj @@ -14,12 +14,4 @@ - - - - - - - - \ No newline at end of file diff --git a/test/GeneratedCode/Kiota/Net481/Net481.csproj b/test/GeneratedCode/Kiota/Net481/Net481.csproj index 208ed62b7c..1e9dccb230 100644 --- a/test/GeneratedCode/Kiota/Net481/Net481.csproj +++ b/test/GeneratedCode/Kiota/Net481/Net481.csproj @@ -14,12 +14,4 @@ - - - - - - - - \ No newline at end of file diff --git a/test/GeneratedCode/Kiota/Net6/Net6.csproj b/test/GeneratedCode/Kiota/Net6/Net6.csproj index 5718ceb562..bc17d6564f 100644 --- a/test/GeneratedCode/Kiota/Net6/Net6.csproj +++ b/test/GeneratedCode/Kiota/Net6/Net6.csproj @@ -2,12 +2,4 @@ net6.0 - - - - - - - - \ No newline at end of file diff --git a/test/GeneratedCode/Kiota/Net7/Net7.csproj b/test/GeneratedCode/Kiota/Net7/Net7.csproj index 60037f59f9..40711dc521 100644 --- a/test/GeneratedCode/Kiota/Net7/Net7.csproj +++ b/test/GeneratedCode/Kiota/Net7/Net7.csproj @@ -2,12 +2,4 @@ net7.0 - - - - - - - - \ No newline at end of file diff --git a/test/GeneratedCode/Kiota/Net8/Net8.csproj b/test/GeneratedCode/Kiota/Net8/Net8.csproj new file mode 100644 index 0000000000..fe759fc009 --- /dev/null +++ b/test/GeneratedCode/Kiota/Net8/Net8.csproj @@ -0,0 +1,5 @@ + + + net8.0 + + \ No newline at end of file diff --git a/test/GeneratedCode/Kiota/Net9/Net9.csproj b/test/GeneratedCode/Kiota/Net9/Net9.csproj new file mode 100644 index 0000000000..b1ddd4e71f --- /dev/null +++ b/test/GeneratedCode/Kiota/Net9/Net9.csproj @@ -0,0 +1,5 @@ + + + net9.0 + + \ No newline at end of file diff --git a/test/GeneratedCode/Kiota/NetStandard20/NetStandard20.csproj b/test/GeneratedCode/Kiota/NetStandard20/NetStandard20.csproj index 8623afffc9..9f9cb45a0b 100644 --- a/test/GeneratedCode/Kiota/NetStandard20/NetStandard20.csproj +++ b/test/GeneratedCode/Kiota/NetStandard20/NetStandard20.csproj @@ -2,12 +2,4 @@ netstandard2.0 - - - - - - - - \ No newline at end of file diff --git a/test/GeneratedCode/Kiota/NetStandard21/NetStandard21.csproj b/test/GeneratedCode/Kiota/NetStandard21/NetStandard21.csproj index 8fa4ff7c4c..f096a0d1ef 100644 --- a/test/GeneratedCode/Kiota/NetStandard21/NetStandard21.csproj +++ b/test/GeneratedCode/Kiota/NetStandard21/NetStandard21.csproj @@ -2,12 +2,4 @@ netstandard2.1 - - - - - - - - \ No newline at end of file