Merge remote-tracking branch 'origin/master' into pipeline

Updated version numbers.

Conflicts:
src/main/csharp/DocRaptor/Client/Configuration.cs

Author: jason-o-matic

CHANGELOG.md

@@ -1,3 +1,6 @@
+### 1.0.0 [October 18, 2016]
+* No significant code changes
+
 ### 0.4.0 [September 26, 2016]
 * Added support for prince_options[no_parallel_downloads]
 

DocRaptor.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>DocRaptor</id>
     <title>DocRaptor</title>
-    <version>0.4.0</version>
+    <version>1.0.0</version>
     <authors>Elijah Miller</authors>
     <owners>Elijah Miller</owners>
     <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>

README.md

@@ -40,7 +40,7 @@ using System.IO;
 
 class Example {
   static void Main(string[] args) {
-    Configuration.Username = "YOUR_API_KEY_HERE"; // this key works for test documents
+    Configuration.Default.Username = "YOUR_API_KEY_HERE"; // this key works for test documents
     DocApi docraptor = new DocApi();
 
     Doc doc = new Doc(
@@ -61,7 +61,7 @@ class Example {
 }
 ```
 
-Docs created like this are limited to 60 seconds to render, check out the [async example](examples/Async.cs) which allows 10 minutes.
+Docs created like this are limited to 60 seconds to render, check out the [async example](examples/async.cs) which allows 10 minutes.
 
 We have guides for doing some of the common things:
 

script/swagger

@@ -14,6 +14,10 @@ fi
 
 (
   cd swagger-codegen
+  if [[ "${#SWAGGER_CODGEN_REVISION}" -lt 40 ]]; then
+    # resolve git tags / branch names
+    SWAGGER_CODGEN_REVISION=$(git show "$SWAGGER_CODGEN_REVISION" --format="%H")
+  fi
   if [[ $(cat .git/HEAD) != "$SWAGGER_CODGEN_REVISION" ]]; then
     git fetch
     git checkout "$SWAGGER_CODGEN_REVISION"

src/main/csharp/DocRaptor/Client/Configuration.cs

@@ -68,7 +68,7 @@ public Configuration(ApiClient apiClient)
         /// Version of the package.
         /// </summary>
         /// <value>Version of the package.</value>
-        public const string Version = "0.3.1";
+        public const string Version = "1.0.0";
 
         /// <summary>
         /// Gets or sets the default Configuration.
@@ -267,7 +267,7 @@ public static String ToDebugReport()
                      .GetReferencedAssemblies()
                      .Where(x => x.Name == "System.Core").First().Version.ToString()  + "\n";
             report += "    Version of the API: 1.2.0\n";
-            report += "    SDK Package Version: 0.3.1\n";
+            report += "    SDK Package Version: 1.1.0\n";
 
             return report;
         }

src/main/csharp/DocRaptor/Properties/AssemblyInfo.cs

@@ -28,5 +28,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.1")]
-[assembly: AssemblyFileVersion("0.3.1")]
+[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyFileVersion("1.0.0")]

swagger-config.json

@@ -1,4 +1,4 @@
 {
 	"packageName": "DocRaptor",
-  "packageVersion": "0.4.0"
+  "packageVersion": "1.0.0"
 }