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

[ODS-6227] Migrate SdkGen to target .NET 8 (5.x) #1096

Merged
merged 6 commits into from
Jul 5, 2024
Merged

[ODS-6227] Migrate SdkGen to target .NET 8 (5.x) #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c987456
Update SdkGen to .NET 8
mjaksn Jul 3, 2024
89ae80d
Add JavaPath parameter to SdkGen cli
mjaksn Jul 3, 2024
d80e866
Update SdkGen java cli parameter to 7.2.0
mjaksn Jul 3, 2024
3ecd103
Fix java CodeGen parameter
mjaksn Jul 3, 2024
3b7c67a
Update SdkGen nuspec
mjaksn Jul 3, 2024
fb7c03b
Update SmokeTest to handle Var prefixes on reserved words
mjaksn Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Utilities/DataLoading/EdFi.LoadTools/SmokeTest/PropertyBuilders/DescriptorPropertyBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public override bool BuildProperty(object obj, PropertyInfo propertyInfo)
.GetValue(lookup).ToString();

var uri = lookup.GetType()
.GetProperty(EdFiConstants.Namespace)
.GetProperty($"Var{EdFiConstants.Namespace}")
.GetValue(lookup);

var descriptorValue = uri != null && !string.IsNullOrEmpty(uri.ToString())
Expand Down
2 changes: 1 addition & 1 deletion Utilities/DataLoading/EdFi.LoadTools/SmokeTest/PropertyBuilders/NamespacePropertyBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public override bool BuildProperty(object obj, PropertyInfo propertyInfo)
{
var typeName = obj.GetType().Name;

if (propertyInfo.PropertyType != typeof(string) || propertyInfo.Name != EdFiConstants.Namespace)
if (propertyInfo.PropertyType != typeof(string) || propertyInfo.Name != $"Var{EdFiConstants.Namespace}")
{
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.OdsApi.Sdk.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
</metadata>
<files>
<file src="readme.txt" target="" />
<file src="csharp\src\EdFi.OdsApi.Sdk\bin\$configuration$\net6.0\EdFi.OdsApi.Sdk.dll" target="lib\net6.0" />
<file src="csharp\src\EdFi.OdsApi.Sdk\bin\$configuration$\net8.0\EdFi.OdsApi.Sdk.dll" target="lib\net6.0" />
</files>
</package>
28 changes: 14 additions & 14 deletions Utilities/SdkGen/EdFi.SdkGen.Console/EdFi.SdkGen.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFramework>net8.0</TargetFramework>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<Compile Remove="csharp\**" />
<EmbeddedResource Remove="csharp\**" />
<None Remove="csharp\**" />
</ItemGroup>
<ItemGroup>
<ItemGroup>
<Compile Remove="csharp\**" />
<EmbeddedResource Remove="csharp\**" />
<None Remove="csharp\**" />
</ItemGroup>
<ItemGroup>
<None Remove="readme.txt" />
</ItemGroup>
<ItemGroup>
<ItemGroup>
<Content Include="readme.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="log4net" Version="2.0.13" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<ItemGroup>
<None Update="EdFi.OdsApi.Sdk.nuspec">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="log4net.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
</Project>
7 changes: 3 additions & 4 deletions Utilities/SdkGen/EdFi.SdkGen.Console/OpenApiCodeGenCliRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public class OpenApiCodeGenCliRunner
private const string Profiles = "Profiles";
private const string Composites = "Composites";
private const string Identity = "Identity";
private const string Java = "java";
private const string All = "All";
private readonly ILog _log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private readonly Options _options;
Expand Down Expand Up @@ -68,15 +67,15 @@ private void RunCliCodegen(IEnumerable<OpenApiDetail> apiEndpoints)
// code-gen paramaters
string[] @params =
{
$"-Xms3g -jar {_options.CliExecutableFullName()}", "generate", "-g csharp-netcore", $"-i {apiEndpoint.EndpointUri}",
$"-Xms3g -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 --global-property apiDocs=false --global-property modelDocs=false --skip-validate-spec"
};

_log.Info($"Generating C# SDK for {apiEndpoint.EndpointUri}");

ShellProcess(Java, @params);
ShellProcess(_options.JavaPath, @params);
}
}

Expand Down
9 changes: 8 additions & 1 deletion Utilities/SdkGen/EdFi.SdkGen.Console/Options.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public sealed class Options
[Option(
'v',
"cliVersion",
Default = "6.6.0",
Default = "7.2.0",
HelpText = "the version of openapi-codegen-cli to download")]
public string CliVersion { get; set; }

Expand Down Expand Up @@ -74,6 +74,13 @@ public sealed class Options
HelpText = "include identity in the generation of the assembly")]
public bool IncludeIdentity { get; set; }

[Option(
'j',
"java-path",
Default = "java",
HelpText = "the path to the java executable")]
public string JavaPath { get; set; }

[Option(
'k',
"core-only",
Expand Down
Loading