Skip to content

Commit

Permalink
Merge branch 'stable_semantic_version'
Browse files Browse the repository at this point in the history
  • Loading branch information
jqr committed Oct 18, 2016
2 parents b7a4a72 + 0446e5e commit a3aba55
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 6 deletions.
3 changes: 3 additions & 0 deletions 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]

Expand Down
2 changes: 1 addition & 1 deletion DocRaptor.nuspec
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions script/swagger
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/main/csharp/DocRaptor/Client/Configuration.cs
Expand Up @@ -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.
Expand Down Expand Up @@ -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.1.0\n";
report += " SDK Package Version: 0.3.1\n";
report += " SDK Package Version: 1.0.0\n";

return report;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/csharp/DocRaptor/Properties/AssemblyInfo.cs
Expand Up @@ -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")]
2 changes: 1 addition & 1 deletion swagger-config.json
@@ -1,4 +1,4 @@
{
"packageName": "DocRaptor",
"packageVersion": "0.4.0"
"packageVersion": "1.0.0"
}

0 comments on commit a3aba55

Please sign in to comment.