Generate net client with v7, fix #46

giis-uniovi · Sep 22, 2023 · 4f6a74c · 4f6a74c
1 parent d3a7c19
commit 4f6a74c
Show file tree

Hide file tree

Showing 9 changed files with 201 additions and 200 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -16,10 +16,7 @@ updates:
 
   - package-ecosystem: nuget
     directory: "/net"
-    #avoids updates that cause not compilable code
     ignore:
-      - dependency-name: "RestSharp"
-        update-types: ["version-update:semver-major"]
       - dependency-name: "Microsoft.Data.SQLite"
     schedule:
       interval: weekly

diff --git a/net/OpenApiPostprocess/Program.cs b/net/OpenApiPostprocess/Program.cs
@@ -89,6 +89,9 @@ private string SetterName(string name)
             //las palabras reservadas originan propiedades con _ delante, quita este del nombre cuando genera setters y getters
             if (name.StartsWith("_"))
                 name = name.Substring(1, name.Length-1);
+            //as of generator v7 some properties get the prefix Var, only for Version at the moment
+            else if (name == "VarVersion")
+                name = "Version";
             return name;
         }
         // Ensures line endings compatible with generated code

diff --git a/net/TdRules/Giis.Tdrules.Openapi/Client/ApiClient.cs b/net/TdRules/Giis.Tdrules.Openapi/Client/ApiClient.cs
diff --git a/net/TdRules/Giis.Tdrules.Openapi/Client/Configuration.cs b/net/TdRules/Giis.Tdrules.Openapi/Client/Configuration.cs
diff --git a/net/TdRules/Giis.Tdrules.Openapi/Client/IReadableConfiguration.cs b/net/TdRules/Giis.Tdrules.Openapi/Client/IReadableConfiguration.cs
diff --git a/net/TdRules/Giis.Tdrules.Openapi/Giis.Tdrules.Openapi.csproj b/net/TdRules/Giis.Tdrules.Openapi/Giis.Tdrules.Openapi.csproj
diff --git a/net/TdRules/Giis.Tdrules.Openapi/Model/TdRules.cs b/net/TdRules/Giis.Tdrules.Openapi/Model/TdRules.cs
diff --git a/net/TdRules/TdRules.csproj b/net/TdRules/TdRules.csproj
@@ -51,7 +51,7 @@
 
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 
-    <PackageReference Include="RestSharp" Version="108.0.3" />
+    <PackageReference Include="RestSharp" Version="110.2.0" />
 
     <PackageReference Include="Polly" Version="7.2.4" />
 

diff --git a/net/build.xml b/net/build.xml
@@ -264,10 +264,7 @@
     <sequential>
       <mkdir dir="sharpen-temp/lib"/>
       <xmlproperty file="../pom.xml"/>
-      <!-- issue: #46, still not ready to oag v7.0.0
       <property name="OAG_VERSION" value="${project.properties.openapi.generator.version}" />
-      -->
-      <property name="OAG_VERSION" value="6.6.0" />
       <echo>Using openapi generator version ${OAG_VERSION}</echo>
       <get src="https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${OAG_VERSION}/openapi-generator-cli-${OAG_VERSION}.jar"
            dest="sharpen-temp/lib/openapi-generator-cli-${OAG_VERSION}.jar" usetimestamp="true" />
@@ -283,15 +280,19 @@
         <arg value="--input-spec" />
         <arg value="sharpen-temp/openapi/api.yml" />
         <arg value="--generator-name" />
-        <arg value="csharp-netcore" />
+        <arg value="csharp" />
+        <arg value="--additional-properties" />
+        <arg value="nullableReferenceTypes=false" />
         <arg value="--output" />
         <arg value="sharpen-temp/openapi" />
         <arg value="--package-name" />
         <arg value="Giis.Tdrules.Openapi" />
       </exec>
       <!--Copia y remplaza namespaces, a diferencia de java, no pone los especificados debajo de Org.openAPITools e Invoker se llama Client -->
       <copy todir="TdRules/Giis.Tdrules.Openapi" flatten="false" includeEmptyDirs="false" >
-        <fileset dir="sharpen-temp/openapi/src/Giis.Tdrules.Openapi/" />
+        <fileset dir="sharpen-temp/openapi/src/Giis.Tdrules.Openapi/" >
+          <exclude name="*.csproj" />
+        </fileset>
       </copy>
 
       <!--Postprocessing: add getters and setters to the model for java compatibility-->