Only download Roslyn packages in Nuproj; Use compat switch for old tests.

Author: StephenMolloy

Clean.cmd

@@ -13,6 +13,10 @@ set logOptions=/v:n /flp:Summary;Verbosity=diag;LogFile=msbuild.log /flp1:warnin
 REM set logOptions=/v:diag /flp:Summary;Verbosity=diag;LogFile=msbuild.log /flp1:warningsonly;logfile=msbuild.wrn /flp2:errorsonly;logfile=msbuild.err
 
 %MSBUILDEXE% "%~dp0\RoslynCodeProvider.msbuild" /t:Clean %logOptions% /maxcpucount /nodeReuse:false %cfgOption%%*
+rd /q /s Roslyn45
+rd /q /s Roslyn46
+rd /q /s Roslyn472
+rd /q /s RoslynLatest
 del /F msbuild.log
 del /F msbuild.wrn
 del /F msbuild.err

RoslynCodeProviderTest/CSharpProviderTest.cs

@@ -1,7 +1,8 @@
-using Microsoft.CodeDom.Providers.DotNetCompilerPlatform;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
 using System.CodeDom.Compiler;
 using System.IO;
+using Microsoft.CodeDom.Providers.DotNetCompilerPlatform;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.CodeDom.Providers.DotNetCompilerPlatformTest {
 
@@ -17,6 +18,7 @@ public static void ClassInitialize(TestContext testContext) {
             string compilerPath = Path.Combine(frameworkFolder, "csc.exe");
             var codeDomProviderType = typeof(Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider);
             csharpCodeProvider = new CSharpCodeProvider(compilerSettings: CompilerSettingsHelper.CSC);
+            AppContext.SetSwitch("Switch.System.DisableTempFileCollectionDirectoryFeature", true);
         }
 
         [TestMethod]

RoslynCodeProviderTest/Microsoft.CodeDom.Providers.DotNetCompilerPlatformTest.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.CodeDom.Providers.DotNetCompilerPlatformTest</RootNamespace>
     <AssemblyName>Microsoft.CodeDom.Providers.DotNetCompilerPlatformTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
@@ -27,6 +27,7 @@
     <OutputPath>$(TestOutputPath)</OutputPath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

tools/RoslynCodeProvider.targets

@@ -29,7 +29,9 @@
         </PropertyGroup>
     </Target>
 
-    <Target Name="DownloadRoslynBinariesToToolsFolder">
+    <!-- We really only need to do this in the Packages project. It's superfluous and causing intermittent
+        build errors in all the other projects. -->
+    <Target Name="DownloadRoslynBinariesToToolsFolder" Condition="'$(MSBuildProjectExtension)' == '.nuproj'">
         <DownloadRoslynBinaries NupkgToolPath="$(NupkgToolPath)" LocalRoslyn45FolderName="$(LocalRoslyn45FolderName)" LocalRoslyn46FolderName="$(LocalRoslyn46FolderName)" LocalRoslyn472FolderName="$(LocalRoslyn472FolderName)" 
             ReferenceRoslyn45NupkgVersion="$(MSNetCompilers45NuGetPackageVersion)" ReferenceRoslyn46NupkgVersion="$(MSNetCompilers46NuGetPackageVersion)" ReferenceRoslyn472NupkgVersion="$(MSNetCompilers472NuGetPackageVersion)" />
     </Target>