Fixes

build/scripts/build.ps1

@@ -4,6 +4,7 @@ param (
     [switch]$build = $false, 
     [switch]$restore = $false,
     [switch]$test = $false,
+    [switch]$test64 = $false,
     [switch]$clean = $false,
     [switch]$clearPackageCache = $false,
     [string]$project = "",
@@ -17,7 +18,8 @@ function Print-Usage() {
     Write-Host "Build.ps1"
     Write-Host "`t-build                Run a build operation (default false)"
     Write-Host "`t-restore              Run a restore operation (default false)"
-    Write-Host "`t-test                 Run tests (default false)"
+    Write-Host "`t-test                 Run unit tests (default false)"
+    Write-Host "`t-test64               Run unit tests in 64 bit mode"
     Write-Host "`t-clean                Do a clean build / restore (default false)"
     Write-Host "`t-clearPackageCache    Clear package cache before restoring"
     Write-Host "`t-project <path>       Project the build or restore should target"
@@ -38,7 +40,11 @@ function Run-Build() {
 
 function Run-Test() {
     $proj = Join-Path $repoDir "BuildAndTest.proj"
-    Exec-Command $msbuild "/v:m /p:SkipCoreClr=true /t:Test $proj" | Out-Host
+    $args = "/v:m /p:SkipCoreClr=true /p:ManualTest=true /t:Test $proj"
+    if ($test64) { 
+        $args += " /p:Test64=true"
+    }
+    Exec-Command $msbuild $args | Out-Host
 }
 
 try {
@@ -68,7 +74,7 @@ try {
         Run-Build
     }
 
-    if ($test) { 
+    if ($test -or $test64) { 
         Run-Test
     }
 }

src/NuGet/NuGet.proj

@@ -5,19 +5,19 @@
 
   <Target Name="Build">
     <!-- NuGetPerBuildPreReleaseVersion -->
-    <Exec Command="$(OutDir)Exes\csi\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutDir) $(NuGetPerBuildPreReleaseVersion) $(OutDir)NuGet\PerBuildPreRelease" Condition="'$(NuGetPerBuildPreReleaseVersion)' != ''" />
+    <Exec Command="$(OutputPath)Exes\csi\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutputPath) $(NuGetPerBuildPreReleaseVersion) $(OutputPath)NuGet\PerBuildPreRelease" Condition="'$(NuGetPerBuildPreReleaseVersion)' != ''" />
 
     <!-- NuGetPreReleaseVersion -->
-    <Exec Command="$(OutDir)Exes\csi\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutDir) $(NuGetPreReleaseVersion) $(OutDir)NuGet\PreRelease" Condition="'$(NuGetPreReleaseVersion)' != ''" />
+    <Exec Command="$(OutputPath)Exes\csi\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutputPath) $(NuGetPreReleaseVersion) $(OutputPath)NuGet\PreRelease" Condition="'$(NuGetPreReleaseVersion)' != ''" />
 
     <!-- NuGetReleaseVersion -->
-    <Exec Command="$(OutDir)Exes\csi\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutDir) $(NuGetReleaseVersion) $(OutDir)NuGet\Release" Condition="'$(NuGetReleaseVersion)' != ''" />
+    <Exec Command="$(OutputPath)Exes\csi\csi.exe $(MSBuildThisFileDirectory)BuildNuGets.csx $(OutputPath) $(NuGetReleaseVersion) $(OutputPath)NuGet\Release" Condition="'$(NuGetReleaseVersion)' != ''" />
   </Target>
 
   <Target Name="Clean">
-    <RemoveDir Directories="$(OutDir)NuGet" />
+    <RemoveDir Directories="$(OutputPath)NuGet" />
   </Target>
 
   <Target Name="Rebuild" DependsOnTargets="Clean;Build">
   </Target>
-</Project>
\ No newline at end of file
+</Project>

src/Setup/DevDivPackages/Roslyn.proj

@@ -3,16 +3,16 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\build\Targets\Settings.props" />
   <PropertyGroup>
-    <InsertionFilesDir>$(OutDir)DevDivInsertionFiles</InsertionFilesDir>
+    <InsertionFilesDir>$(OutputPath)\DevDivInsertionFiles</InsertionFilesDir>
     <VsToolsetDir>$(InsertionFilesDir)\VS.Tools.Roslyn</VsToolsetDir>
-    <PackagesOutDir>$(OutDir)DevDivPackages\Roslyn</PackagesOutDir>
+    <PackagesOutDir>$(OutputPath)\DevDivPackages\Roslyn</PackagesOutDir>
   </PropertyGroup>
   <ItemGroup>
     <NuSpec Include="$(InsertionFilesDir)\VS.ExternalAPIs.Roslyn.nuspec">
       <Version>$(NuGetPerBuildPreReleaseVersion)</Version>
       <!-- TFS build number isn't set on CI server -->
       <Version Condition="'$(NuGetPerBuildPreReleaseVersion)' == ''">$(NuGetReleaseVersion)-cibuild</Version>
-      <BaseDir>$(OutDir)</BaseDir>
+      <BaseDir>$(OutputPath)</BaseDir>
     </NuSpec>
     <NuSpec Include="$(VsToolsetDir)\VS.Tools.Roslyn.nuspec">
       <Version>$(NuGetPerBuildPreReleaseVersion)</Version>
@@ -30,4 +30,4 @@
   <Target Name="Clean">
     <RemoveDir Directories="$(PackagesOutDir)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>

src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swixproj

@@ -6,7 +6,7 @@
   <PropertyGroup>
     <OutputArchitecture>neutral</OutputArchitecture>
     <OutputLocalized>false</OutputLocalized>
-    <OutputPath>$(OutDir)Insertion</OutputPath>
+    <OutputPath>$(OutputPath)Insertion</OutputPath>
     <IsPackage>true</IsPackage>
     <OutputType>vsix</OutputType>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildCoreVersion)\build\MicroBuild.Core.props" />
 
   <PropertyGroup>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);Version=$(VsixVersion);OutputPath=$(OutDir)</PackagePreprocessorDefinitions>
+    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);Version=$(VsixVersion);OutputPath=$(OutputPath)</PackagePreprocessorDefinitions>
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
 
@@ -23,4 +23,4 @@
   </ItemGroup>
 
   <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildCoreVersion)\build\MicroBuild.Core.targets" />
-</Project>
\ No newline at end of file
+</Project>

src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.vsmanproj

@@ -6,7 +6,7 @@
   <PropertyGroup>
     <FinalizeManifest>true</FinalizeManifest>
     <FinalizeSkipLayout>true</FinalizeSkipLayout>
-    <OutputPath>$(OutDir)Insertion\</OutputPath>
+    <OutputPath>$(OutputPath)Insertion\</OutputPath>
     <IsPackage>true</IsPackage>
     <FinalizeValidate>false</FinalizeValidate>
     <ValidateManifest>false</ValidateManifest>
@@ -29,4 +29,4 @@
   </ItemGroup>
 
   <Target Name="ValidateManifest" />
-</Project>
\ No newline at end of file
+</Project>

src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj

@@ -6,7 +6,7 @@
   <PropertyGroup>
     <FinalizeManifest>true</FinalizeManifest>
     <FinalizeSkipLayout>true</FinalizeSkipLayout>
-    <OutputPath>$(OutDir)Insertion</OutputPath>
+    <OutputPath>$(OutputPath)\Insertion</OutputPath>
     <IsPackage>true</IsPackage>
     <FinalizeValidate>false</FinalizeValidate>
     <ValidateManifest>false</ValidateManifest>
@@ -38,4 +38,4 @@
   </ItemGroup>
 
   <Target Name="ValidateManifest" />
-</Project>
\ No newline at end of file
+</Project>

src/Setup/DevDivVsix/PortableFacades/PortableFacades.swixproj

@@ -6,7 +6,7 @@
   <PropertyGroup>
     <OutputArchitecture>neutral</OutputArchitecture>
     <OutputLocalized>false</OutputLocalized>
-    <OutputPath>$(OutDir)Insertion</OutputPath>
+    <OutputPath>$(OutputPath)\Insertion</OutputPath>
     <IsPackage>true</IsPackage>
     <OutputType>vsix</OutputType>
   </PropertyGroup>
@@ -23,4 +23,4 @@
   </ItemGroup>
 
   <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildCoreVersion)\build\MicroBuild.Core.targets" />
-</Project>
\ No newline at end of file
+</Project>

src/Setup/DevDivVsix/PortableFacades/PortableFacades.vsmanproj

@@ -6,7 +6,7 @@
   <PropertyGroup>
     <FinalizeManifest>true</FinalizeManifest>
     <FinalizeSkipLayout>true</FinalizeSkipLayout>
-    <OutputPath>$(OutDir)Insertion\</OutputPath>
+    <OutputPath>$(OutputPath)\Insertion\</OutputPath>
     <IsPackage>true</IsPackage>
     <FinalizeValidate>false</FinalizeValidate>
     <ValidateManifest>false</ValidateManifest>
@@ -24,4 +24,4 @@
   </ItemGroup>
 
   <Target Name="ValidateManifest" />
-</Project>
\ No newline at end of file
+</Project>

src/Setup/SetupStep1.proj

@@ -25,7 +25,7 @@
          where building multiple projects that produce VSIXes larger than 10MB will race against each other -->
     <MSBuild Projects="@(Project)" Targets="Build" BuildInParallel="false" />
 
-    <Copy SourceFiles="@(PowerShellScriptsToCopy)" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="@(PowerShellScriptsToCopy)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true" />
     <Copy SourceFiles="@(PowerShellScriptsToCopy)" DestinationFolder="Templates\CSharp\Diagnostic\Analyzer" />
     <Copy SourceFiles="@(PowerShellScriptsToCopy)" DestinationFolder="Templates\VisualBasic\Diagnostic\Analyzer\tools" />
 
@@ -40,4 +40,4 @@
   <Target Name="Rebuild">
     <MSBuild Projects="@(Project)" Targets="Rebuild" BuildInParallel="false" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>

src/Setup/SetupStep2.proj

@@ -8,7 +8,7 @@
 
     <!-- Build CoreXT packages for insertion into DevDiv (order of the following actions matters) -->
     <MSBuild Projects="DevDivInsertionFiles\DevDivInsertionFiles.sln" />
-    <Exec Command="&quot;$(OutDir)\Exes\DevDivInsertionFiles\Roslyn.BuildDevDivInsertionFiles.exe&quot; &quot;$(OutDir)\&quot; &quot;$(MSBuildThisFileDirectory)\&quot; &quot;$(NuGetPackageRoot)&quot; $(AssemblyVersion)" LogStandardErrorAsError="true" />
+    <Exec Command="&quot;$(OutputPath)\Exes\DevDivInsertionFiles\Roslyn.BuildDevDivInsertionFiles.exe&quot; &quot;$(OutputPath)\&quot; &quot;$(MSBuildThisFileDirectory)\&quot; &quot;$(NuGetPackageRoot)&quot; $(AssemblyVersion)" LogStandardErrorAsError="true" />
     <MSBuild Projects="DevDivPackages\Roslyn.proj" />
     <MSBuild Projects="DevDivVsix\PortableFacades\PortableFacades.vsmanproj" />
     <MSBuild Projects="DevDivVsix\CompilersPackage\Microsoft.CodeAnalysis.Compilers.vsmanproj" />
@@ -23,4 +23,4 @@
     <!-- VSIX Gallery -->
     <MSBuild Projects="Vsix\Vsix.proj" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>