Fix #49

unchase · Oct 2, 2020 · eeeab04 · eeeab04
1 parent f544be0
commit eeeab04
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 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.UnchaseODataConnectedService).
 
+## v1.4.2 `(2020-10-02)`
+
+- [x] Fix [issue #49](https://github.com/unchase/Unchase.Odata.Connectedservice/issues/49)
+
 ## v1.4.1 `(2020-02-21)`
 
 - [x] Replace Dictionary with IDictionary in ByKey method

diff --git a/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs b/src/Unchase.OData.ConnectedService/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.0.*")]
-[assembly: AssemblyVersion("1.4.1.0")]
-[assembly: AssemblyFileVersion("1.4.1.0")]
+[assembly: AssemblyVersion("1.4.2.0")]
+[assembly: AssemblyFileVersion("1.4.2.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/src/Unchase.OData.ConnectedService/Templates/ODataT4CodeGenerator.cs b/src/Unchase.OData.ConnectedService/Templates/ODataT4CodeGenerator.cs
@@ -6871,7 +6871,7 @@ internal override void WriteFunctionImportReturnCollectionResult(string function
 
 this.Write(this.ToStringHelper.ToStringWithCulture(returnTypeName));
 
-this.Write(")(\"\", \"/");
+this.Write(")(\"\", \"");
 
 this.Write(this.ToStringHelper.ToStringWithCulture(originalFunctionName));
 
@@ -6932,7 +6932,7 @@ internal override void WriteFunctionImportReturnSingleResult(string functionName
 
 this.Write(this.ToStringHelper.ToStringWithCulture("Of " + returnTypeName));
 
-this.Write(")(\"\", \"/");
+this.Write(")(\"\", \"");
 
 this.Write(this.ToStringHelper.ToStringWithCulture(originalFunctionName));
 

diff --git a/src/Unchase.OData.ConnectedService/Templates/ODataT4CodeGenerator.ttinclude b/src/Unchase.OData.ConnectedService/Templates/ODataT4CodeGenerator.ttinclude
@@ -5251,7 +5251,7 @@ Namespace <#= fullNamespace #>
         }
 #>
         Public Function <#= functionName #>(<#= parameters #><#= useEntityReference ? ", Optional ByVal useEntityReference As Boolean = False" : string.Empty #>) As Global.Microsoft.OData.Client.DataServiceQuery(Of <#= returnTypeName #>)
-            Return Me.CreateFunctionQuery(Of <#= returnTypeName #>)("", "/<#= originalFunctionName #>", <#= isComposable #> <#= string.IsNullOrEmpty(parameterValues) ? string.Empty : ", " + parameterValues #>)
+            Return Me.CreateFunctionQuery(Of <#= returnTypeName #>)("", "<#= originalFunctionName #>", <#= isComposable #> <#= string.IsNullOrEmpty(parameterValues) ? string.Empty : ", " + parameterValues #>)
         End Function
 <#+
     }
@@ -5271,7 +5271,7 @@ Namespace <#= fullNamespace #>
         }
 #>
         Public Function <#= functionName #>(<#= parameters #><#= useEntityReference ? ", Optional ByVal useEntityReference As Boolean = False" : string.Empty #>) As <#= isReturnEntity ? returnTypeNameWithSingleSuffix : string.Format(CultureInfo.InvariantCulture, this.DataServiceQuerySingleStructureTemplate, returnTypeName) #>
-            Return <#= isReturnEntity ? "New " + returnTypeNameWithSingleSuffix + "(" : string.Empty #>Me.CreateFunctionQuerySingle(<#= "Of " + returnTypeName #>)("", "/<#= originalFunctionName #>", <#= isComposable #><#= string.IsNullOrEmpty(parameterValues) ? string.Empty : ", " + parameterValues #>)<#= isReturnEntity ? ")" : string.Empty #>
+            Return <#= isReturnEntity ? "New " + returnTypeNameWithSingleSuffix + "(" : string.Empty #>Me.CreateFunctionQuerySingle(<#= "Of " + returnTypeName #>)("", "<#= originalFunctionName #>", <#= isComposable #><#= string.IsNullOrEmpty(parameterValues) ? string.Empty : ", " + parameterValues #>)<#= isReturnEntity ? ")" : string.Empty #>
         End Function
 <#+
     }

diff --git a/src/Unchase.OData.ConnectedService/source.extension.vsixmanifest b/src/Unchase.OData.ConnectedService/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.OData.ConnectedService.afc46f39-8c64-4e14-85d0-af6c7c4291f3" Version="1.4" Language="en-US" Publisher="Unchase" />
+        <Identity Id="Unchase.OData.ConnectedService.afc46f39-8c64-4e14-85d0-af6c7c4291f3" Version="1.4.2" Language="en-US" Publisher="Unchase" />
         <DisplayName>Unchase OData Connected Service</DisplayName>
         <Description xml:space="preserve">OData V1-V4 connected service with extension methods for client-side proxy class.</Description>
         <MoreInfo>https://github.com/unchase/Unchase.Odata.Connectedservice</MoreInfo>