From a360596174781a6e940faea358cb31e13428e58a Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Mon, 24 Apr 2017 15:42:52 -0700
Subject: [PATCH] Prime cache for Windows

cmd.exe window will popup during the install. Will create an issue and fix it separately.
CLISDKMsiSourcePath needs to be install at the last step so the dotnet.exe will be there and all the files are there.
---
 packaging/windows/clisdk/bundle.wxs |  6 +++---
 packaging/windows/clisdk/dotnet.wxs | 13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs
index dc0ebe2f2..e60a4bff6 100644
--- a/packaging/windows/clisdk/bundle.wxs
+++ b/packaging/windows/clisdk/bundle.wxs
@@ -26,9 +26,6 @@
     <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
 
     <Chain DisableSystemRestore="yes" ParallelCache="yes">
-      <MsiPackage SourceFile="$(var.CLISDKMsiSourcePath)">
-        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
-      </MsiPackage>
       <MsiPackage SourceFile="$(var.SharedFXMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>
@@ -38,6 +35,9 @@
       <MsiPackage SourceFile="$(var.SharedHostMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>
+       <MsiPackage SourceFile="$(var.CLISDKMsiSourcePath)">
+        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
+      </MsiPackage>
     </Chain>
   </Bundle>
 
diff --git a/packaging/windows/clisdk/dotnet.wxs b/packaging/windows/clisdk/dotnet.wxs
index 5b2aa1764..53dfbc94f 100644
--- a/packaging/windows/clisdk/dotnet.wxs
+++ b/packaging/windows/clisdk/dotnet.wxs
@@ -19,12 +19,21 @@
         <Property Id="ProductEdition" Value="$(var.ProductEdition)" />
         <Property Id="ProductCPU" Value="$(var.Platform)" />
         <Property Id="RTM_ProductVersion" Value="$(var.Dotnet_ProductVersion)" />
-
         <Property Id="MSIFASTINSTALL" Value="7" />
 
         <WixVariable Id="WixUILicenseRtf" Value="$(var.MicrosoftEula)" />
 
         <CustomActionRef Id="WixBroadcastEnvironmentChange" />
+
+        <CustomAction Id="RunDotnetNewToTriggerFirstTimeExperienceToPrimeCache"
+                ExeCommand="dotnet.exe new"
+                Directory="DOTNETHOME"
+                Execute="immediate"
+                Return="ignore"/>
+        <InstallExecuteSequence>
+            <Custom Action="RunDotnetNewToTriggerFirstTimeExperienceToPrimeCache"
+                After="InstallFinalize" />
+        </InstallExecuteSequence>
     </Product>
     <Fragment>
         <Directory Id="TARGETDIR" Name="SourceDir">
@@ -33,4 +42,4 @@
             </Directory>
         </Directory>
     </Fragment>
-</Wix>
+</Wix>
\ No newline at end of file