Merge pull request #6443 from livarcocc/merge_release_200

Merge release/2.0.0 back into master

dir.props

@@ -9,6 +9,7 @@
     <CLIBuildDll>$(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll</CLIBuildDll>
 
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
 
     <CliTargetFramework>netcoreapp2.0</CliTargetFramework>
   </PropertyGroup>

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>
 

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>