diff --git a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml index 992d9ed592..22c4c84913 100644 --- a/.github/workflows/Pkg EdFi.Ods.CodeGen.yml +++ b/.github/workflows/Pkg EdFi.Ods.CodeGen.yml @@ -7,6 +7,9 @@ on: push: branches: - main-6x + paths: + - Utilities/CodeGeneration/**/* + - Application/EdFi.Common/**/* workflow_dispatch: env: diff --git a/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.OdsApi.Sdk.nuspec b/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.OdsApi.Sdk.nuspec index eea3031d9c..f31b848c6d 100644 --- a/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.OdsApi.Sdk.nuspec +++ b/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.OdsApi.Sdk.nuspec @@ -21,6 +21,6 @@ - + \ No newline at end of file diff --git a/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.SdkGen.Console.csproj b/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.SdkGen.Console.csproj index d935ed8206..00798d51cd 100644 --- a/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.SdkGen.Console.csproj +++ b/Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.SdkGen.Console.csproj @@ -1,22 +1,22 @@  - + Exe - net6.0 + net8.0 - + - + PreserveNewest - - - - + + + + - + PreserveNewest @@ -24,4 +24,4 @@ Always - + \ No newline at end of file diff --git a/Utilities/SdkGen/EdFi.SdkGen.Console/OpenApiCodeGenCliRunner.cs b/Utilities/SdkGen/EdFi.SdkGen.Console/OpenApiCodeGenCliRunner.cs index 3280a80109..5d4ba5b509 100644 --- a/Utilities/SdkGen/EdFi.SdkGen.Console/OpenApiCodeGenCliRunner.cs +++ b/Utilities/SdkGen/EdFi.SdkGen.Console/OpenApiCodeGenCliRunner.cs @@ -68,9 +68,9 @@ private void RunCliCodegen(IEnumerable apiEndpoints) // code-gen paramaters string[] @params = { - $"-jar {_options.CliExecutableFullName()}", "generate", "-g csharp-netcore", $"-i {apiEndpoint.EndpointUri}", + $"-jar {_options.CliExecutableFullName()}", "generate", "-g csharp", $"-i {apiEndpoint.EndpointUri}", $"--api-package {apiPackage}", $"--model-package {modelPackage}", $"-o {_options.OutputFolder}", - $"--additional-properties packageName={_options.Namespace},targetFramework=net6.0,netCoreProjectFile=true", + $"--additional-properties packageName={_options.Namespace},targetFramework=net8.0,netCoreProjectFile=true", "--global-property modelTests=false --global-property apiTests=false --skip-validate-spec" }; diff --git a/Utilities/SdkGen/EdFi.SdkGen.Console/Options.cs b/Utilities/SdkGen/EdFi.SdkGen.Console/Options.cs index 6a2b7101b9..c981f4c750 100644 --- a/Utilities/SdkGen/EdFi.SdkGen.Console/Options.cs +++ b/Utilities/SdkGen/EdFi.SdkGen.Console/Options.cs @@ -28,7 +28,7 @@ public sealed class Options [Option( 'v', "cliVersion", - Default = "6.0.1", + Default = "7.2.0", HelpText = "the version of openapi-codegen-cli to download")] public string CliVersion { get; set; }