diff --git a/appveyor.yml b/appveyor.yml
index 3593d913a61..46cc21401f2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,8 +30,8 @@ build_script:
   - nuget restore samples\client\petstore\csharp\SwaggerClientWithPropertyChanged\IO.Swagger.sln
   - msbuild samples\client\petstore\csharp\SwaggerClientWithPropertyChanged\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
   # build C# .net standard 1.3+ API client
-  - nuget restore samples\client\petstore\csharp\SwaggerClient.v5\IO.Swagger.sln
-  - msbuild samples\client\petstore\csharp\SwaggerClient.v5\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - nuget restore samples\client\petstore\csharp\SwaggerClientNetStandard\IO.Swagger.sln
+  - msbuild samples\client\petstore\csharp\SwaggerClientNetStandard\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
   # install swagger codegen locally
   - mvn clean install --batch-mode
 test_script:
diff --git a/bin/csharp-petstore-net-standard.json b/bin/csharp-petstore-net-standard.json
new file mode 100644
index 00000000000..874e5334bfa
--- /dev/null
+++ b/bin/csharp-petstore-net-standard.json
@@ -0,0 +1,3 @@
+{
+    "targetFramework": "v5.0"
+}
diff --git a/bin/csharp-petstore-net-standard.sh b/bin/csharp-petstore-net-standard.sh
new file mode 100755
index 00000000000..6d00c330896
--- /dev/null
+++ b/bin/csharp-petstore-net-standard.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+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/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples/client/petstore/csharp/SwaggerClientNetStanard --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} -c ./bin/csharp-petstore-net-standard.json"
+
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/csharp-petstore-all.bat b/bin/windows/csharp-petstore-all.bat
new file mode 100755
index 00000000000..ecef022653a
--- /dev/null
+++ b/bin/windows/csharp-petstore-all.bat
@@ -0,0 +1,8 @@
+REM C# Petstore API client
+.\bin\windows\csharp-petstore.bat
+
+REM C# Petstore API client with PropertyChanged
+.\bin\windows\csharp-property-changed-petstore.bat
+
+REM C# Petstore API client (v5.0 for .net standarnd 1.3+)
+.\bin\windows\csharp-petstore-netstandard.bat
diff --git a/bin/windows/csharp-property-changed-petstore.bat b/bin/windows/csharp-property-changed-petstore.bat
new file mode 100644
index 00000000000..4e92f348a49
--- /dev/null
+++ b/bin/windows/csharp-property-changed-petstore.bat
@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples\client\petstore\csharp\SwaggerClientNetStandard --additional-properties targetFramework=v5.0,packageGuid={3AB1F259-1769-484B-9411-84505FCCBD55}
+
+java %JAVA_OPTS% -jar %executable% %ags%