1) Fixes #7: Add support for loading client code generation parameter…

…s from json files (including "Connected Service .json" from OData Connected Service by Microsoft);

2) Fix bug with multiple untrusted sertificate validation (if multiple OData services are hosted on one endpoint);
3) Add more code generation parameters to stored "UserSettings";
4) Add "Excluded Operation imports names" to OData V4 generation template for excluding "OperationImports" you need.

CHANGELOG.md

@@ -7,6 +7,14 @@
 
 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).
 
+## v 1.3.0 `2019-09-21`
+
+- [x] Close the [issue #5](https://github.com/unchase/Unchase.Odata.Connectedservice/issues/5):
+  - [x] Add support for loading client code generation parameters from json files (including `Connected Service .json` from OData Connected Service by Microsoft)
+- [x] Fix bug with multiple untrusted sertificate validation (if multiple OData services are hosted on one endpoint)
+- [x] Add more code generation parameters to stored `UserSettings`
+- [x] Add `Excluded Operation imports names` to OData V4 generation template for excluding `OperationImports` you need
+
 ## v1.2.0 `2019-09-10`
 
 - [x] Code refactoring

README.md

@@ -59,6 +59,12 @@ Install from `Tools -> Extensions and Updates` menu inside [Visual Studio](https
 
 ![Unchase OData Connected Service FunctionImports](img/Unchase-OData-Connected-Service-FunctionImports.png)
 
+## Features are supported since v1.3.0
+
+### Loading client code generation parameters from json files (including `Connected Service .json` from OData Connected Service by Microsoft)
+
+![Unchase OData Connected Service Load Parameters](img/Unchase-OData-Connected-Service-LoadJson.png)
+
 ## HowTos
 
 - [ ] Add HowTos in a future

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.2.{build}
+version: 1.3.{build}
 pull_requests:
   do_not_increment_build_number: true
 skip_tags: true

src/Unchase.OData.ConnectedService/CodeGeneration/BaseCodeGenDescriptor.cs

@@ -97,7 +97,7 @@ protected string GetReferenceFileFolder()
             Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
             var serviceReferenceFolderName = this.Context.HandlerHelper.GetServiceArtifactsRootFolder();
 
-            return Path.Combine(ProjectHelper.GetProjectFullPath(this.Project), serviceReferenceFolderName, this.Context.ServiceInstance.Name);
+            return Path.Combine(this.Project.GetProjectFullPath(), serviceReferenceFolderName, this.Context.ServiceInstance.Name);
         }
         #endregion
     }

src/Unchase.OData.ConnectedService/Common/Constants.cs

@@ -81,6 +81,5 @@ public enum OperationImportsGenerator
             SimpleOData = 1,
             Vipr = 2
         }
-
     }
 }

src/Unchase.OData.ConnectedService/Common/ExtensionsHelper.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2018 Unchase (https://github.com/unchase).  All rights reserved.
 // Licensed under the Apache License 2.0.  See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -17,6 +18,15 @@
 
 namespace Unchase.OData.ConnectedService.Common
 {
+    #region For update from Microsoft OData Connected Service
+    internal class ConnectedServiceJsonFileData
+    {
+        public string ProviderId { get; set; }
+
+        public UserSettings ExtendedData { get; set; }
+    }
+    #endregion
+
     internal static class ExtensionsHelper
     {
         #region For Views

src/Unchase.OData.ConnectedService/Common/ProjectHelper.cs

@@ -31,7 +31,7 @@ public static Project GetProject(this IVsHierarchy projectHierarchy)
             return (Project)projectObject;
         }
 
-        public static Project GetProjectFromHierarchy(IVsHierarchy projectHierarchy)
+        public static Project GetProjectFromHierarchy(this IVsHierarchy projectHierarchy)
         {
             Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
             var result = projectHierarchy.GetProperty(
@@ -42,7 +42,7 @@ public static Project GetProjectFromHierarchy(IVsHierarchy projectHierarchy)
             return (Project)projectObject;
         }
 
-        public static string GetProjectFullPath(Project project)
+        public static string GetProjectFullPath(this Project project)
         {
             Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
             return project.Properties.Item("FullPath").Value.ToString();
@@ -65,7 +65,7 @@ public static string GetServiceFolderPath(this Project project, string rootFolde
             return servicePath;
         }
 
-        public static string GetSelectedPath(DTE2 dte)
+        public static string GetSelectedPath(this DTE2 dte)
         {
             Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
             var items = (Array)dte.ToolWindows.SolutionExplorer?.SelectedItems;

src/Unchase.OData.ConnectedService/Handler.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License 2.0.  See License.txt in the project root for license information.
 
 using System;
-using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.ConnectedServices;
@@ -21,7 +20,7 @@ public override async Task<AddServiceInstanceResult> AddServiceInstanceAsync(Con
 
             var codeGenInstance = (Instance)context.ServiceInstance;
 
-            var codeGenDescriptor = await GenerateCodeAsync(codeGenInstance.MetadataTempFilePath, codeGenInstance.ServiceConfig.EdmxVersion, context);
+            var codeGenDescriptor = await GenerateCodeAsync(codeGenInstance.ServiceConfig.EdmxVersion, context);
 
             codeGenInstance.ServiceConfig.FunctionImports = null;
             codeGenInstance.ServiceConfig.OperationImports = null;
@@ -39,7 +38,7 @@ public override async Task<UpdateServiceInstanceResult> UpdateServiceInstanceAsy
 
             var codeGenInstance = (Instance)context.ServiceInstance;
 
-            var codeGenDescriptor = await GenerateCodeAsync(codeGenInstance.ServiceConfig.Endpoint, codeGenInstance.ServiceConfig.EdmxVersion, context);
+            var codeGenDescriptor = await GenerateCodeAsync(codeGenInstance.ServiceConfig.EdmxVersion, context);
 
             codeGenInstance.ServiceConfig.FunctionImports = null;
             codeGenInstance.ServiceConfig.OperationImports = null;
@@ -51,7 +50,7 @@ public override async Task<UpdateServiceInstanceResult> UpdateServiceInstanceAsy
             return new UpdateServiceInstanceResult { GettingStartedDocument = new GettingStartedDocument(new Uri(codeGenDescriptor.ClientDocUri)) };
         }
 
-        private static async Task<BaseCodeGenDescriptor> GenerateCodeAsync(string metadataUri, Version edmxVersion, ConnectedServiceHandlerContext context)
+        private static async Task<BaseCodeGenDescriptor> GenerateCodeAsync(Version edmxVersion, ConnectedServiceHandlerContext context)
         {
             var instance = (Instance)context.ServiceInstance;
             BaseCodeGenDescriptor codeGenDescriptor;
@@ -68,7 +67,7 @@ private static async Task<BaseCodeGenDescriptor> GenerateCodeAsync(string metada
             }
             else
             {
-                throw new Exception(string.Format(CultureInfo.InvariantCulture, "Not supported Edmx Version{0}", (edmxVersion != null ? $" {edmxVersion}." : ". Try with Endpoint ends \"/$metadata\".")));
+                throw new Exception($"Not supported Edmx Version{(edmxVersion != null ? $" {edmxVersion}." : ". Try with Endpoint ends \"/$metadata\".")}");
             }
 
             codeGenDescriptor.UseNetworkCredentials = instance.ServiceConfig.UseNetworkCredentials;

src/Unchase.OData.ConnectedService/Models/UserSettings.cs

@@ -20,7 +20,7 @@ internal class UserSettings
 
         private const int MaxMruEntries = 10;
 
-        private ConnectedServiceLogger logger;
+        private ConnectedServiceLogger _logger;
         #endregion
 
         [DataMember]
@@ -37,6 +37,39 @@ internal class UserSettings
 
         [DataMember]
         public LanguageOption LanguageOption { get; set; }
+
+        [DataMember]
+        public bool UseDataServiceCollection { get; set; }
+
+        [DataMember]
+        public string GeneratedFileNamePrefix { get; set; }
+
+        [DataMember]
+        public bool UseNameSpacePrefix { get; set; }
+
+        [DataMember]
+        public string NamespacePrefix { get; set; }
+
+        [DataMember]
+        public bool EnableNamingAlias { get; set; }
+
+        [DataMember]
+        public bool IgnoreUnexpectedElementsAndAttributes { get; set; }
+
+        [DataMember]
+        public bool IncludeT4File { get; set; }
+
+        [DataMember]
+        public bool IncludeExtensionsT4File { get; set; }
+
+        [DataMember]
+        public Constants.OperationImportsGenerator OperationImportsGenerator { get; set; }
+
+        [DataMember]
+        public bool SelectOperationImports { get; set; }
+
+        [DataMember]
+        public string ExcludedOperationImportsNames { get; set; }
         #endregion
 
         #region Constructors
@@ -49,14 +82,14 @@ private UserSettings()
         #region Methods
         public void Save()
         {
-            UserSettingsPersistenceHelper.Save(this, Constants.ProviderId, UserSettings.Name, null, this.logger);
+            UserSettingsPersistenceHelper.Save(this, Constants.ProviderId, UserSettings.Name, null, this._logger);
         }
 
         public static UserSettings Load(ConnectedServiceLogger logger)
         {
             var userSettings = UserSettingsPersistenceHelper.Load<UserSettings>(
                 Constants.ProviderId, UserSettings.Name, null, logger) ?? new UserSettings();
-            userSettings.logger = logger;
+            userSettings._logger = logger;
 
             return userSettings;
         }

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.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
 [assembly: NeutralResourcesLanguage("en")]
 

src/Unchase.OData.ConnectedService/Provider.cs

@@ -29,7 +29,7 @@ public Provider()
                 BitmapSizeOptions.FromWidthAndHeight(32, 32)
             );
             CreatedBy = Constants.Author;
-            Version = new Version(1, 2, 0, 0);
+            Version = new Version(1, 3, 0, 0);
             Version = typeof(Provider).Assembly.GetName().Version;
             MoreInfoUri = new Uri(Constants.Website);
         }