build: Update NSwag to v13.19.0

fix: Fix #86
unchase · Jun 20, 2023 · 125976b · 125976b
1 parent 9908774
commit 125976b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@
 
 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.9.1 `(2022-06-05)`
+
+- [x] Update dependencies: add support for NSwag.Commands v13.19.0
+- [x] Fix [issue #86](https://github.com/unchase/Unchase.OpenAPI.Connectedservice/issues/86) with `LiquidTemplate`
+
 ## v1.9.0 `(2023-06-05)` provided by [Andreas Böhm](https://github.com/matherm-aboehm)
 
 - Some fixes to restore compatibility with Visual Studio 2017 and 2019 ([issue #78](https://github.com/unchase/Unchase.OpenAPI.Connectedservice/issues/78), [issue #80](https://github.com/unchase/Unchase.OpenAPI.Connectedservice/issues/80))

diff --git a/src/Unchase.OpenAPI.Connectedservice.Shared/Constants.cs b/src/Unchase.OpenAPI.Connectedservice.Shared/Constants.cs
@@ -4,7 +4,7 @@ public static class Constants
     {
         public static class Vsix
         {
-            public const string Version = "1.9.0";
+            public const string Version = "1.9.1";
         }
 
         public const string Author = "Nikolay Chebotov (Unchase)";

diff --git a/src/Unchase.OpenAPI.Connectedservice.Shared/Views/TypeScriptClientSettings.xaml b/src/Unchase.OpenAPI.Connectedservice.Shared/Views/TypeScriptClientSettings.xaml
@@ -231,7 +231,7 @@
 
                 <CheckBox
                     Margin="0,5,10,5"
-                    Content="Use the AbortSignal (Fetch/Aurelia template only)."
+                    Content="Use the AbortSignal (Fetch/Axios/Aurelia template only)."
                     IsChecked="{Binding Command.UseAbortSignal, Mode=TwoWay}"
                     ToolTip="UseAbortSignal"
                     Visibility="{Binding Command.Template, ConverterParameter='Fetch,Aurelia', Converter={StaticResource EqualityConverter}}" />

diff --git a/src/Unchase.OpenAPI.Connectedservice.VS22/Unchase.OpenAPI.Connectedservice.VS22.csproj b/src/Unchase.OpenAPI.Connectedservice.VS22/Unchase.OpenAPI.Connectedservice.VS22.csproj
@@ -72,7 +72,7 @@
       <Version>2.10.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions">
-      <Version>2.1.1</Version>
+      <Version>1.1.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.OData.Edm">
       <Version>7.6.1</Version>
@@ -105,7 +105,7 @@
       <ExcludeAssets>compile</ExcludeAssets>
     </PackageReference>
     <PackageReference Include="NSwag.Commands">
-      <Version>13.18.0</Version>
+      <Version>13.19.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.VisualStudio">
       <Version>6.0.0</Version>
@@ -166,11 +166,9 @@
   -->
   <Target Name="AssignLinkMetadataForResource" BeforeTargets="AssignLinkMetadata" Condition=" '$(SynthesizeLinkMetadata)' == 'true' ">
     <!-- RESOURCE ITEMS -->
-    <AssignLinkMetadata Items="@(Resource)"
-                        Condition="'@(Resource)' != '' and '%(Resource.DefiningProjectFullPath)' != '$(MSBuildProjectFullPath)'">
+    <AssignLinkMetadata Items="@(Resource)" Condition="'@(Resource)' != '' and '%(Resource.DefiningProjectFullPath)' != '$(MSBuildProjectFullPath)'">
       <Output TaskParameter="OutputItems" ItemName="_Temp" />
     </AssignLinkMetadata>
-
     <ItemGroup>
       <Resource Remove="@(_Temp)" />
       <Resource Include="@(_Temp)" />

diff --git a/src/Unchase.OpenAPI.Connectedservice.VS22/source.extension.vsixmanifest b/src/Unchase.OpenAPI.Connectedservice.VS22/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <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-75b1f0326c2b" Version="1.9.0" Language="en-US" Publisher="Unchase" />
+    <Identity Id="Unchase.OpenAPI.Connectedservice.63199638-6211-4285-ba8f-75b1f0326c2b" Version="1.9.1" Language="en-US" Publisher="Unchase" />
     <DisplayName>Unchase OpenAPI (Swagger) Connected Service VS2022</DisplayName>
     <Description xml:space="preserve">Connected service for Visual Studio 2022 to generate OpenAPI (Swagger) web service reference.</Description>
     <MoreInfo>https://github.com/unchase/Unchase.OpenAPI.Connectedservice</MoreInfo>

diff --git a/src/Unchase.OpenAPI.Connectedservice/Unchase.OpenAPI.ConnectedService.csproj b/src/Unchase.OpenAPI.Connectedservice/Unchase.OpenAPI.ConnectedService.csproj
@@ -219,7 +219,7 @@
       <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions">
-      <Version>3.0.0</Version>
+      <Version>1.1.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions">
       <Version>3.0.0</Version>
@@ -276,7 +276,7 @@
       <Version>12.0.2</Version>
     </PackageReference>
     <PackageReference Include="NSwag.Commands">
-      <Version>13.18.0</Version>
+      <Version>13.19.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.VisualStudio">
       <Version>5.11.3</Version>
@@ -320,8 +320,7 @@
   -->
   <Target Name="ForceVSIXIncludes" BeforeTargets="GetVsixSourceItems" AfterTargets="ResolveAssemblyReferences">
     <ItemGroup>
-      <_ForceIncludeInVSIX Include="@(ReferenceCopyLocalPaths)" Condition=" '%(ReferenceCopyLocalPaths.NuGetSourceType)' == 'Package' and
-                           '%(ReferenceCopyLocalPaths.FileName)' == 'Newtonsoft.Json' ">
+      <_ForceIncludeInVSIX Include="@(ReferenceCopyLocalPaths)" Condition=" '%(ReferenceCopyLocalPaths.NuGetSourceType)' == 'Package' and&#xD;&#xA;                           '%(ReferenceCopyLocalPaths.FileName)' == 'Newtonsoft.Json' ">
         <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
       </_ForceIncludeInVSIX>
     </ItemGroup>
@@ -332,11 +331,9 @@
   </Target>
   <Target Name="AssignLinkMetadataForResource" BeforeTargets="AssignLinkMetadata" Condition=" '$(SynthesizeLinkMetadata)' == 'true' ">
     <!-- RESOURCE ITEMS -->
-    <AssignLinkMetadata Items="@(Resource)"
-                        Condition="'@(Resource)' != '' and '%(Resource.DefiningProjectFullPath)' != '$(MSBuildProjectFullPath)'">
+    <AssignLinkMetadata Items="@(Resource)" Condition="'@(Resource)' != '' and '%(Resource.DefiningProjectFullPath)' != '$(MSBuildProjectFullPath)'">
       <Output TaskParameter="OutputItems" ItemName="_Temp" />
     </AssignLinkMetadata>
-
     <ItemGroup>
       <Resource Remove="@(_Temp)" />
       <Resource Include="@(_Temp)" />

diff --git a/src/Unchase.OpenAPI.Connectedservice/source.extension.vsixmanifest b/src/Unchase.OpenAPI.Connectedservice/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.9.0" Language="en-US" Publisher="Unchase" />
+        <Identity Id="Unchase.Openapi.ConnectedService.63199638-6211-4285-ba8f-75b1f0326c2a" Version="1.9.1" 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>