Merge pull request #72 from NSwag/master

Release v2.11
RicoSuter · Apr 26, 2016 · 41f7a09 · 41f7a09
2 parents c30c526 + 11bd9e8
commit 41f7a09
Show file tree

Hide file tree

Showing 11 changed files with 604 additions and 591 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.10.*")]
+[assembly: AssemblyVersion("2.11.*")]
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.10.*")]
+// [assembly: AssemblyVersion("2.11.*")]
 [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.10.*")]
+[assembly: AssemblyVersion("2.11.*")]
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.10.*")]
+[assembly: AssemblyVersion("2.11.*")]
diff --git a/src/NSwag.Core/SwaggerService.cs b/src/NSwag.Core/SwaggerService.cs
@@ -169,7 +169,7 @@ public static SwaggerService FromJson(string data)
         /// <returns>The <see cref="SwaggerService"/>.</returns>
         public static SwaggerService FromUrl(string url)
         {
-            dynamic client = Activator.CreateInstance(Type.GetType("System.Net.WebClient", true));
+            dynamic client = Activator.CreateInstance(Type.GetType("System.Net.WebClient, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", true));
             using (client)
             {
                 var data = client.DownloadString(url);

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.10.*")]
+// [assembly: AssemblyVersion("2.11.*")]
 [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.10.*")]
+// [assembly: AssemblyVersion("2.11.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/NSwag.Tests/Specification/GeneralTests.cs b/src/NSwag.Tests/Specification/GeneralTests.cs
@@ -6,6 +6,19 @@ namespace NSwag.Tests
     [TestClass]
     public class GeneralTests
     {
+        [TestMethod]
+        public void When_Swagger_is_loaded_from_url_then_it_works()
+        {
+            //// Arrange
+
+
+            //// Act
+            var swagger = SwaggerService.FromUrl("http://petstore.swagger.io/v2/swagger.json");
+
+            //// Assert
+            Assert.IsNotNull(swagger);
+        }
+
         [TestMethod]
         public void WhenConvertingAndBackThenItShouldBeTheSame()
         {

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.10.*")]
+[assembly: AssemblyVersion("2.11.*")]
diff --git a/src/NSwagStudio.Installer/Generated.wxs b/src/NSwagStudio.Installer/Generated.wxs
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.10.*")]
+[assembly: AssemblyVersion("2.11.*")]