Properly handle type definitions elements in schema

ODataConnectedService/ODataConnectedService.Tests.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODataConnectedService", "src\ODataConnectedService.csproj", "{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ODataConnectedService.Tests", "test\ODataConnectedService.Tests\ODataConnectedService.Tests.csproj", "{903B31D0-BE14-4D9E-BA76-186FA82B3A37}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8BC5B8E-9AB7-4257-B8F1-E7C62169F9B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{903B31D0-BE14-4D9E-BA76-186FA82B3A37}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {FD696714-8F52-4A00-93F4-43C843F184DB}
+	EndGlobalSection
+EndGlobal

ODataConnectedService/src/CodeGeneration/BaseCodeGenDescriptor.cs

@@ -50,7 +50,7 @@ public BaseCodeGenDescriptor(string metadataUri, ConnectedServiceHandlerContext
             this.ServiceConfiguration = ((ODataConnectedServiceInstance)this.Context.ServiceInstance).ServiceConfig;
         }
 
-        private void Init()
+        protected virtual void Init()
         {
             var componentModel = (IComponentModel)Shell.Package.GetGlobalService(typeof(SComponentModel));
             this.PackageInstallerServices = componentModel.GetService<IVsPackageInstallerServices>();

ODataConnectedService/src/CodeGeneration/CodeGenDescriptorFactory.cs

@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.  See License.txt in the project root for license information.
+
+using System;
+using System.Globalization;
+using EnvDTE;
+using Microsoft.VisualStudio.ConnectedServices;
+using Microsoft.OData.ConnectedService.Templates;
+
+namespace Microsoft.OData.ConnectedService.CodeGeneration
+{
+    class CodeGenDescriptorFactory: ICodeGenDescriptorFactory
+    {
+        public BaseCodeGenDescriptor Create(Version edmxVersion, string metadataUri, ConnectedServiceHandlerContext context, Project project)
+        {
+            if (edmxVersion == Common.Constants.EdmxVersion1
+                || edmxVersion == Common.Constants.EdmxVersion2
+                || edmxVersion == Common.Constants.EdmxVersion3)
+            {
+                return CreateV3CodeGenDescriptor(metadataUri, context, project);
+            }
+            else if (edmxVersion == Common.Constants.EdmxVersion4)
+            {
+                return CreateV4CodeGenDescriptor(metadataUri, context, project);
+            }
+            throw new Exception(string.Format(CultureInfo.InvariantCulture, "Not supported Edmx Version {0}", edmxVersion.ToString()));
+        }
+
+        protected virtual BaseCodeGenDescriptor CreateV3CodeGenDescriptor(string metadataUri, ConnectedServiceHandlerContext context, Project project)
+        {
+            return new V3CodeGenDescriptor(metadataUri, context, project);
+        }
+
+        protected virtual BaseCodeGenDescriptor CreateV4CodeGenDescriptor(string metadataUri, ConnectedServiceHandlerContext context, Project project)
+        {
+            return new V4CodeGenDescriptor(metadataUri, context, project, new ODataT4CodeGeneratorFactory());
+        }
+    }
+}

ODataConnectedService/src/CodeGeneration/ICodeGenDescriptorFactory.cs

@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.  See License.txt in the project root for license information.
+
+using System;
+using EnvDTE;
+using Microsoft.VisualStudio.ConnectedServices;
+
+namespace Microsoft.OData.ConnectedService.CodeGeneration
+{
+    interface ICodeGenDescriptorFactory
+    {
+        BaseCodeGenDescriptor Create(Version edmxVersion, string metadataUri, ConnectedServiceHandlerContext context, Project project);
+    }
+}

ODataConnectedService/src/CodeGeneration/V4CodeGenDescriptor.cs

@@ -15,14 +15,17 @@ namespace Microsoft.OData.ConnectedService.CodeGeneration
 {
     internal class V4CodeGenDescriptor : BaseCodeGenDescriptor
     {
-        public V4CodeGenDescriptor(string metadataUri, ConnectedServiceHandlerContext context, Project project)
+        public V4CodeGenDescriptor(string metadataUri, ConnectedServiceHandlerContext context, Project project, IODataT4CodeGeneratorFactory codeGeneratorFactory)
             : base(metadataUri, context, project)
         {
-            this.ClientNuGetPackageName = Common.Constants.V4ClientNuGetPackage;
-            this.ClientDocUri = Common.Constants.V4DocUri;
-            this.ServiceConfiguration = base.ServiceConfiguration as ServiceConfigurationV4;
+            ClientNuGetPackageName = Common.Constants.V4ClientNuGetPackage;
+            ClientDocUri = Common.Constants.V4DocUri;
+            ServiceConfiguration = base.ServiceConfiguration as ServiceConfigurationV4;
+            CodeGeneratorFactory = codeGeneratorFactory;
         }
 
+        private IODataT4CodeGeneratorFactory CodeGeneratorFactory { get; set; }
+
         private new ServiceConfigurationV4 ServiceConfiguration { get; set; }
 
         public override async Task AddNugetPackages()
@@ -66,7 +69,7 @@ private async Task AddT4File()
                 text = Regex.Replace(text, "(public const string TargetLanguage = )\"OutputLanguage\";", "$1\"CSharp\";");
                 text = Regex.Replace(text, "(public const bool EnableNamingAlias = )true;", "$1" + this.ServiceConfiguration.EnableNamingAlias.ToString().ToLower(CultureInfo.InvariantCulture) + ";");
                 text = Regex.Replace(text, "(public const bool IgnoreUnexpectedElementsAndAttributes = )true;", "$1" + this.ServiceConfiguration.IgnoreUnexpectedElementsAndAttributes.ToString().ToLower(CultureInfo.InvariantCulture) + ";");
-
+                text = Regex.Replace(text, "(public const bool MakeTypesInternal = )false;", "$1" + ServiceConfiguration.MakeTypesInternal.ToString().ToLower(CultureInfo.InvariantCulture) + ";");
                 await writer.WriteAsync(text);
                 await writer.FlushAsync();
             }
@@ -78,13 +81,14 @@ private async Task AddT4File()
 
         private async Task AddGeneratedCSharpCode()
         {
-            ODataT4CodeGenerator t4CodeGenerator = new ODataT4CodeGenerator();
+            ODataT4CodeGenerator t4CodeGenerator = CodeGeneratorFactory.Create();
             t4CodeGenerator.MetadataDocumentUri = MetadataUri;
             t4CodeGenerator.UseDataServiceCollection = this.ServiceConfiguration.UseDataServiceCollection;
             t4CodeGenerator.TargetLanguage = ODataT4CodeGenerator.LanguageOption.CSharp;
             t4CodeGenerator.IgnoreUnexpectedElementsAndAttributes = this.ServiceConfiguration.IgnoreUnexpectedElementsAndAttributes;
             t4CodeGenerator.EnableNamingAlias = this.ServiceConfiguration.EnableNamingAlias;
             t4CodeGenerator.NamespacePrefix = this.ServiceConfiguration.NamespacePrefix;
+            t4CodeGenerator.MakeTypesInternal = ServiceConfiguration.MakeTypesInternal;
 
             string tempFile = Path.GetTempFileName();
 

ODataConnectedService/src/Models/ServiceConfiguration.cs

@@ -14,6 +14,7 @@ internal class ServiceConfiguration
         public bool UseNameSpacePrefix { get; set; }
         public string NamespacePrefix { get; set; }
         public bool UseDataServiceCollection { get; set; }
+        public bool MakeTypesInternal { get; set; }
     }
 
     internal class ServiceConfigurationV4 : ServiceConfiguration

ODataConnectedService/src/ODataConnectedService.csproj

@@ -22,6 +22,7 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <OldToolsVersion>14.0</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -36,11 +37,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.OData.ConnectedService</RootNamespace>
     <AssemblyName>Microsoft.OData.ConnectedService</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <StartAction>Program</StartAction>
-    <StartProgram>C:\Program Files (x86)\Microsoft Visual Studio $(VisualStudioVersion)\Common7\IDE\devenv.exe</StartProgram>
+    <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
     <StartArguments>/rootSuffix exp</StartArguments>
     <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
@@ -161,6 +162,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CodeGeneration\BaseCodeGenDescriptor.cs" />
+    <Compile Include="CodeGeneration\CodeGenDescriptorFactory.cs" />
+    <Compile Include="CodeGeneration\ICodeGenDescriptorFactory.cs" />
     <Compile Include="CodeGeneration\V3CodeGenDescriptor.cs" />
     <Compile Include="CodeGeneration\V4CodeGenDescriptor.cs" />
     <Compile Include="Common\CodeGeneratorUtils.cs" />
@@ -175,11 +178,13 @@
     <Compile Include="ODataConnectedServiceProvider.cs" />
     <Compile Include="ODataConnectedServiceWizard.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Templates\IODataT4CodeGeneratorFactory.cs" />
     <Compile Include="Templates\ODataT4CodeGenerator.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>ODataT4CodeGenerator.tt</DependentUpon>
     </Compile>
+    <Compile Include="Templates\ODataT4CodeGeneratorFactory.cs" />
     <Compile Include="ViewModels\AdvancedSettingsViewModel.cs" />
     <Compile Include="ViewModels\ConfigODataEndpointViewModel.cs" />
     <Compile Include="Views\AdvancedSettings.xaml.cs">

ODataConnectedService/src/ODataConnectedServiceHandler.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
-using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 using EnvDTE;
@@ -16,51 +15,44 @@ namespace Microsoft.OData.ConnectedService
     [ConnectedServiceHandlerExport(Common.Constants.ProviderId, AppliesTo = "CSharp")]
     internal class ODataConnectedServiceHandler : ConnectedServiceHandler
     {
-        public override async Task<AddServiceInstanceResult> AddServiceInstanceAsync(ConnectedServiceHandlerContext context, CancellationToken ct)
-        {
-            Project project = ProjectHelper.GetProjectFromHierarchy(context.ProjectHierarchy);
-            ODataConnectedServiceInstance codeGenInstance = (ODataConnectedServiceInstance)context.ServiceInstance;
+        private ICodeGenDescriptorFactory codeGenDescriptorFactory;
+        public ODataConnectedServiceHandler(): this(new CodeGenDescriptorFactory()) {}
 
-            var codeGenDescriptor = await GenerateCode(codeGenInstance.MetadataTempFilePath, codeGenInstance.ServiceConfig.EdmxVersion, context, project);
+        public ODataConnectedServiceHandler(ICodeGenDescriptorFactory codeGenDescriptorFactory)
+            : base()
+        {
+            this.codeGenDescriptorFactory = codeGenDescriptorFactory;
+        }
 
-            context.SetExtendedDesignerData<ServiceConfiguration>(codeGenInstance.ServiceConfig);
 
+        public override async Task<AddServiceInstanceResult> AddServiceInstanceAsync(ConnectedServiceHandlerContext context, CancellationToken ct)
+        {
+            var codeGenDescriptor = await SaveServiceInstanceAsync(context);
             var result = new AddServiceInstanceResult(
                 context.ServiceInstance.Name,
                 new Uri(codeGenDescriptor.ClientDocUri));
-
             return result;
         }
 
         public override async Task<UpdateServiceInstanceResult> UpdateServiceInstanceAsync(ConnectedServiceHandlerContext context, CancellationToken ct)
         {
-            Project project = ProjectHelper.GetProjectFromHierarchy(context.ProjectHierarchy);
-            ODataConnectedServiceInstance codeGenInstance = (ODataConnectedServiceInstance)context.ServiceInstance;
-
-            var codeGenDescriptor = await GenerateCode(codeGenInstance.ServiceConfig.Endpoint, codeGenInstance.ServiceConfig.EdmxVersion, context, project);
-            context.SetExtendedDesignerData<ServiceConfiguration>(codeGenInstance.ServiceConfig);
+            await SaveServiceInstanceAsync(context);
             return new UpdateServiceInstanceResult();
         }
 
-        private static async Task<BaseCodeGenDescriptor> GenerateCode(string metadataUri, Version edmxVersion, ConnectedServiceHandlerContext context, Project project)
+        private async Task<BaseCodeGenDescriptor> SaveServiceInstanceAsync(ConnectedServiceHandlerContext context)
         {
-            BaseCodeGenDescriptor codeGenDescriptor;
+            Project project = ProjectHelper.GetProjectFromHierarchy(context.ProjectHierarchy);
+            ODataConnectedServiceInstance serviceInstance = (ODataConnectedServiceInstance)context.ServiceInstance;
 
-            if (edmxVersion == Common.Constants.EdmxVersion1
-                || edmxVersion == Common.Constants.EdmxVersion2
-                || edmxVersion == Common.Constants.EdmxVersion3)
-            {
-                codeGenDescriptor = new V3CodeGenDescriptor(metadataUri, context, project);
-            }
-            else if (edmxVersion == Common.Constants.EdmxVersion4)
-            {
-                codeGenDescriptor = new V4CodeGenDescriptor(metadataUri, context, project);
-            }
-            else
-            {
-                throw new Exception(string.Format(CultureInfo.InvariantCulture, "Not supported Edmx Version {0}", edmxVersion.ToString()));
-            }
+            var codeGenDescriptor = await GenerateCode(serviceInstance.ServiceConfig.Endpoint, serviceInstance.ServiceConfig.EdmxVersion, context, project);
+            context.SetExtendedDesignerData<ServiceConfiguration>(serviceInstance.ServiceConfig);
+            return codeGenDescriptor;
+        }
 
+        private async Task<BaseCodeGenDescriptor> GenerateCode(string metadataUri, Version edmxVersion, ConnectedServiceHandlerContext context, Project project)
+        {
+            BaseCodeGenDescriptor codeGenDescriptor = codeGenDescriptorFactory.Create(edmxVersion, metadataUri, context, project);
             await codeGenDescriptor.AddNugetPackages();
             await codeGenDescriptor.AddGeneratedClientCode();
             return codeGenDescriptor;

ODataConnectedService/src/ODataConnectedServiceProvider.cs

@@ -15,13 +15,13 @@ internal class ODataConnectedServiceProvider : ConnectedServiceProvider
     {
         public ODataConnectedServiceProvider()
         {
-            this.Name = "OData Connected Service";
-            this.Category = "OData";
-            this.Description = "OData Connected Service for V1-V4";
-            this.Icon = new BitmapImage(new Uri("pack://application:,,/" + this.GetType().Assembly.ToString() + ";component/Resources/Icon.png"));
-            this.CreatedBy = "OData";
-            this.Version = new Version(0, 2, 0);
-            this.MoreInfoUri = new Uri("https://github.com/odata/lab");
+            Name = "OData Connected Service";
+            Category = "OData";
+            Description = "OData Connected Service for V1-V4";
+            Icon = new BitmapImage(new Uri("pack://application:,,/" + this.GetType().Assembly.ToString() + ";component/Resources/Icon.png"));
+            CreatedBy = "OData";
+            Version = new Version(0, 4, 0);
+            MoreInfoUri = new Uri("https://github.com/odata/lab");
         }
 
         public override Task<ConnectedServiceConfigurator> CreateConfiguratorAsync(ConnectedServiceProviderContext context)

ODataConnectedService/src/ODataConnectedServiceWizard.cs

@@ -3,8 +3,6 @@
 
 using System;
 using System.Threading.Tasks;
-using EnvDTE;
-using Microsoft.OData.ConnectedService.Common;
 using Microsoft.OData.ConnectedService.Models;
 using Microsoft.OData.ConnectedService.ViewModels;
 using Microsoft.OData.ConnectedService.Views;
@@ -83,6 +81,7 @@ public ODataConnectedServiceWizard(ConnectedServiceProviderContext context)
                             advancedSettingsViewModel.IgnoreUnexpectedElementsAndAttributes = serviceConfig.IgnoreUnexpectedElementsAndAttributes;
                             advancedSettingsViewModel.EnableNamingAlias = serviceConfig.EnableNamingAlias;
                             advancedSettingsViewModel.IncludeT4File = serviceConfig.IncludeT4File;
+                            advancedSettingsViewModel.MakeTypesInternal = serviceConfig.MakeTypesInternal;
                             advancedSettings.IncludeT4File.IsEnabled = false;
                         }
                     }
@@ -132,6 +131,7 @@ private ServiceConfiguration CreateServiceConfiguration()
             serviceConfiguration.UseDataServiceCollection = AdvancedSettingsViewModel.UseDataServiceCollection;
             serviceConfiguration.GeneratedFileNamePrefix = AdvancedSettingsViewModel.GeneratedFileName;
             serviceConfiguration.UseNameSpacePrefix = AdvancedSettingsViewModel.UseNamespacePrefix;
+            serviceConfiguration.MakeTypesInternal = AdvancedSettingsViewModel.MakeTypesInternal;
             if (AdvancedSettingsViewModel.UseNamespacePrefix && !string.IsNullOrEmpty(AdvancedSettingsViewModel.NamespacePrefix))
             {
                 serviceConfiguration.NamespacePrefix = AdvancedSettingsViewModel.NamespacePrefix;

ODataConnectedService/src/Properties/AssemblyInfo.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Reflection;
 using System.Resources;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -37,3 +38,5 @@
 [assembly: AssemblyVersion("0.3.0.0")]
 [assembly: AssemblyFileVersion("0.3.0.0")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
+
+[assembly: InternalsVisibleTo("ODataConnectedService.Tests")]

ODataConnectedService/src/Templates/IODataT4CodeGeneratorFactory.cs

@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.  See License.txt in the project root for license information.
+
+namespace Microsoft.OData.ConnectedService.Templates
+{
+    interface IODataT4CodeGeneratorFactory
+    {
+        ODataT4CodeGenerator Create();
+    }
+}