From 9f21bd7ebd7fe88addd0119773a2185a4939335d Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 21 Jul 2016 23:22:06 +0800 Subject: [PATCH 01/14] update appveyor.yml to test c# petstore client --- appveyor.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2b31bd9f70a..8de26002cdd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,9 +16,12 @@ install: - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g build_script: - - mvn clean install --batch-mode + - nuget restore samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln + - msbuild samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + #- mvn clean install --batch-mode test_script: - - .\bin\windows\run-all-petstore.cmd + - nunit-console samples\client\petstore\csharp\SwaggerClient\src\IO.Swagger.Test\bin\Debug\IO.Swagger.Test.dll --result=myresults.xml;format=AppVeyor + #- .\bin\windows\run-all-petstore.cmd cache: - C:\maven\ - C:\Users\appveyor\.m2 From 8ec4f6a504fb9cc8bd127fc8b4eab99b05ca6ae9 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 22 Jul 2016 00:05:01 +0800 Subject: [PATCH 02/14] update csproj file --- .../csharp/SwaggerClient/IO.Swagger.sln | 11 ++++- .../IO.Swagger.Test/IO.Swagger.Test.csproj | 44 +++++++++---------- .../src/IO.Swagger/IO.Swagger.csproj | 2 +- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln index 28a3d31c548..4b13ceed3cf 100644 --- a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln +++ b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 VisualStudioVersion = 12.0.0.0 MinimumVisualStudioVersion = 10.0.0.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{C95ADC68-F3D8-41D1-BA8A-6C0754E6BB54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger.Test", "src\IO.Swagger.Test\IO.Swagger.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}" EndProject @@ -12,10 +12,17 @@ Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution +<<<<<<< 9f21bd7ebd7fe88addd0119773a2185a4939335d {C95ADC68-F3D8-41D1-BA8A-6C0754E6BB54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C95ADC68-F3D8-41D1-BA8A-6C0754E6BB54}.Debug|Any CPU.Build.0 = Debug|Any CPU {C95ADC68-F3D8-41D1-BA8A-6C0754E6BB54}.Release|Any CPU.ActiveCfg = Release|Any CPU {C95ADC68-F3D8-41D1-BA8A-6C0754E6BB54}.Release|Any CPU.Build.0 = Release|Any CPU +======= +{CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +{CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Debug|Any CPU.Build.0 = Debug|Any CPU +{CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Release|Any CPU.ActiveCfg = Release|Any CPU +{CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Release|Any CPU.Build.0 = Release|Any CPU +>>>>>>> update csproj file {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -24,4 +31,4 @@ EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection -EndGlobal \ No newline at end of file +EndGlobal diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj index 5660f132a37..e81073f9a29 100644 --- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj +++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj @@ -2,7 +2,7 @@ - + Debug AnyCPU @@ -59,38 +59,36 @@ limitations under the License. - $(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + $(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll + $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll + ..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll + ..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll + ..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll - $(SolutionDir)\packages\NUnit.3.2.1\lib\nunit.framework.dll - ..\packages\NUnit.3.2.1\lib\nunit.framework.dll - ..\..\packages\NUnit.3.2.1\lib\nunit.framework.dll - ..\..\vendor\NUnit.3.2.1\lib\nunit.framework.dll + $(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + ..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll - + - + - - {85AE8212-9819-4224-A9E5-B93419EC927B} - IO.Swagger - - - - + + {CAF7B888-341C-4FA9-BC23-6D2A555EAE2E} + IO.Swagger + + diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj index 8956caaa138..1899fca30f4 100644 --- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj +++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj @@ -24,7 +24,7 @@ limitations under the License. Debug AnyCPU - {C95ADC68-F3D8-41D1-BA8A-6C0754E6BB54} + {CAF7B888-341C-4FA9-BC23-6D2A555EAE2E} Library Properties IO.Swagger From 7f2ac34470426f6c18212f72ba6d99df52147746 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 22 Jul 2016 00:29:12 +0800 Subject: [PATCH 03/14] add docker version test --- appveyor.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8de26002cdd..9abc3b93cde 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ # for CI with appveyor.yml # Ref: http://www.yegor256.com/2015/01/10/windows-appveyor-maven.html -version: '{build}' +version: '{branch}-{build}' os: Windows Server 2012 install: - ps: | @@ -15,13 +15,14 @@ install: - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH% - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g + - cmd: docker --version build_script: - nuget restore samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln - msbuild samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - #- mvn clean install --batch-mode + - mvn clean install --batch-mode test_script: + - .\bin\windows\run-all-petstore.cmd - nunit-console samples\client\petstore\csharp\SwaggerClient\src\IO.Swagger.Test\bin\Debug\IO.Swagger.Test.dll --result=myresults.xml;format=AppVeyor - #- .\bin\windows\run-all-petstore.cmd cache: - C:\maven\ - C:\Users\appveyor\.m2 From 1cecb4d5a6e897c77452a3838a77d924968aedae Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 22 Jul 2016 00:30:30 +0800 Subject: [PATCH 04/14] add docker version --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 9abc3b93cde..064f1e93c1d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,6 +16,7 @@ install: - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: docker --version + - cmd: docker info build_script: - nuget restore samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln - msbuild samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" From 61252030de6d6bc826c29f21e024c906ea3a4c21 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 22 Jul 2016 00:35:52 +0800 Subject: [PATCH 05/14] add docker --- appveyor.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 064f1e93c1d..46811b436bd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,14 @@ install: - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH% - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g - - cmd: docker --version - - cmd: docker info + - powershell -file cpuid.ps1 + - choco install -y mingw + - choco install -y virtualbox + - choco install -y docker-machine + - choco install -y docker + - docker pull swaggerapi/petstore + - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore + - docker ps -a build_script: - nuget restore samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln - msbuild samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" From e7f18d57edfa707345997b719b3695b549c96f14 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 22 Jul 2016 00:43:07 +0800 Subject: [PATCH 06/14] add cpuid.ps1 --- cpuid.ps1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 cpuid.ps1 diff --git a/cpuid.ps1 b/cpuid.ps1 new file mode 100644 index 00000000000..8b25d8eecc6 --- /dev/null +++ b/cpuid.ps1 @@ -0,0 +1,11 @@ + +Write-Host "Downloading" +wget "http://downloads.sourceforge.net/project/gnuwin32/cpuid/3.3-1/cpuid-3.3-1-bin.zip?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fgnuwin32%2Ffiles%2Fcpuid%2F3.3-1%2Fcpuid-3.3-1-bin.zip%2Fdownload%3Fuse_mirror%3Dskylink%26download%3D&ts=1448903528&use_mirror=netix" -outfile cpuid.zip +dir + +Write-Host "Calling Unzip" +7z x cpuid.zip +dir + +Write-Host "Calling binary" +. cpuid\bin\cpuid.exe From 37baccd628287ffb81fc7d1449531591cc576a1e Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 22 Jul 2016 00:54:36 +0800 Subject: [PATCH 07/14] comment out cpuid --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 46811b436bd..2ad1f392ab2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,7 +15,7 @@ install: - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH% - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g - - powershell -file cpuid.ps1 + #- powershell -file cpuid.ps1 - choco install -y mingw - choco install -y virtualbox - choco install -y docker-machine From 7529ac9eda363ad433e7582b423458304d5c3167 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 22 Jul 2016 01:00:44 +0800 Subject: [PATCH 08/14] use start process --- appveyor.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2ad1f392ab2..94baa6828b9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,8 @@ # Ref: http://www.yegor256.com/2015/01/10/windows-appveyor-maven.html version: '{branch}-{build}' os: Windows Server 2012 +hosts: + petstore.swagger.io: 127.0.0.1 install: - ps: | Add-Type -AssemblyName System.IO.Compression.FileSystem @@ -15,14 +17,16 @@ install: - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH% - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g - #- powershell -file cpuid.ps1 - - choco install -y mingw - - choco install -y virtualbox - - choco install -y docker-machine - - choco install -y docker - - docker pull swaggerapi/petstore - - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore - - docker ps -a + - git clone https://github.com/wing328/swagger-samples + - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jaxrs" + ##- powershell -file cpuid.ps1 + #- choco install -y mingw + #- choco install -y virtualbox + #- choco install -y docker-machine + #- choco install -y docker + #- docker pull swaggerapi/petstore + #- docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore + #- docker ps -a build_script: - nuget restore samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln - msbuild samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" From 18ed9d95763b21011bf34dd8e67698519a1ecf0a Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 22 Jul 2016 01:09:46 +0800 Subject: [PATCH 09/14] remove mvn test --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 94baa6828b9..7687a896d2f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,9 +30,9 @@ install: build_script: - nuget restore samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln - msbuild samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - - mvn clean install --batch-mode + #- mvn clean install --batch-mode test_script: - - .\bin\windows\run-all-petstore.cmd + #- .\bin\windows\run-all-petstore.cmd - nunit-console samples\client\petstore\csharp\SwaggerClient\src\IO.Swagger.Test\bin\Debug\IO.Swagger.Test.dll --result=myresults.xml;format=AppVeyor cache: - C:\maven\ From 63c09982f9e7410b752d58b3634fb25beadf08a1 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sat, 30 Jul 2016 17:44:23 +0800 Subject: [PATCH 10/14] remove comments related to docker --- appveyor.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7687a896d2f..853707ae30a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,14 +19,6 @@ install: - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g - git clone https://github.com/wing328/swagger-samples - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jaxrs" - ##- powershell -file cpuid.ps1 - #- choco install -y mingw - #- choco install -y virtualbox - #- choco install -y docker-machine - #- choco install -y docker - #- docker pull swaggerapi/petstore - #- docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore - #- docker ps -a build_script: - nuget restore samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln - msbuild samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" From 985c851d3d1bb2eb0a6202ae5fd19b5aaa02779a Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 31 Jul 2016 17:38:09 +0800 Subject: [PATCH 11/14] fix appveyor to run local petstore, shippable caching turned on --- appveyor.yml | 6 +-- .../main/resources/csharp/gitignore.mustache | 52 +++++++++---------- .../petstore/csharp/SwaggerClient/.gitignore | 52 +++++++++---------- .../csharp/SwaggerClient/IO.Swagger.sln | 9 +--- .../petstore/csharp/SwaggerClient/README.md | 2 +- .../IO.Swagger.Test/IO.Swagger.Test.csproj | 42 ++++++++------- .../src/IO.Swagger/IO.Swagger.csproj | 2 +- shippable.yml | 5 ++ 8 files changed, 85 insertions(+), 85 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 853707ae30a..cbc157b0a28 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,14 +18,14 @@ install: - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g - git clone https://github.com/wing328/swagger-samples - - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jaxrs" + - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs" build_script: - nuget restore samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln - msbuild samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - #- mvn clean install --batch-mode + - mvn clean install --batch-mode test_script: - #- .\bin\windows\run-all-petstore.cmd - nunit-console samples\client\petstore\csharp\SwaggerClient\src\IO.Swagger.Test\bin\Debug\IO.Swagger.Test.dll --result=myresults.xml;format=AppVeyor + - .\bin\windows\run-all-petstore.cmd cache: - C:\maven\ - C:\Users\appveyor\.m2 diff --git a/modules/swagger-codegen/src/main/resources/csharp/gitignore.mustache b/modules/swagger-codegen/src/main/resources/csharp/gitignore.mustache index 56fef626922..d3f4f7b6f55 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/gitignore.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/gitignore.mustache @@ -147,39 +147,39 @@ UpgradeLog*.htm *.swp *.swo - # svn - .svn +# svn +.svn - # SQL Server files - **/App_Data/*.mdf - **/App_Data/*.ldf - **/App_Data/*.sdf +# SQL Server files +**/App_Data/*.mdf +**/App_Data/*.ldf +**/App_Data/*.sdf - #LightSwitch generated files - GeneratedArtifacts/ - _Pvt_Extensions/ - ModelManifest.xml +#LightSwitch generated files +GeneratedArtifacts/ +_Pvt_Extensions/ +ModelManifest.xml - # ========================= - # Windows detritus - # ========================= +# ========================= +# Windows detritus +# ========================= - # Windows image file caches - Thumbs.db - ehthumbs.db +# Windows image file caches +Thumbs.db +ehthumbs.db - # Folder config file - Desktop.ini +# Folder config file +Desktop.ini - # Recycle Bin used on file shares - $RECYCLE.BIN/ +# Recycle Bin used on file shares +$RECYCLE.BIN/ - # Mac desktop service store files - .DS_Store +# Mac desktop service store files +.DS_Store - # SASS Compiler cache - .sass-cache +# SASS Compiler cache +.sass-cache - # Visual Studio 2014 CTP - **/*.sln.ide +# Visual Studio 2014 CTP +**/*.sln.ide diff --git a/samples/client/petstore/csharp/SwaggerClient/.gitignore b/samples/client/petstore/csharp/SwaggerClient/.gitignore index 56fef626922..d3f4f7b6f55 100644 --- a/samples/client/petstore/csharp/SwaggerClient/.gitignore +++ b/samples/client/petstore/csharp/SwaggerClient/.gitignore @@ -147,39 +147,39 @@ UpgradeLog*.htm *.swp *.swo - # svn - .svn +# svn +.svn - # SQL Server files - **/App_Data/*.mdf - **/App_Data/*.ldf - **/App_Data/*.sdf +# SQL Server files +**/App_Data/*.mdf +**/App_Data/*.ldf +**/App_Data/*.sdf - #LightSwitch generated files - GeneratedArtifacts/ - _Pvt_Extensions/ - ModelManifest.xml +#LightSwitch generated files +GeneratedArtifacts/ +_Pvt_Extensions/ +ModelManifest.xml - # ========================= - # Windows detritus - # ========================= +# ========================= +# Windows detritus +# ========================= - # Windows image file caches - Thumbs.db - ehthumbs.db +# Windows image file caches +Thumbs.db +ehthumbs.db - # Folder config file - Desktop.ini +# Folder config file +Desktop.ini - # Recycle Bin used on file shares - $RECYCLE.BIN/ +# Recycle Bin used on file shares +$RECYCLE.BIN/ - # Mac desktop service store files - .DS_Store +# Mac desktop service store files +.DS_Store - # SASS Compiler cache - .sass-cache +# SASS Compiler cache +.sass-cache - # Visual Studio 2014 CTP - **/*.sln.ide +# Visual Studio 2014 CTP +**/*.sln.ide diff --git a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln index 4b13ceed3cf..55d03758f52 100644 --- a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln +++ b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 VisualStudioVersion = 12.0.0.0 MinimumVisualStudioVersion = 10.0.0.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{1230F4B8-71F8-4A8C-966F-2E10106EA239}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger.Test", "src\IO.Swagger.Test\IO.Swagger.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}" EndProject @@ -12,17 +12,10 @@ Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution -<<<<<<< 9f21bd7ebd7fe88addd0119773a2185a4939335d -{C95ADC68-F3D8-41D1-BA8A-6C0754E6BB54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -{C95ADC68-F3D8-41D1-BA8A-6C0754E6BB54}.Debug|Any CPU.Build.0 = Debug|Any CPU -{C95ADC68-F3D8-41D1-BA8A-6C0754E6BB54}.Release|Any CPU.ActiveCfg = Release|Any CPU -{C95ADC68-F3D8-41D1-BA8A-6C0754E6BB54}.Release|Any CPU.Build.0 = Release|Any CPU -======= {CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Debug|Any CPU.Build.0 = Debug|Any CPU {CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Release|Any CPU.ActiveCfg = Release|Any CPU {CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Release|Any CPU.Build.0 = Release|Any CPU ->>>>>>> update csproj file {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/samples/client/petstore/csharp/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClient/README.md index d890bfa20f0..3924dd1922f 100644 --- a/samples/client/petstore/csharp/SwaggerClient/README.md +++ b/samples/client/petstore/csharp/SwaggerClient/README.md @@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c - API version: 1.0.0 - SDK version: 1.0.0 -- Build date: 2016-07-26T14:25:16.509+08:00 +- Build date: 2016-07-31T17:33:09.053+08:00 - Build package: class io.swagger.codegen.languages.CSharpClientCodegen ## Frameworks supported diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj index e81073f9a29..c92b1ab1663 100644 --- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj +++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj @@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + Debug AnyCPU @@ -59,36 +59,38 @@ limitations under the License. - $(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + $(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll + $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll + ..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll + ..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll + ..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll - $(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll - ..\packages\NUnit.2.6.4\lib\nunit.framework.dll - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll - ..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll + $(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + ..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll - + - + - - {CAF7B888-341C-4FA9-BC23-6D2A555EAE2E} - IO.Swagger - + + {1230F4B8-71F8-4A8C-966F-2E10106EA239} + IO.Swagger + + + + - diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj index 1899fca30f4..68fdf45634f 100644 --- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj +++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj @@ -24,7 +24,7 @@ limitations under the License. Debug AnyCPU - {CAF7B888-341C-4FA9-BC23-6D2A555EAE2E} + {1230F4B8-71F8-4A8C-966F-2E10106EA239} Library Properties IO.Swagger diff --git a/shippable.yml b/shippable.yml index c28371ec252..74b09264235 100644 --- a/shippable.yml +++ b/shippable.yml @@ -6,7 +6,12 @@ jdk: - oraclejdk7 - oraclejdk8 + + build: + cache: true + cache_dir_list: + - $HOME/.m2 ci: - ./bin/run-all-petstore > run-all-petstore.log 2>&1 post_ci: From 39f7c9a8c7f6c61bca2bf115b17df80a38023868 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 31 Jul 2016 21:53:31 +0800 Subject: [PATCH 12/14] add comments to ci config --- appveyor.yml | 2 ++ shippable.yml | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index cbc157b0a28..5710fa5bc3a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,7 +24,9 @@ build_script: - msbuild samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - mvn clean install --batch-mode test_script: + # test c# API client - nunit-console samples\client\petstore\csharp\SwaggerClient\src\IO.Swagger.Test\bin\Debug\IO.Swagger.Test.dll --result=myresults.xml;format=AppVeyor + # generate all petstore clients - .\bin\windows\run-all-petstore.cmd cache: - C:\maven\ diff --git a/shippable.yml b/shippable.yml index 74b09264235..97ed4286983 100644 --- a/shippable.yml +++ b/shippable.yml @@ -3,16 +3,13 @@ language: java jdk: - openjdk7 - openjdk8 -- oraclejdk7 -- oraclejdk8 - - build: cache: true cache_dir_list: - $HOME/.m2 ci: - - ./bin/run-all-petstore > run-all-petstore.log 2>&1 + # generate all petstore sampless (client, servers, doc) + - ./bin/run-all-petstore 2>&1 > run-all-petstore.log post_ci: - tail run-all-petstore.log From 92232feea7afadcb6aad31622cfecdacabaecc39 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 31 Jul 2016 21:58:19 +0800 Subject: [PATCH 13/14] remove cpuid.ps1 --- cpuid.ps1 | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 cpuid.ps1 diff --git a/cpuid.ps1 b/cpuid.ps1 deleted file mode 100644 index 8b25d8eecc6..00000000000 --- a/cpuid.ps1 +++ /dev/null @@ -1,11 +0,0 @@ - -Write-Host "Downloading" -wget "http://downloads.sourceforge.net/project/gnuwin32/cpuid/3.3-1/cpuid-3.3-1-bin.zip?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fgnuwin32%2Ffiles%2Fcpuid%2F3.3-1%2Fcpuid-3.3-1-bin.zip%2Fdownload%3Fuse_mirror%3Dskylink%26download%3D&ts=1448903528&use_mirror=netix" -outfile cpuid.zip -dir - -Write-Host "Calling Unzip" -7z x cpuid.zip -dir - -Write-Host "Calling binary" -. cpuid\bin\cpuid.exe From e63440e2bf710f336adc29f906c72960e297a05e Mon Sep 17 00:00:00 2001 From: wing328 Date: Sun, 31 Jul 2016 22:09:55 +0800 Subject: [PATCH 14/14] update C# petstore sample --- .../petstore/csharp/SwaggerClient/IO.Swagger.sln | 12 ++++++------ .../client/petstore/csharp/SwaggerClient/README.md | 2 +- .../SwaggerClient/src/IO.Swagger/IO.Swagger.csproj | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln index 55d03758f52..9dc6bc62fa2 100644 --- a/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln +++ b/samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 VisualStudioVersion = 12.0.0.0 MinimumVisualStudioVersion = 10.0.0.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{1230F4B8-71F8-4A8C-966F-2E10106EA239}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{F616AC0A-13D9-4D7E-ACE1-93E41B628F88}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger.Test", "src\IO.Swagger.Test\IO.Swagger.Test.csproj", "{19F1DEBC-DE5E-4517-8062-F000CD499087}" EndProject @@ -12,10 +12,10 @@ Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution -{CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -{CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Debug|Any CPU.Build.0 = Debug|Any CPU -{CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Release|Any CPU.ActiveCfg = Release|Any CPU -{CAF7B888-341C-4FA9-BC23-6D2A555EAE2E}.Release|Any CPU.Build.0 = Release|Any CPU +{F616AC0A-13D9-4D7E-ACE1-93E41B628F88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +{F616AC0A-13D9-4D7E-ACE1-93E41B628F88}.Debug|Any CPU.Build.0 = Debug|Any CPU +{F616AC0A-13D9-4D7E-ACE1-93E41B628F88}.Release|Any CPU.ActiveCfg = Release|Any CPU +{F616AC0A-13D9-4D7E-ACE1-93E41B628F88}.Release|Any CPU.Build.0 = Release|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -24,4 +24,4 @@ EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection -EndGlobal +EndGlobal \ No newline at end of file diff --git a/samples/client/petstore/csharp/SwaggerClient/README.md b/samples/client/petstore/csharp/SwaggerClient/README.md index 3924dd1922f..94f420f1cba 100644 --- a/samples/client/petstore/csharp/SwaggerClient/README.md +++ b/samples/client/petstore/csharp/SwaggerClient/README.md @@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [Swagger Codegen](https://github.c - API version: 1.0.0 - SDK version: 1.0.0 -- Build date: 2016-07-31T17:33:09.053+08:00 +- Build date: 2016-07-31T22:04:18.446+08:00 - Build package: class io.swagger.codegen.languages.CSharpClientCodegen ## Frameworks supported diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj index 68fdf45634f..dcdc39039c7 100644 --- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj +++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj @@ -24,7 +24,7 @@ limitations under the License. Debug AnyCPU - {1230F4B8-71F8-4A8C-966F-2E10106EA239} + {F616AC0A-13D9-4D7E-ACE1-93E41B628F88} Library Properties IO.Swagger