updated openapi-generator for Dotnet to 7.12.0 (#474)

Co-authored-by: Juan Treminio <juantreminio@dropbox.com>

Author: shuyck

sdks/dotnet/.github/workflows/github-actions.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
 
       - name: Restore dependencies
         run: dotnet restore ${SOLUTION}.sln

sdks/dotnet/.gitignore

@@ -361,6 +361,8 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 
+git_push.sh
+global.json
 vendor
 /api
 .openapi-generator

sdks/dotnet/.openapi-generator-ignore

@@ -21,7 +21,3 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
-
-git_push.sh
-**/Model/*AllOf*
-docs/*AllOf*

sdks/dotnet/Dropbox.Sign.sln

@@ -23,8 +23,8 @@ directory that corresponds to the file you want updated.
 This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 3.0.0
-- SDK version: 1.8-dev
-- Generator version: 7.8.0
+- SDK version: 2.0-dev
+- Generator version: 7.12.0
 - Build package: org.openapitools.codegen.languages.CSharpClientCodegen
 
 ### Building
@@ -49,7 +49,7 @@ this command.
 <a id="dependencies"></a>
 ## Dependencies
 
-- [RestSharp](https://www.nuget.org/packages/RestSharp) - 106.13.0 or later
+- [RestSharp](https://www.nuget.org/packages/RestSharp) - 112.0.0 or later
 - [Json.NET](https://www.nuget.org/packages/Newtonsoft.Json/) - 13.0.2 or later
 - [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/) - 1.8.0 or later
 - [System.ComponentModel.Annotations](https://www.nuget.org/packages/System.ComponentModel.Annotations) - 5.0.0 or later

sdks/dotnet/README.md

@@ -1 +1 @@
-1.8-dev
+2.0-dev

sdks/dotnet/VERSION

@@ -0,0 +1,64 @@
+#!/usr/bin/env php
+<?php
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ALL);
+
+set_error_handler(function ($level, $msg) {
+    echo "Error: {$msg}";
+    exit(1);
+});
+
+/**
+ * Between openapi-generator v7.8.0 and v7.12.0 a change was made to the way
+ * a few generators create constant names from values. The original way was
+ * actually broken. For example "change-field-visibility" would generate a
+ * constant name of "TYPE_FIELD_VISIBILITY", dropping the "change" part.
+ *
+ * The fix now generates the correct name, "TYPE_CHANGE_FIELD_VISIBILITY".
+ * However, the fix also gets rid of the previous (incorrect) constant names,
+ * making the fix a BC break.
+ *
+ * This simple script just adds the old constant names back, alongside the new
+ * ones.
+ */
+class CopyConstants
+{
+    public function run(): void
+    {
+        $file = __DIR__ . '/../src/Dropbox.Sign/Model/SubFormFieldRuleAction.cs';
+        $contents = file_get_contents($file);
+
+        $constant_1 = "            ChangeFieldVisibility = 1,";
+        $replace_1 = implode("\n", [
+            $constant_1,
+            '            FieldVisibility = ChangeFieldVisibility,',
+        ]);
+
+        $constant_2 = "            ChangeGroupVisibility = 2";
+        $replace_2 = implode(",\n", [
+            $constant_2,
+            '            GroupVisibility = ChangeGroupVisibility',
+        ]);
+
+        $contents = str_replace(
+            $constant_1,
+            $replace_1,
+            $contents,
+        );
+
+        $contents = str_replace(
+            $constant_2,
+            $replace_2,
+            $contents,
+        );
+
+        file_put_contents($file, $contents);
+    }
+}
+
+$copier = new CopyConstants();
+$copier->run();

sdks/dotnet/bin/copy-constants.php

@@ -12,4 +12,4 @@ docker run --rm \
   -v "${ROOT_DIR}:${WORKING_DIR}" \
   -w "${WORKING_DIR}" \
   -u root:root \
-  mcr.microsoft.com/dotnet/sdk:6.0 "$@"
+  mcr.microsoft.com/dotnet/sdk:8.0 "$@"

sdks/dotnet/bin/dotnet

@@ -6,11 +6,12 @@ additionalProperties:
   packageCompany: Dropbox Sign API Team
   packageCopyright: Dropbox 2024
   packageDescription: Client library for using the Dropbox Sign API
-  packageVersion: 1.8-dev
+  packageVersion: 2.0-dev
   packageTitle: Dropbox Sign .Net SDK
   sortModelPropertiesByRequiredFlag: true
   optionalEmitDefaultValues: true
-  targetFramework: net6.0
+  targetFramework: net8.0
+  library: restsharp
   packageGuid: "{F8C8232D-7020-4603-8E04-18D060AE530B}"
   legacyDiscriminatorBehavior: true
   useCustomTemplateCode: true

sdks/dotnet/openapi-config.yaml

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# see https://github.com/OpenAPITools/openapi-generator/tree/v7.8.0/modules/openapi-generator/src/main/resources/csharp
+# see https://github.com/OpenAPITools/openapi-generator/tree/v7.12.0/modules/openapi-generator/src/main/resources/csharp
 
 set -e
 
@@ -18,7 +18,7 @@ rm -f "${DIR}/src/Dropbox.Sign/Model/"*.cs
 
 docker run --rm \
   -v "${DIR}/:/local" \
-  openapitools/openapi-generator-cli:v7.8.0 generate \
+  openapitools/openapi-generator-cli:v7.12.0 generate \
     -i "/local/openapi-sdk.yaml" \
     -c "/local/openapi-config.yaml" \
     -t "/local/templates" \
@@ -46,6 +46,9 @@ docker run --rm \
   -w "${WORKING_DIR}" \
   perl bash ./bin/scan_for
 
+printf "Adding old-style constant names ...\n"
+bash "${DIR}/bin/php" ./bin/copy-constants.php
+
 # avoid docker messing with permissions
 if [[ -z "$GITHUB_ACTIONS" ]]; then
   chmod 644 "${DIR}/README.md"