Skip to content

Commit a3aba55

Browse files
committed
Merge branch 'stable_semantic_version'
2 parents b7a4a72 + 0446e5e commit a3aba55

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 1.0.0 [October 18, 2016]
2+
* No significant code changes
3+
14
### 0.4.0 [September 26, 2016]
25
* Added support for prince_options[no_parallel_downloads]
36

DocRaptor.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>DocRaptor</id>
55
<title>DocRaptor</title>
6-
<version>0.4.0</version>
6+
<version>1.0.0</version>
77
<authors>Elijah Miller</authors>
88
<owners>Elijah Miller</owners>
99
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>

script/swagger

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ fi
1414

1515
(
1616
cd swagger-codegen
17+
if [[ "${#SWAGGER_CODGEN_REVISION}" -lt 40 ]]; then
18+
# resolve git tags / branch names
19+
SWAGGER_CODGEN_REVISION=$(git show "$SWAGGER_CODGEN_REVISION" --format="%H")
20+
fi
1721
if [[ $(cat .git/HEAD) != "$SWAGGER_CODGEN_REVISION" ]]; then
1822
git fetch
1923
git checkout "$SWAGGER_CODGEN_REVISION"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public Configuration(ApiClient apiClient)
6868
/// Version of the package.
6969
/// </summary>
7070
/// <value>Version of the package.</value>
71-
public const string Version = "0.3.1";
71+
public const string Version = "1.0.0";
7272

7373
/// <summary>
7474
/// Gets or sets the default Configuration.
@@ -267,7 +267,7 @@ public static String ToDebugReport()
267267
.GetReferencedAssemblies()
268268
.Where(x => x.Name == "System.Core").First().Version.ToString() + "\n";
269269
report += " Version of the API: 1.1.0\n";
270-
report += " SDK Package Version: 0.3.1\n";
270+
report += " SDK Package Version: 1.0.0\n";
271271

272272
return report;
273273
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
// You can specify all the values or you can default the Build and Revision Numbers
2929
// by using the '*' as shown below:
3030
// [assembly: AssemblyVersion("1.0.*")]
31-
[assembly: AssemblyVersion("0.3.1")]
32-
[assembly: AssemblyFileVersion("0.3.1")]
31+
[assembly: AssemblyVersion("1.0.0")]
32+
[assembly: AssemblyFileVersion("1.0.0")]

swagger-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"packageName": "DocRaptor",
3-
"packageVersion": "0.4.0"
3+
"packageVersion": "1.0.0"
44
}

0 commit comments

Comments
 (0)