Fix the issue #22

unchase · Jan 7, 2020 · 2bd4b5a · 2bd4b5a
1 parent b28c82c
commit 2bd4b5a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 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.3.6 `2020-01-07`
+
+- [x] Fix the [issue #22](https://github.com/unchase/Unchase.Odata.Connectedservice/issues/22)
+
 ## v1.3.4 `2019-10-20`
 
 - [x] Update icon resolution

diff --git a/src/Unchase.OData.ConnectedService/Handler.cs b/src/Unchase.OData.ConnectedService/Handler.cs
@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.ConnectedServices;
 using Unchase.OData.ConnectedService.CodeGeneration;
-using Unchase.OData.ConnectedService.Models;
 
 namespace Unchase.OData.ConnectedService
 {
@@ -20,12 +19,22 @@ public override async Task<AddServiceInstanceResult> AddServiceInstanceAsync(Con
 
             var codeGenInstance = (Instance)context.ServiceInstance;
 
+            try
+            {
+                await GenerateCodeAsync(codeGenInstance.ServiceConfig.EdmxVersion, context);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+
             var codeGenDescriptor = await GenerateCodeAsync(codeGenInstance.ServiceConfig.EdmxVersion, context);
 
             codeGenInstance.ServiceConfig.FunctionImports = null;
             codeGenInstance.ServiceConfig.OperationImports = null;
 
-            context.SetExtendedDesignerData<ServiceConfiguration>(codeGenInstance.ServiceConfig);
+            context.SetExtendedDesignerData(codeGenInstance.ServiceConfig);
 
             await context.Logger.WriteMessageAsync(LoggerMessageCategory.Information, "Adding service instance complete!");
 
@@ -43,7 +52,7 @@ public override async Task<UpdateServiceInstanceResult> UpdateServiceInstanceAsy
             codeGenInstance.ServiceConfig.FunctionImports = null;
             codeGenInstance.ServiceConfig.OperationImports = null;
 
-            context.SetExtendedDesignerData<ServiceConfiguration>(codeGenInstance.ServiceConfig);
+            context.SetExtendedDesignerData(codeGenInstance.ServiceConfig);
 
             await context.Logger.WriteMessageAsync(LoggerMessageCategory.Information, "Updating service instance complete.");
 

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.3.4.0")]
-[assembly: AssemblyFileVersion("1.3.4.0")]
+[assembly: AssemblyVersion("1.3.6.0")]
+[assembly: AssemblyFileVersion("1.3.6.0")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/src/Unchase.OData.ConnectedService/Provider.cs b/src/Unchase.OData.ConnectedService/Provider.cs
@@ -29,7 +29,7 @@ public Provider()
                 BitmapSizeOptions.FromWidthAndHeight(64, 64)
             );
             CreatedBy = Constants.Author;
-            Version = new Version(1, 3, 4, 0);
+            Version = new Version(1, 3, 6, 0);
             Version = typeof(Provider).Assembly.GetName().Version;
             MoreInfoUri = new Uri(Constants.Website);
         }

diff --git a/src/Unchase.OData.ConnectedService/Templates/ODataT4CodeGenerator.cs b/src/Unchase.OData.ConnectedService/Templates/ODataT4CodeGenerator.cs
@@ -4098,7 +4098,7 @@ internal override void WriteGeneratedEdmModel(string escapedEdmxString)
 
 this.Write(@", out edmModel, out errors))
                     {
-                        global::System.Text.StringBuilder errorMessages = new System.Text.StringBuilder();
+                        global::System.Text.StringBuilder errorMessages = global::new System.Text.StringBuilder();
                         foreach (var error in errors)
                         {
                             errorMessages.Append(error.ErrorMessage);

diff --git a/src/Unchase.OData.ConnectedService/Templates/ODataT4CodeGenerator.ttinclude b/src/Unchase.OData.ConnectedService/Templates/ODataT4CodeGenerator.ttinclude
@@ -3801,7 +3801,7 @@ namespace <#= fullNamespace #>
 
                     if (!global::Microsoft.OData.Edm.Csdl.CsdlReader.TryParse(reader, <#= this.context.IgnoreUnexpectedElementsAndAttributes ? "true" : "false" #>, out edmModel, out errors))
                     {
-                        global::System.Text.StringBuilder errorMessages = new System.Text.StringBuilder();
+                        global::System.Text.StringBuilder errorMessages = global::new System.Text.StringBuilder();
                         foreach (var error in errors)
                         {
                             errorMessages.Append(error.ErrorMessage);