Implement public constructors that exist in parent so our providers can slip right into existing code that uses the old CodeDomProviders. (#134)

Author: StephenMolloy

src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/CSharpCodeProvider.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.CodeDom.Compiler;
+using System.Collections.Generic;
 using System.ComponentModel;
 
 namespace Microsoft.CodeDom.Providers.DotNetCompilerPlatform {
@@ -37,6 +38,13 @@ public CSharpCodeProvider(IProviderOptions providerOptions = null) {
             _providerOptions = providerOptions == null ? CompilationUtil.CSC2 : providerOptions;
         }
 
+        /// <summary>
+        /// Creates an instance using the given IDictionary to create IProviderOptions
+        /// </summary>
+        /// <param name="providerOptions"></param>
+        public CSharpCodeProvider(IDictionary<string, string> providerOptions)
+            : this(CompilationUtil.CreateProviderOptions(providerOptions, CompilationUtil.CSC2)) { }
+
         /// <summary>
         /// Gets an instance of the .NET Compiler Platform C# code compiler.
         /// </summary>

src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Util/CompilationUtil.cs

@@ -30,6 +30,56 @@ static CompilationUtil()
 
         public static IProviderOptions VBC2 { get; }
 
+        internal static IProviderOptions CreateProviderOptions(IDictionary<string, string> options, IProviderOptions baseOptions)
+        {
+            Dictionary<string, string> allOptions = null;
+
+            // Copy the base options
+            ProviderOptions providerOpts = new ProviderOptions(baseOptions);
+
+            // Update as necessary. Case-sensitive.
+            foreach (var option in options)
+            {
+                if (String.IsNullOrWhiteSpace(option.Key))
+                    continue;
+
+                switch (option.Key)
+                {
+                    case "CompilerFullPath":
+                        providerOpts.CompilerFullPath = option.Value;
+                        break;
+
+                    case "CompilerServerTimeToLive":
+                        if (Int32.TryParse(option.Value, out int newTTL))
+                            providerOpts.CompilerServerTimeToLive = newTTL;
+                        break;
+
+                    case "CompilerVersion":
+                        providerOpts.CompilerVersion = option.Value;
+                        break;
+
+                    case "WarnAsError":
+                        if (Boolean.TryParse(option.Value, out bool warnAsError))
+                            providerOpts.WarnAsError = warnAsError;
+                        break;
+
+                    case "AllOptions":
+                        allOptions = allOptions ?? new Dictionary<string, string>(providerOpts.AllOptions);
+                        allOptions.Remove(option.Key);
+                        allOptions.Add(option.Key, option.Value);
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+
+            if (allOptions != null)
+                providerOpts.AllOptions = allOptions;
+
+            return providerOpts;
+        }
+
         public static IProviderOptions GetProviderOptionsFor(string fileExt)
         {
             //
@@ -48,10 +98,15 @@ public static IProviderOptions GetProviderOptionsFor(string fileExt)
             if (String.IsNullOrEmpty(compilerFullPath))
                 compilerFullPath = CompilerDefaultPath();
 
-            if (fileExt.Equals(".cs", StringComparison.InvariantCultureIgnoreCase))
-                compilerFullPath = Path.Combine(compilerFullPath, "csc.exe");
-            else if (fileExt.Equals(".vb", StringComparison.InvariantCultureIgnoreCase))
-                compilerFullPath = Path.Combine(compilerFullPath, "vbc.exe");
+            if (!String.IsNullOrWhiteSpace(fileExt))
+            {
+                // If we have a file extension, try to infer the compiler to use
+                // TODO: Should we also check compilerFullPath to assert it is a Directory and not a file?
+                if (fileExt.Equals(".cs", StringComparison.InvariantCultureIgnoreCase) || fileExt.Equals("cs", StringComparison.InvariantCultureIgnoreCase))
+                    compilerFullPath = Path.Combine(compilerFullPath, "csc.exe");
+                else if (fileExt.Equals(".vb", StringComparison.InvariantCultureIgnoreCase) || fileExt.Equals("vb", StringComparison.InvariantCultureIgnoreCase))
+                    compilerFullPath = Path.Combine(compilerFullPath, "vbc.exe");
+            }
 
 
             //
@@ -61,7 +116,8 @@ public static IProviderOptions GetProviderOptionsFor(string fileExt)
             string ttlstr = Environment.GetEnvironmentVariable("VBCSCOMPILER_TTL");
             if (String.IsNullOrEmpty(ttlstr))
                 options.TryGetValue("CompilerServerTTL", out ttlstr);
-            if (!Int32.TryParse(ttlstr, out ttl)) {
+            if (!Int32.TryParse(ttlstr, out ttl))
+            {
                 ttl = DefaultCompilerServerTTL;
 
                 if (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("DEV_ENVIRONMENT")) ||
@@ -82,7 +138,8 @@ public static IProviderOptions GetProviderOptionsFor(string fileExt)
             // WarnAsError - default false.
             //
             bool warnAsError = false;
-            if (options.TryGetValue("WarnAsError", out string sWAE)) {
+            if (options.TryGetValue("WarnAsError", out string sWAE))
+            {
                 Boolean.TryParse(sWAE, out warnAsError); // Failure to parse sets to 'false'
             }
 
@@ -97,7 +154,8 @@ public static IProviderOptions GetProviderOptionsFor(string fileExt)
                     useAspNetSettings = true;
             }
 
-            ProviderOptions providerOptions = new ProviderOptions() {
+            ProviderOptions providerOptions = new ProviderOptions()
+            {
                 CompilerFullPath = compilerFullPath,
                 CompilerServerTimeToLive = ttl,
                 CompilerVersion = compilerVersion,

src/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/VBCodeProvider.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.CodeDom.Compiler;
+using System.Collections.Generic;
 using System.ComponentModel;
 
 namespace Microsoft.CodeDom.Providers.DotNetCompilerPlatform {
@@ -37,6 +38,13 @@ public VBCodeProvider(IProviderOptions providerOptions = null) {
             _providerOptions = providerOptions == null ? CompilationUtil.VBC2 : providerOptions;
         }
 
+        /// <summary>
+        /// Creates an instance using the given IDictionary to create IProviderOptions
+        /// </summary>
+        /// <param name="providerOptions"></param>
+        public VBCodeProvider(IDictionary<string, string> providerOptions)
+            : this(CompilationUtil.CreateProviderOptions(providerOptions, CompilationUtil.VBC2)) { }
+
         /// <summary>
         /// Gets an instance of the .NET Compiler Platform VB code compiler.
         /// </summary>