Merge pull request #85 from NSwag/master

Release v2.16
RicoSuter · May 4, 2016 · 69f746c · 69f746c
2 parents ca7b216 + b11ecb4
commit 69f746c
Show file tree

Hide file tree

Showing 22 changed files with 818 additions and 1,016 deletions.
diff --git a/src/NSwag.Annotations/Properties/AssemblyInfo.cs b/src/NSwag.Annotations/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.Annotations")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.15.*")]
+[assembly: AssemblyVersion("2.16.*")]
diff --git a/src/NSwag.CodeGeneration.Tests/Properties/AssemblyInfo.cs b/src/NSwag.CodeGeneration.Tests/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.15.*")]
+// [assembly: AssemblyVersion("2.16.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.CodeGeneration/Properties/AssemblyInfo.cs b/src/NSwag.CodeGeneration/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.CodeGeneration")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.15.*")]
+[assembly: AssemblyVersion("2.16.*")]
diff --git a/src/NSwag.Core/Properties/AssemblyInfo.cs b/src/NSwag.Core/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.15.*")]
+[assembly: AssemblyVersion("2.16.*")]
diff --git a/src/NSwag.Demo.Client/Properties/AssemblyInfo.cs b/src/NSwag.Demo.Client/Properties/AssemblyInfo.cs
@@ -50,6 +50,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.15.*")]
+// [assembly: AssemblyVersion("2.16.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.Tests/Properties/AssemblyInfo.cs b/src/NSwag.Tests/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.15.*")]
+// [assembly: AssemblyVersion("2.16.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag/Properties/AssemblyInfo.cs b/src/NSwag/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwag.Console")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.15.*")]
+[assembly: AssemblyVersion("2.16.*")]
diff --git a/src/NSwagStudio.Installer/Generated.wxs b/src/NSwagStudio.Installer/Generated.wxs
diff --git a/src/NSwagStudio/NSwagDocument.cs b/src/NSwagStudio/NSwagDocument.cs
@@ -6,9 +6,7 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
-using System;
 using System.IO;
-using System.Text;
 using MyToolkit.Model;
 using Newtonsoft.Json;
 using NSwag.Commands;
@@ -56,15 +54,9 @@ public static NSwagDocument LoadDocument(string filePath)
         public void Save()
         {
             ConvertToRelativePaths();
-
-            var previousAssemblyTypeAssemblyPath = AssemblyTypeToSwaggerCommand.AssemblyPath;
-            if (!string.IsNullOrEmpty(previousAssemblyTypeAssemblyPath))
-                AssemblyTypeToSwaggerCommand.AssemblyPath = PathUtilities.MakeRelativePath(AssemblyTypeToSwaggerCommand.AssemblyPath, System.IO.Path.GetDirectoryName(Path));
-
+
             _latestData = JsonConvert.SerializeObject(this, Formatting.Indented);
-
             ConvertToAbsolutePaths();
-
             File.WriteAllText(Path, _latestData);
         }
 
@@ -118,16 +110,10 @@ public string Path
         }
 
         [JsonIgnore]
-        public string Name
-        {
-            get { return System.IO.Path.GetFileName(Path); }
-        }
+        public string Name => System.IO.Path.GetFileName(Path);
 
         [JsonIgnore]
-        public bool IsDirty
-        {
-            get { return _latestData != JsonConvert.SerializeObject(this, Formatting.Indented); }
-        }
+        public bool IsDirty => _latestData != JsonConvert.SerializeObject(this, Formatting.Indented);
 
         /// <summary>Gets or sets the selected Swagger generator. </summary>
         [JsonProperty("SelectedSwaggerGenerator")]

diff --git a/src/NSwagStudio/NSwagStudio.csproj b/src/NSwagStudio/NSwagStudio.csproj
@@ -109,7 +109,6 @@
     </ApplicationDefinition>
     <Compile Include="ISwaggerGenerator.cs" />
     <Compile Include="NSwagDocument.cs" />
-    <Compile Include="Utilities\MyFileOpenHandler.cs" />
     <Compile Include="Utilities\PathUtilities.cs" />
     <Compile Include="ViewModels\CodeGenerators\CSharpWebApiControllerGeneratorViewModel.cs" />
     <Compile Include="ViewModels\CodeGenerators\SwaggerGeneratorViewModel.cs" />

diff --git a/src/NSwagStudio/Properties/AssemblyInfo.cs b/src/NSwagStudio/Properties/AssemblyInfo.cs
@@ -5,4 +5,4 @@
 [assembly: AssemblyCompany("Rico Suter")]
 [assembly: AssemblyProduct("NSwagStudio")]
 [assembly: AssemblyCopyright("Copyright © Rico Suter, 2015")]
-[assembly: AssemblyVersion("2.15.*")]
+[assembly: AssemblyVersion("2.16.*")]
diff --git a/src/NSwagStudio/Utilities/MyFileOpenHandler.cs b/src/NSwagStudio/Utilities/MyFileOpenHandler.cs
diff --git a/src/NSwagStudio/Utilities/PathUtilities.cs b/src/NSwagStudio/Utilities/PathUtilities.cs
@@ -35,7 +35,7 @@ public static string MakeRelativePath(string absPath, string relTo)
 
             // If we didn't find a common prefix then throw
             if (lastCommonRoot == -1)
-                throw new ArgumentException("The path of the two files doesn't have any common base.");
+                return absPath;
 
             // Build up the relative path
             var relativePath = new StringBuilder();

diff --git a/src/NSwagStudio/ViewModels/CodeGenerators/CSharpClientGeneratorViewModel.cs b/src/NSwagStudio/ViewModels/CodeGenerators/CSharpClientGeneratorViewModel.cs
@@ -100,7 +100,7 @@ await Task.Run(async () =>
                     }
                 });
 
-                ClientCode = code;
+                ClientCode = code ?? string.Empty;
             });
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,7 @@ await Task.Run(async () => @@
                         }
                     });
-                    ClientCode = code;
+                    ClientCode = code ?? string.Empty;
                 });
             }
@@ Expand Down @@