Merge pull request #480 from zooba/issue-410

#410 Finish porting build system

Build/Common.Build.CSharp.targets

@@ -59,19 +59,19 @@
   -->
 
   <PropertyGroup>
-    <BuildTasksProjectDir>$(BuildRoot)\Tools\BuildTasks</BuildTasksProjectDir>
+    <BuildTasksProjectDir>$(BuildRoot)\Common\Tools\BuildTasks\</BuildTasksProjectDir>
     <BuildTasksAssembly>$(BuildOutputRoot)\ToolBinaries\BuildTasks\Microsoft.VisualStudioTools.BuildTasks.dll</BuildTasksAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <BuildTasksSourceFiles Include="$(BuildTasksProjectDir)\*.csproj"/>
-    <BuildTasksSourceFiles Include="$(BuildTasksProjectDir)\**\*.cs"/>
+    <BuildTasksSourceFiles Include="$(BuildTasksProjectDir)*.csproj"/>
+    <BuildTasksSourceFiles Include="$(BuildTasksProjectDir)**\*.cs"/>
   </ItemGroup>
 
   <!-- Use Exec rather than MSBuild here to completely isolate the task build - otherwise it interferes with the main build.
        To avoid spawning a new msbuild.exe process again and again unnecessarily, do a quick up-to-date check (effectively
        duplicating the one done by .csproj) on the target. -->
   <Target Name="BuildBuildTasks" Inputs="@(BuildTasksSourceFiles)" Outputs="$(BuildTasksAssembly)">
-    <Exec Command='"$(MSBuildBinPath)\msbuild.exe" "$(BuildRoot)\Tools\BuildTasks\BuildTasks.csproj" /p:Configuration=$(Configuration) /p:VSTarget=$(VSTarget)'/> 
+    <Exec Command='"$(MSBuildBinPath)\msbuild.exe" "$(BuildTasksProjectDir)BuildTasks.csproj" /p:Configuration=$(Configuration) /p:VSTarget=$(VSTarget)'/> 
   </Target>
 
   <UsingTask AssemblyFile="$(BuildTasksAssembly)" TaskName="Microsoft.VisualStudioTools.BuildTasks.ExtractLambdasFromXaml"/>

Build/Common.Build.Wix.settings

@@ -11,9 +11,9 @@
 
   <PropertyGroup>
     <Language>WiX</Language>
-    <WixToolsVersion Condition="'$(WixToolsVersion)'==''">3.7</WixToolsVersion>
-    <WixToolPath Condition="'$(WixToolPath)'==''">$(BuildRoot)\Tools\Wix\$(WixToolsVersion)</WixToolPath>
-    <WixExtDir Condition="'$(WixExtDir)'==''">$(BuildRoot)\Tools\Wix\$(WixToolsVersion)</WixExtDir>
+    <WixToolsVersion Condition="'$(WixToolsVersion)'==''">3.9</WixToolsVersion>
+    <WixToolPath Condition="'$(WixToolPath)'==''">$(BuildRoot)\BuildOutput\Wix\$(WixToolsVersion)</WixToolPath>
+    <WixExtDir Condition="'$(WixExtDir)'==''">$(BuildRoot)\BuildOutput\Wix\$(WixToolsVersion)</WixExtDir>
     <WixTargetsPath>$(WixToolPath)\Wix.targets</WixTargetsPath>
     <WixTasksPath>$(WixToolPath)\WixTasks.dll</WixTasksPath>
     <LuxTargetsPath>$(WixToolPath)\Lux.targets</LuxTargetsPath>

Build/Common.Build.settings

@@ -21,7 +21,6 @@
     <!-- The default Platform value is specified in the imports below -->
 
     <RunFXCop Condition="'$(RunFXCop)' == ''">false</RunFXCop>
-    <RunStyleCop Condition="'$(RunStyleCop)' == ''">false</RunStyleCop>
 
     <CodeCoverageEnabled Condition="'$(CodeCoverageEnabled)'==''">true</CodeCoverageEnabled>
 
@@ -96,7 +95,6 @@
     <!-- Suppress warning about multiply defined AssemblyVersionInfo -->
     <NoWarn>436</NoWarn>
     <RunCodeAnalysis>$(RunFXCop)</RunCodeAnalysis>
-    <StyleCopEnabled>$(RunStyleCop)</StyleCopEnabled>
 
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
 

Build/GetWix.ps1

@@ -0,0 +1,23 @@
+<#
+.Synopsis
+    Downloads and extracts WiX if it is not currently available.
+
+#>
+$buildroot = (Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Definition))
+$target = "$buildroot\BuildOutput\Wix\3.9"
+if (Test-Path "$target\wix.targets") {
+    Write-Output "Wix Location: $target"
+    return
+}
+
+Write-Output "Downloading Wix to $target"
+
+$file = [IO.Path]::GetTempFileName()
+Write-Output "  - temporary storage: $file"
+
+Invoke-WebRequest "https://wix.codeplex.com/downloads/get/1421697" -UseBasicParsing -OutFile $file
+
+[Reflection.Assembly]::LoadWithPartialName('System.IO.Compression.FileSystem') | Out-Null
+[System.IO.Compression.ZipFile]::ExtractToDirectory($file, $target)
+
+del $file

Tools/bin/PowershellEnvironment.ps1 → PowershellEnvironment.ps1

@@ -61,8 +61,6 @@ if ( $TfsWorkspace -ne '' )
 }
 
 ""
-prereq.exe
-
 "Environment Ready"
 ""
 

Python/Setup/BuildRelease.ps1

@@ -295,6 +295,8 @@ if (-not (Get-Command msbuild -EA 0)) {
     Throw "Visual Studio build tools are required."
 }
 
+& "$buildroot\Build\GetWix.ps1"
+
 if (-not $outdir -and -not $release -and -not $internal) {
     if (-not $outdir) {
         Throw "Invalid output directory '$outdir'"