Merge pull request #67 from christianhelle/netstandard-common-lib

Create .NET Standard Library as a preparation for creating cross platform CLI tool
christianhelle · Nov 9, 2019 · f2c303b · f2c303b
2 parents 4df2128 + e41729d
commit f2c303b
Show file tree

Hide file tree

Showing 124 changed files with 911 additions and 1,817 deletions.
diff --git a/.gitignore b/.gitignore
@@ -263,3 +263,4 @@ __pycache__/
 # Cake Build
 src/tools/
 src/.ionide/
+src/MigrationBackup/
diff --git a/src/ApiClientCodeGen.Core/ApiClientCodeGen.Core.csproj b/src/ApiClientCodeGen.Core/ApiClientCodeGen.Core.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Commands\**" />
+    <EmbeddedResource Remove="Commands\**" />
+    <None Remove="Commands\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="NuGet\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ICSharpCode.CodeConverter" Version="7.2.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="NSwag.CodeGeneration.CSharp" Version="13.1.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Resource.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resource.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resource.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/...Gen.VSIX/Converters/ILanguageConverter.cs → ...Gen.Core/Converters/ILanguageConverter.cs b/...Gen.VSIX/Converters/ILanguageConverter.cs → ...Gen.Core/Converters/ILanguageConverter.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Converters
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Converters
 {
     public interface ILanguageConverter
     {

diff --git a/...CodeGen.VSIX/Core/DependencyDownloader.cs → ...lientCodeGen.Core/DependencyDownloader.cs b/...CodeGen.VSIX/Core/DependencyDownloader.cs → ...lientCodeGen.Core/DependencyDownloader.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Net;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators;
 
 namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core
 {
@@ -20,30 +20,26 @@ public static void InstallAutoRest()
             {
                 npmCommand = Path.Combine(programFiles64, "nodejs\\npm.cmd");
                 if (!File.Exists(npmCommand))
-                    throw new NotInstalledException("Unable to find NPM. Please install Node.js");
+                    throw new InvalidOperationException("Unable to find NPM. Please install Node.js");
             }
 
-            ProcessHelper.StartProcess(npmCommand, "install -g autorest");
+            new ProcessLauncher().Start(npmCommand, "install -g autorest");
             Trace.WriteLine("AutoRest installed successfully through NPM");
         }
 
         public static string InstallOpenApiGenerator(string path = null)
-        {
-            const string md5 = "45F0AEDA24983AC998878C4D8516CF48";
-            const string url = "http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.1.2/openapi-generator-cli-4.1.2.jar";
-            const string jar = "openapi-generator-cli.jar";
-
-            return InstallJarFile(path, jar, md5, url);
-        }
+            => InstallJarFile(
+                path,
+                "openapi-generator-cli.jar",
+                Resource.OpenApiGenerator_MD5,
+                Resource.OpenApiGenerator_DownloadUrl);
 
         public static string InstallSwaggerCodegenCli(string path = null)
-        {
-            const string md5 = "89E1C5F578CC0B7A5D430CDF8210AC44";
-            const string url = "https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.11/swagger-codegen-cli-3.0.11.jar";
-            const string jar = "swagger-codegen-cli.jar";
-
-            return InstallJarFile(path, jar, md5, url);
-        }
+            => InstallJarFile(
+                path,
+                "swagger-codegen-cli.jar",
+                Resource.SwaggerCodegenCli_MD5,
+                Resource.SwaggerCodegenCli_DownloadUrl);
 
         private static string InstallJarFile(string path, string jar, string md5, string url)
         {

diff --git a/...X/Extensions/OpenApiDocumentExtensions.cs → ...e/Extensions/OpenApiDocumentExtensions.cs b/...X/Extensions/OpenApiDocumentExtensions.cs → ...e/Extensions/OpenApiDocumentExtensions.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using NSwag;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Extensions
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Extensions
 {
     public static class OpenApiDocumentExtensions
     {

diff --git a/...deGen.VSIX/Extensions/StringExtensions.cs → ...deGen.Core/Extensions/StringExtensions.cs b/...deGen.VSIX/Extensions/StringExtensions.cs → ...deGen.Core/Extensions/StringExtensions.cs
@@ -6,7 +6,7 @@
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Extensions
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Extensions
 {
     public static class StringExtension
     {

diff --git a/...s/AutoRest/AutoRestCSharpCodeGenerator.cs → ...s/AutoRest/AutoRestCSharpCodeGenerator.cs b/...s/AutoRest/AutoRestCSharpCodeGenerator.cs → ...s/AutoRest/AutoRestCSharpCodeGenerator.cs
@@ -1,10 +1,9 @@
 using System;
 using System.IO;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.AutoRest;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Options.AutoRest;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Options.General;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.AutoRest
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators.AutoRest
 {
     public class AutoRestCSharpCodeGenerator : CodeGenerator
     {
@@ -13,8 +12,9 @@ public class AutoRestCSharpCodeGenerator : CodeGenerator
         public AutoRestCSharpCodeGenerator(
             string swaggerFile,
             string defaultNamespace,
-            IAutoRestOptions options)
-            : base(swaggerFile, defaultNamespace)
+            IAutoRestOptions options,
+            IProcessLauncher processLauncher)
+            : base(swaggerFile, defaultNamespace, processLauncher)
         {
             this.options = options ?? throw new ArgumentNullException(nameof(options));
         }

diff --git a/...deGen.VSIX/Generators/CSharpFileMerger.cs → ...deGen.Core/Generators/CSharpFileMerger.cs b/...deGen.VSIX/Generators/CSharpFileMerger.cs → ...deGen.Core/Generators/CSharpFileMerger.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Text;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators
 {
     public static class CSharpFileMerger
     {

diff --git a/...tCodeGen.VSIX/Generators/CodeGenerator.cs → ...tCodeGen.Core/Generators/CodeGenerator.cs b/...tCodeGen.VSIX/Generators/CodeGenerator.cs → ...tCodeGen.Core/Generators/CodeGenerator.cs
@@ -1,27 +1,27 @@
 using System;
 using System.IO;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Extensions;
-using Microsoft.VisualStudio.Shell.Interop;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators
 {
     public interface ICodeGenerator
     {
-        string GenerateCode(IVsGeneratorProgress pGenerateProgress);
+        string GenerateCode(IProgressReporter pGenerateProgress);
     }
 
     public abstract class CodeGenerator : ICodeGenerator
     {
         protected readonly string DefaultNamespace;
         protected readonly string SwaggerFile;
+        private readonly IProcessLauncher processLauncher;
 
-        protected CodeGenerator(string swaggerFile, string defaultNamespace)
+        protected CodeGenerator(string swaggerFile, string defaultNamespace, IProcessLauncher processLauncher)
         {
             SwaggerFile = swaggerFile ?? throw new ArgumentNullException(nameof(swaggerFile));
             DefaultNamespace = defaultNamespace ?? throw new ArgumentNullException(nameof(defaultNamespace));
+            this.processLauncher = processLauncher ?? throw new ArgumentNullException(nameof(processLauncher));
         }
 
-        public virtual string GenerateCode(IVsGeneratorProgress pGenerateProgress)
+        public virtual string GenerateCode(IProgressReporter pGenerateProgress)
         {
             try
             {
@@ -35,7 +35,7 @@ public virtual string GenerateCode(IVsGeneratorProgress pGenerateProgress)
                 var arguments = GetArguments(outputFile);
                 pGenerateProgress.Progress(30);
 
-                ProcessHelper.StartProcess(command, arguments);
+                processLauncher.Start(command, arguments);
                 pGenerateProgress.Progress(80);
 
                 return FileHelper.ReadThenDelete(outputFile);

diff --git a/src/ApiClientCodeGen.Core/Generators/CodeGeneratorFactory.cs b/src/ApiClientCodeGen.Core/Generators/CodeGeneratorFactory.cs
@@ -0,0 +1,12 @@
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators
+{
+    public interface ICodeGeneratorFactory
+    {
+        ICodeGenerator Create(
+            string defaultNamespace,
+            string inputFileContents,
+            string inputFilePath,
+            SupportedLanguage language,
+            SupportedCodeGenerator generator);
+    }
+}
diff --git a/...ientCodeGen.VSIX/Generators/FileHelper.cs → ...ientCodeGen.Core/Generators/FileHelper.cs b/...ientCodeGen.VSIX/Generators/FileHelper.cs → ...ientCodeGen.Core/Generators/FileHelper.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Security.Cryptography;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators
 {
     public static class FileHelper
     {

diff --git a/...erators/NSwag/NSwagCSharpCodeGenerator.cs → ...erators/NSwag/NSwagCSharpCodeGenerator.cs b/...erators/NSwag/NSwagCSharpCodeGenerator.cs → ...erators/NSwag/NSwagCSharpCodeGenerator.cs
@@ -1,9 +1,7 @@
 using System;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Extensions;
-using Microsoft.VisualStudio.Shell.Interop;
 using NSwag.CodeGeneration.CSharp;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.NSwag
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators.NSwag
 {
     public class NSwagCSharpCodeGenerator : ICodeGenerator
     {
@@ -22,7 +20,7 @@ public NSwagCSharpCodeGenerator(
                                             throw new ArgumentNullException(nameof(generatorSettingsFactory));
         }
 
-        public string GenerateCode(IVsGeneratorProgress pGenerateProgress)
+        public string GenerateCode(IProgressReporter pGenerateProgress)
         {
             try
             {

diff --git a/...Swag/NSwagCodeGeneratorSettingsFactory.cs → ...Swag/NSwagCodeGeneratorSettingsFactory.cs b/...Swag/NSwagCodeGeneratorSettingsFactory.cs → ...Swag/NSwagCodeGeneratorSettingsFactory.cs
@@ -1,10 +1,10 @@
 using System;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Extensions;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.NSwag;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Extensions;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Options.NSwag;
 using NSwag;
 using NSwag.CodeGeneration.CSharp;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.NSwag
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators.NSwag
 {
     public interface INSwagCodeGeneratorSettingsFactory
     {

diff --git a/src/ApiClientCodeGen.Core/Generators/NSwag/OpenApiDocumentFactory.cs b/src/ApiClientCodeGen.Core/Generators/NSwag/OpenApiDocumentFactory.cs
@@ -0,0 +1,9 @@
+using NSwag;
+
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators.NSwag
+{
+    public interface IOpenApiDocumentFactory
+    {
+        OpenApiDocument GetDocument(string swaggerFile);
+    }
+}
diff --git a/...s/NSwagStudio/NSwagStudioCodeGenerator.cs → ...s/NSwagStudio/NSwagStudioCodeGenerator.cs b/...s/NSwagStudio/NSwagStudioCodeGenerator.cs → ...s/NSwagStudio/NSwagStudioCodeGenerator.cs
@@ -1,26 +1,25 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Extensions;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
-using Microsoft.VisualStudio.Shell.Interop;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Options.General;
 using Newtonsoft.Json;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.NSwagStudio
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators.NSwagStudio
 {
     public class NSwagStudioCodeGenerator : ICodeGenerator
     {
         private readonly string nswagStudioFile;
-        private readonly CustomPathOptions options;
+        private readonly IGeneralOptions options;
+        private readonly IProcessLauncher processLauncher;
 
-        public NSwagStudioCodeGenerator(string nswagStudioFile, IGeneralOptions options)
+        public NSwagStudioCodeGenerator(string nswagStudioFile, IGeneralOptions options, IProcessLauncher processLauncher)
         {
             this.nswagStudioFile = nswagStudioFile ?? throw new ArgumentNullException(nameof(nswagStudioFile));
-            this.options = new CustomPathOptions(options ?? throw new ArgumentNullException(nameof(options)));
+            this.options = options ?? throw new ArgumentNullException(nameof(options));
+            this.processLauncher = processLauncher ?? throw new ArgumentNullException(nameof(processLauncher));
         }
 
-        public string GenerateCode(IVsGeneratorProgress pGenerateProgress)
+        public string GenerateCode(IProgressReporter pGenerateProgress)
         {
             pGenerateProgress?.Progress(10);
 
@@ -30,11 +29,11 @@ public string GenerateCode(IVsGeneratorProgress pGenerateProgress)
                 Trace.WriteLine(command + " does not exist! Retrying with default NSwag.exe path");
                 command = PathProvider.GetNSwagPath();
                 if (!File.Exists(command))
-                    throw new NotInstalledException("NSwag not installed. Please install NSwagStudio");
+                    throw new InvalidOperationException("NSwag not installed. Please install NSwagStudio");
             }
 
             TryRemoveSwaggerJsonSpec(nswagStudioFile);
-            ProcessHelper.StartProcess(command, $"run \"{nswagStudioFile}\"");
+            processLauncher.Start(command, $"run \"{nswagStudioFile}\"");
             pGenerateProgress?.Progress(90);
             return null;
         }

diff --git a/...ors/OpenApi/OpenApiCSharpCodeGenerator.cs → ...ors/OpenApi/OpenApiCSharpCodeGenerator.cs b/...ors/OpenApi/OpenApiCSharpCodeGenerator.cs → ...ors/OpenApi/OpenApiCSharpCodeGenerator.cs
@@ -1,29 +1,28 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Extensions;
-using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Options.General;
-using Microsoft.VisualStudio.Shell.Interop;
+using ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Options.General;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators.OpenApi
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators.OpenApi
 {
     public class OpenApiCSharpCodeGenerator : ICodeGenerator
     {
         private readonly string defaultNamespace;
         private readonly JavaPathProvider javaPathProvider;
-        private readonly CustomPathOptions options;
+        private readonly IGeneralOptions options;
+        private readonly IProcessLauncher processLauncher;
         private readonly string swaggerFile;
 
-        public OpenApiCSharpCodeGenerator(string swaggerFile, string defaultNamespace, IGeneralOptions options)
+        public OpenApiCSharpCodeGenerator(string swaggerFile, string defaultNamespace, IGeneralOptions options, IProcessLauncher processLauncher)
         {
             this.swaggerFile = swaggerFile ?? throw new ArgumentNullException(nameof(swaggerFile));
             this.defaultNamespace = defaultNamespace ?? throw new ArgumentNullException(nameof(defaultNamespace));
-            this.options = new CustomPathOptions(options ?? throw new ArgumentNullException(nameof(options)));
-            javaPathProvider = new JavaPathProvider(options);
+            this.options = options ?? throw new ArgumentNullException(nameof(options));
+            this.processLauncher = processLauncher ?? throw new ArgumentNullException(nameof(processLauncher));
+            javaPathProvider = new JavaPathProvider(options, processLauncher);
         }
 
-        public string GenerateCode(IVsGeneratorProgress pGenerateProgress)
+        public string GenerateCode(IProgressReporter pGenerateProgress)
         {
             try
             {
@@ -54,7 +53,7 @@ public string GenerateCode(IVsGeneratorProgress pGenerateProgress)
                     $"-DpackageName={defaultNamespace} " +
                     "--skip-overwrite ";
 
-                ProcessHelper.StartProcess(javaPathProvider.GetJavaExePath(), arguments);
+                processLauncher.Start(javaPathProvider.GetJavaExePath(), arguments);
                 pGenerateProgress.Progress(80);
 
                 return CSharpFileMerger.MergeFilesAndDeleteSource(output);

diff --git a/...tCodeGen.VSIX/Generators/ProcessHelper.cs → ...odeGen.Core/Generators/ProcessLauncher.cs b/...tCodeGen.VSIX/Generators/ProcessHelper.cs → ...odeGen.Core/Generators/ProcessLauncher.cs
@@ -1,11 +1,16 @@
 using System;
 using System.Diagnostics;
 
-namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Generators
+namespace ChristianHelle.DeveloperTools.CodeGenerators.ApiClient.Core.Generators
 {
-    public static class ProcessHelper
+    public interface IProcessLauncher
     {
-        public static void StartProcess(string command, string arguments)
+        void Start(string command, string arguments);
+    }
+
+    public class ProcessLauncher : IProcessLauncher
+    {
+        public void Start(string command, string arguments)
         {
             Trace.WriteLine("Executing:");
             Trace.WriteLine($"{command} {arguments}");