Treat non-web apps as first class, not requiring appSettings hack. (#131)

Author: StephenMolloy

RoslynCodeProviderTest/ProviderOptionsTests.cs

@@ -34,7 +34,7 @@ public void DefaultSettings()
         {
             IProviderOptions opts = CompilationUtil.GetProviderOptionsFor(".fakevb");
             Assert.IsNotNull(opts);
-            Assert.AreEqual<string>(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"bin\roslyn"), opts.CompilerFullPath);   // Would include csc.exe or vbc.exe if the extension we searched for wasn't fake.
+            Assert.AreEqual<string>(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"roslyn"), opts.CompilerFullPath);   // Would include csc.exe or vbc.exe if the extension we searched for wasn't fake.
             Assert.AreEqual<int>(IsDev ? 15 * 60 : 10, opts.CompilerServerTimeToLive);   // 10 in Production. 900 in a "dev" environment.
             Assert.IsTrue(opts.UseAspNetSettings);  // Default is false... except through the GetProviderOptionsFor factory method we used here.
             Assert.IsFalse(opts.WarnAsError);
@@ -143,7 +143,7 @@ public void TTL_MustBeInteger()
             Environment.SetEnvironmentVariable("VBCSCOMPILER_TTL", null);
 
             Assert.IsNotNull(opts);
-            Assert.AreEqual<string>(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"bin\roslyn"), opts.CompilerFullPath);   // Would include csc.exe or vbc.exe if the extension we searched for wasn't fake.
+            Assert.AreEqual<string>(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"roslyn"), opts.CompilerFullPath);   // Would include csc.exe or vbc.exe if the extension we searched for wasn't fake.
             Assert.AreEqual<int>(IsDev ? 15 * 60 : 10, opts.CompilerServerTimeToLive);   // 10 in Production. 900 in a "dev" environment.
             Assert.IsTrue(opts.UseAspNetSettings);  // Default is false... except through the GetProviderOptionsFor factory method we used here.
             Assert.IsFalse(opts.WarnAsError);

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

@@ -46,7 +46,7 @@ public static IProviderOptions GetProviderOptionsFor(string fileExt)
             if (String.IsNullOrEmpty(compilerFullPath))
                 options.TryGetValue("CompilerLocation", out compilerFullPath);
             if (String.IsNullOrEmpty(compilerFullPath))
-                compilerFullPath = CompilerFullPath(@"bin\roslyn");
+                compilerFullPath = CompilerDefaultPath();
 
             if (fileExt.Equals(".cs", StringComparison.InvariantCultureIgnoreCase))
                 compilerFullPath = Path.Combine(compilerFullPath, "csc.exe");
@@ -143,9 +143,18 @@ internal static void PrependCompilerOption(CompilerParameters compilParams, stri
             }
         }
 
-        internal static string CompilerFullPath(string relativePath)
+        internal static string CompilerDefaultPath()
         {
-            string compilerFullPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, relativePath);
+            string webPath = @"bin\roslyn";
+            string appPath = @"roslyn";
+
+            // Check bin folder first
+            string compilerFullPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, webPath);
+
+            // Then appdomain base
+            if (!File.Exists(compilerFullPath))
+                compilerFullPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, appPath);
+
             return compilerFullPath;
         }
 

src/Packages/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/build/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets

@@ -29,10 +29,10 @@
     <!-- But when OutDir is specified given and is different from the above, copy to OutDir as well -->
     <ItemGroup Condition="'$(WebProjectOutputDir)' != ''">
       <RoslynToolsDestinations Include="$(WebProjectOutputDir)\bin\roslyn" />
-      <RoslynToolsDestinations Condition="'$(RoslynCopyToOutDir)' == 'true' AND '$(OutDir)' != '$(WebProjectOutputDir)'" Include="$(OutDir)\bin\roslyn" />
+      <RoslynToolsDestinations Condition="'$(RoslynCopyToOutDir)' == 'true' AND '$(OutDir)' != '$(WebProjectOutputDir)'" Include="$(OutDir)\roslyn" />
     </ItemGroup>
     <ItemGroup Condition="'$(WebProjectOutputDir)' == ''">
-      <RoslynToolsDestinations Include="$(OutputPath)\bin\roslyn" />
+      <RoslynToolsDestinations Include="$(OutputPath)\roslyn" />
       <RoslynToolsDestinations Condition="'$(RoslynCopyToOutDir)' == 'true' AND '$(OutDir)' != '$(OutputPath)'" Include="$(OutDir)\roslyn" />
     </ItemGroup>
   </Target>