Merge pull request #5609 from piotrpMSFT/piotrpmsft/infra/msiincremen…

…taltiy Add incrementality check for MSI generation
dotnet · Feb 7, 2017 · d881d45 · d881d45
2 parents 5612b8b + 0a634d5
commit d881d45
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets b/build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
@@ -26,6 +26,12 @@
         <SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(NugetVersion).nupkg</SdkInstallerNupkgFile>
       </PropertyGroup>
 
+      <!-- Generate SDK MSI Inputs -->
+      <ItemGroup>
+        <GenerateSdkMsiInputs Include="$(SdkLayoutOutputDirectory)/**/*;
+                                       $(SdkGenerateMsiPowershellScript)" />
+      </ItemGroup>
+
       <!-- Consumed By Publish -->
       <ItemGroup>
         <GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
@@ -74,7 +80,9 @@
 
     <Target Name="GenerateSdkMsi"
             DependsOnTargets="Init;Layout;AcquireWix;MsiTargetsSetupInputOutputs"
-            Condition=" '$(OS)' == 'Windows_NT'">
+            Condition=" '$(OS)' == 'Windows_NT'"
+            Inputs="@(GenerateSdkMsiInputs)"
+            Outputs="$(SdkInstallerFile)">
 
       <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateMsiPowershellScript)
                       '$(SdkLayoutOutputDirectory)'