From 03e37047a30d920798d9adce1e242f6b7aa97865 Mon Sep 17 00:00:00 2001
From: Livar Cunha <licavalc@microsoft.com>
Date: Fri, 13 Oct 2017 11:52:47 -0700
Subject: [PATCH] Fixing Windows build script.

---
 build/ComposeSdk.targets            |  5 +++--
 build/package/Installer.MSI.targets | 33 ++++++++---------------------
 run-build.ps1                       |  2 +-
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/build/ComposeSdk.targets b/build/ComposeSdk.targets
index 0f47564ea..dec1b16ee 100644
--- a/build/ComposeSdk.targets
+++ b/build/ComposeSdk.targets
@@ -40,8 +40,9 @@
   </Target>
 
   <Target Name="CrossgenPublishDir"
-          Condition=" '$(DISABLE_CROSSGEN)' == '' "
-          AfterTargets="PublishToolset">
+          Condition=" '$(DISABLE_CROSSGEN)' == '' ">
+<!-- Disabling crossgen until we have non-crossgened toolset -->          
+<!--          AfterTargets="PublishToolset"> -->
     <ItemGroup>
       <!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
       <SdkFiles Include="$(PublishDir)/**/*" Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*" />
diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets
index ea98d309a..dde5440d1 100644
--- a/build/package/Installer.MSI.targets
+++ b/build/package/Installer.MSI.targets
@@ -119,7 +119,9 @@
             Inputs="@(GenerateMSBuildExtensionsMsiInputs)"
             Outputs="$(MSBuildExtensionsInstallerFile)">
 
-      <Exec Command="powershell -NoProfile -NoLogo $(MSBuildExtensionsGenerateMsiPowershellScript)
+      <!-- Disabling this for now because we don't have the MSBuildExtensions available. -->
+
+      <!-- <Exec Command="powershell -NoProfile -NoLogo $(MSBuildExtensionsGenerateMsiPowershellScript)
                       '$(MSBuildExtensionsOutputDirectory)'
                       '$(MSBuildExtensionsInstallerFile)'
                       '$(WixRoot)'
@@ -128,7 +130,7 @@
                       '$(SimpleVersion)'
                       '$(NugetVersion)'
                       '$(MSBuildExtensionsInstallerUpgradeCode)'
-                      '$(Architecture)'" />
+                      '$(Architecture)'" /> -->
     </Target>
 
     <Target Name="GenerateSdkBundle"
@@ -180,35 +182,19 @@
                     $(SdkGenerateNupkgPowershellScript)"
             Outputs="$(SdkMSBuildExtensionsNupkgFile);$(SdkMSBuildExtensionsSwrFile)">
 
-      <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
+      <!-- Disabling this for now because we don't have the MSBuildExtensions available. -->
+
+      <!-- <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
                       '$(MSBuildExtensionsLayoutDirectory)'
                       '$(FullNugetVersion)'
                       '$(SdkMSBuildExtensionsNuspecFile)'
                       '$(SdkMSBuildExtensionsNupkgFile)'" />
       
       <GenerateMSBuildExtensionsSWR MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)"
-                                    OutputFile="$(SdkMSBuildExtensionsSwrFile)"/>
+                                    OutputFile="$(SdkMSBuildExtensionsSwrFile)"/> -->
       
     </Target>
 
-    <Target Name="TestSdkMsi"
-            Inputs="$(SdkInstallerFile)"
-            Outputs="$(SdkMsiTestedSentinel)"
-            DependsOnTargets="Init;MsiTargetsSetupInputOutputs;GenerateSdkMsi"
-            Condition=" '$(OS)' == 'Windows_NT'" >
-
-      <Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript)
-                      -InputMsi '$(SdkInstallerFile)'
-                      -DotnetDir '$(PreviousStageDirectory)'
-                      -TestDir '$(TestOutputDir)'" />
-
-      <WriteLinesToFile
-          File="$(SdkMsiTestedSentinel)"
-          Lines="$(SdkVersion)"
-          Overwrite="true"
-          Encoding="Unicode"/>
-    </Target>
-
     <Target Name="GenerateMsis"
           DependsOnTargets="Init;
                             Layout;
@@ -218,8 +204,7 @@
                             GenerateMSBuildExtensionsMsi;
                             GenerateSdkBundle;
                             GenerateSdkNupkg;
-                            GenerateSdkMSBuildExtensionsNupkg;
-                            TestSdkMsi"
+                            GenerateSdkMSBuildExtensionsNupkg"
           Condition=" '$(OS)' == 'Windows_NT'" />
 
     <!-- These targets are used in signing, don't remove them! -->
diff --git a/run-build.ps1 b/run-build.ps1
index f3eba115e..467d0274a 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -66,7 +66,7 @@ $env:VSTEST_BUILD_TRACE=1
 $env:VSTEST_TRACE_BUILD=1
 
 # install a stage0
-$dotnetInstallPath = Join-Path $RepoRoot "bin\dotnet-install.ps1"
+$dotnetInstallPath = Join-Path $env:DOTNET_INSTALL_DIR "dotnet-install.ps1"
 Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "$dotnetInstallPath"
 
 Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""