Merge pull request #1667 from OmarTawfik/fix-manifest-hash-compute

Include Setup Manifests Before Computing Hashes
dotnet · Oct 27, 2016 · 8afd0e0 · 8afd0e0
2 parents 8b3540e + ddc855d
commit 8afd0e0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/setup/Swix/Microsoft.FSharp.vsmanproj b/setup/Swix/Microsoft.FSharp.vsmanproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" InitialTargets="IncludeFSharpManifests" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <Import Project="..\FSharp.Setup.props" />
 
@@ -13,7 +13,7 @@
 
     <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
 
-    <Target Name="IncludeManifests" BeforeTargets="MergeManifests">
+    <Target Name="IncludeFSharpManifests">
         <ItemGroup>
             <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.Core.json" />
             <MergeManifest Include="$(OutputPath)\Microsoft.FSharp.SDK.Resources.%(SetupLanguages.LocaleCode).json" />