Update dependencies: add support for "OpenAPI.NET.OData v1.0.4"

unchase · Jul 22, 2020 · b2c287b · b2c287b
1 parent 82c8cde
commit b2c287b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@
 
 These are the changes to each version that has been released on the official [Visual Studio extension gallery](https://marketplace.visualstudio.com/items?itemName=unchase.UnchaseOpenAPIConnectedService).
 
+## v1.5.3 `(2020-07-23)`
+
+- [x]  Update dependencies: add support for [OpenAPI.NET.OData v1.0.4](https://www.nuget.org/packages/Microsoft.OpenApi.OData)
+
 ## v1.5.2 `(2020-06-26)`
 
 - [x] Update dependencies: add support for [NSwag.Commands v13.6.2](https://github.com/RicoSuter/NSwag/pull/2925)

diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.2.*")]
-[assembly: AssemblyVersion("1.5.2")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.3")]
+[assembly: AssemblyFileVersion("1.5.3.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
diff --git a/src/Unchase.OpenAPI.ConnectedService.csproj b/src/Unchase.OpenAPI.ConnectedService.csproj
@@ -359,8 +359,8 @@
     <Reference Include="Microsoft.OpenApi, Version=1.1.4.0, Culture=neutral, PublicKeyToken=3f5743946376f042, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.OpenApi.1.1.4\lib\net46\Microsoft.OpenApi.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.OpenApi.OData.Reader, Version=1.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.OpenApi.OData.1.0.2\lib\netstandard2.0\Microsoft.OpenApi.OData.Reader.dll</HintPath>
+    <Reference Include="Microsoft.OpenApi.OData.Reader, Version=1.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.OpenApi.OData.1.0.4\lib\netstandard2.0\Microsoft.OpenApi.OData.Reader.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.VisualStudio.ComponentModelHost.15.8.525\lib\net46\Microsoft.VisualStudio.ComponentModelHost.dll</HintPath>

diff --git a/src/Views/ConfigOpenApiEndpoint.xaml b/src/Views/ConfigOpenApiEndpoint.xaml
@@ -332,6 +332,20 @@
                     Margin="40,5,10,5"
                     HorizontalAlignment="Stretch"
                     Text="{Binding Path=UserSettings.OpenApiConvertSettings.PathPrefix, Mode=TwoWay}" />
+                <CheckBox
+                    x:Name="OpenApiConvertSettingsShowLinks"
+                    Margin="20,5,10,5"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Bottom"
+                    Content="Show the OpenAPI links in the responses."
+                    IsChecked="{Binding Path=UserSettings.OpenApiConvertSettings.ShowLinks, Mode=TwoWay}" />
+                <CheckBox
+                    x:Name="OpenApiConvertSettingsShowSchemaExamples"
+                    Margin="20,5,10,5"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Bottom"
+                    Content="Show schema examples."
+                    IsChecked="{Binding Path=UserSettings.OpenApiConvertSettings.ShowSchemaExamples, Mode=TwoWay}" />
             </StackPanel>
         </StackPanel>
 

diff --git a/src/app.config b/src/app.config
@@ -274,6 +274,10 @@
         <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.OpenApi" publicKeyToken="3f5743946376f042" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
diff --git a/src/packages.config b/src/packages.config
@@ -74,7 +74,7 @@
   <package id="Microsoft.NETCore.Platforms" version="3.0.0" targetFramework="net461" />
   <package id="Microsoft.OData.Edm" version="7.6.1" targetFramework="net461" />
   <package id="Microsoft.OpenApi" version="1.1.4" targetFramework="net461" />
-  <package id="Microsoft.OpenApi.OData" version="1.0.2" targetFramework="net461" />
+  <package id="Microsoft.OpenApi.OData" version="1.0.4" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.ComponentModelHost" version="15.8.525" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.ConnectedServices" version="15.3.47" targetFramework="net461" />
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.6.27740" targetFramework="net472" />

diff --git a/src/source.extension.vsixmanifest b/src/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="Unchase.Openapi.ConnectedService.63199638-6211-4285-ba8f-75b1f0326c2a" Version="1.5.2" Language="en-US" Publisher="Unchase" />
+        <Identity Id="Unchase.Openapi.ConnectedService.63199638-6211-4285-ba8f-75b1f0326c2a" Version="1.5.3" Language="en-US" Publisher="Unchase" />
         <DisplayName>Unchase OpenAPI (Swagger) Connected Service</DisplayName>
         <Description xml:space="preserve">Connected service for Visual Studio to generate OpenAPI (Swagger) web service reference.</Description>
         <MoreInfo>https://github.com/unchase/Unchase.OpenAPI.Connectedservice</MoreInfo>