Fix float/double default value in C# generator (OpenAPITools#791)

* fix float/double default value

* better code format

* better CI for openapi3 batch files (C# client)

* update nancyfx samples

* pipe output to /dev/null to reduce log size

* fix windows batch file

* add C# API client generated by OAS3 spec

Author: wing328

CI/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj renamed to CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj

@@ -35,13 +35,19 @@ build_script:
   # install openapi-generator locally
   - mvn clean install --quiet
 test_script:
+  # restore test-related files
+  - copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # test c# API client
   - nunit-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
   # test c# API client (with PropertyChanged)
   - nunit-console samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
 
   # generate all petstore clients
   - .\bin\windows\run-all-petstore.cmd
+
+  # generate all petstore clients (openapi3)
+  - .\bin\openapi3\windows\run-all-petstore.cmd
+
 cache:
   - C:\maven\
   - C:\Users\appveyor\.m2

appveyor.yml

@@ -29,8 +29,9 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} $@"
 
+java $JAVA_OPTS -jar $executable $ags
+
 # restore csproj file
 echo "restore csproject file: CI/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj"
-cp ./CI/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/
+cp ./CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/
 
-java $JAVA_OPTS -jar $executable $ags

bin/csharp-petstore.sh

@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate $@ -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C}"
+ags="generate $@ -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/openapi3/client/petstore/csharp/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C}"
 
 java $JAVA_OPTS -jar $executable $ags

bin/openapi3/csharp-petstore.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+# this bash script will loop through all the .sh files under bin
+# execute the script and check the result (exit code) to see if
+# there's any error
+
+echo "IMPORTANT: this script should be run by the CI (e.g. Shippable) only. There's no need to run this script to update Petstore samples for all generators."
+echo "Please press CTRL+C to stop or the script will continue in 10 seconds."
+
+sleep 10
+
+successes=0
+failures=0
+for SCRIPT in $(ls -l ./bin/openapi3/*.sh | grep -v all)
+do
+    if [ -f ${SCRIPT} -a -x ${SCRIPT} ]; then
+        echo "Running $SCRIPT (output to /dev/null)"
+        ${SCRIPT} 2>&1 > /dev/null
+        rc=$?
+        if [[ ${rc} != 0 ]]; then
+            >&2 echo "ERROR!! FAILED TO RUN ${SCRIPT}"
+            ((failures+=1))
+        else
+            ((successes+=1))
+        fi
+    fi
+done
+
+if (( failures > 0 )); then
+   >&2 echo "[ERROR] ${failures} out of $((failures+successes)) scripts failed."
+   exit 1
+else
+    echo "[SUCCESS] ${successes} generators finished."
+fi

bin/openapi3/run-all-petstore

@@ -0,0 +1,14 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\openapi-generator\src\test/resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples\openapi3\client\petstore\csharp\SwaggerClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C}
+
+java %JAVA_OPTS% -jar %executable% %ags%
+
+REM restore csproj file
+echo "restore csproject file: CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj"
+copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\openapi3\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\

bin/openapi3/windows/csharp-petstore.bat

@@ -0,0 +1,15 @@
+REM this batch file will loop through all the .bat files under bin\openapi3\windows\
+REM execute the script and check the error level to see if there's any error
+
+echo IMPORTANT: this script should be run by the CI (e.g. appveyor) only. There's no need to run this script to update Petstore samples for all generators.
+echo Please press CTRL+C to stop or the script will continue in 10 seconds.
+
+timeout 10
+
+for /f "delims=" %%i in ('dir /b ".\bin\openapi3\windows\*.bat"') do (
+
+  CALL .\bin\openapi3\windows\%%i
+
+  IF ERRORLEVEL 1 IF NOT ERRORLEVEL 2 exit /b 1
+
+)

bin/openapi3/windows/run-all-petstore.cmd

@@ -13,8 +13,8 @@ failures=0
 for SCRIPT in $(ls -l ./bin/*.sh | grep -v all)
 do
     if [ -f ${SCRIPT} -a -x ${SCRIPT} ]; then
-        echo "Running $SCRIPT"
-        ${SCRIPT}
+        echo "Running $SCRIPT (output to /dev/null)"
+        ${SCRIPT} 2>&1 > /dev/null
         rc=$?
         if [[ ${rc} != 0 ]]; then
             >&2 echo "ERROR!! FAILED TO RUN ${SCRIPT}"
@@ -30,4 +30,4 @@ if (( failures > 0 )); then
    exit 1
 else
     echo "[SUCCESS] ${successes} generators finished."
-fi
+fi

bin/run-all-petstore

@@ -31,6 +31,7 @@ sleep 5
 ./bin/typescript-inversify-petstore.sh > /dev/null 2>&1
 ./bin/rust-server-petstore.sh > /dev/null 2>&1
 ./bin/openapi3/haskell-http-client-petstore.sh > /dev/null 2>&1
+./bin/csharp-petstore.sh > /dev/null 2>&1
 
 # Check:
 if [ -n "$(git status --porcelain)" ]; then

bin/utils/ensure-up-to-date

@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/SwaggerClientNet40 --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} -c ./bin/csharp-petstore-net-40.json
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples\client\petstore\csharp\SwaggerClientNet40 --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} -c .\bin\csharp-petstore-net-40.json
 
 java %JAVA_OPTS% -jar %executable% %ags%