Merge the history files before the feed is generated from History.md.

mbirtwistle · May 28, 2015 · adf540f · adf540f
1 parent 70321c5
commit adf540f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/tools/WixBuild.relproj.targets b/tools/WixBuild.relproj.targets
@@ -114,22 +114,47 @@
 
   </Target>
 
+  <!--
+  ================================================================================================
+  TransformHistoryEntries
+
+    Converts history files into entries in a project's History.md.
+
+  ================================================================================================
+  -->
+  <PropertyGroup>
+    <TransformHistoryEntriesDependsOn>
+    </TransformHistoryEntriesDependsOn>
+  </PropertyGroup>
+  <Target Name="TransformHistoryEntries"
+          DependsOnTargets="$(TransformHistoryEntriesDependsOn)">
+    <TransformHistoryEntries
+      ProjectFolder="$(ProjectFolder)"
+      HistoryFolderRelativePath="$(HistoryFolderRelativePath)"
+      HistoryFile="$(HistoryFile)"
+      SpecialHistoryFileName="$(SpecialHistoryFileName)" />
+  </Target>
+
   <!--
   ================================================================================================
   GenerateReleaseMetadata
 
-    Generates a .json class file from input files to be Releaseed.
+    Generates a .json class file from input files to be Released.
 
     [IN]
-    $(HistoryFile) - The history.txt file in the root.
-    @(ReleaseFiles) - The items to add to the metadata.
+    $(ProjectFolder) - The root project folder.
+    $(HistoryFolderRelativePath) - The relative path to the folder with the history files.
+    $(HistoryFile) - The history.md file in the root.
+    $(SpecialHistoryFileName) - The name of the history readme file.
+    @(ReleaseFile) - The items to add to the metadata.
 
     [OUT]
     @(ReleaseMetadata) - The generated .json and .md metadata file.
   ================================================================================================
   -->
   <PropertyGroup>
     <GenerateReleaseMetadataDependsOn>
+      TransformHistoryEntries
     </GenerateReleaseMetadataDependsOn>
     <ReleaseInfoFile>$(ReleaseMetadataFolder)v$(FullBuildVersionStringDashed).json</ReleaseInfoFile>
     <ReleaseHistoryFile>$(ReleaseMetadataFolder)v$(FullBuildVersionStringDashed).html.md</ReleaseHistoryFile>
@@ -212,25 +237,4 @@
       </ReleasedFiles>
     </ItemGroup>
   </Target>
-
-  <!--
-  ================================================================================================
-  TransformHistoryEntries
-
-    Converts history files into entries in a project's History.md.
-
-  ================================================================================================
-  -->
-  <PropertyGroup>
-    <TransformHistoryEntriesDependsOn>
-    </TransformHistoryEntriesDependsOn>
-  </PropertyGroup>
-  <Target Name="TransformHistoryEntries"
-          DependsOnTargets="$(TransformHistoryEntriesDependsOn)">
-    <TransformHistoryEntries
-      ProjectFolder="$(ProjectFolder)"
-      HistoryFolderRelativePath="$(ProjectHistoryFolderRelativePath)"
-      HistoryFile="$(ProjectHistoryFile)"
-      SpecialHistoryFileName="$(SpecialHistoryFileName)" />
-  </Target>
 </Project>
diff --git a/tools/release/WixBuildRelease.proj b/tools/release/WixBuildRelease.proj
@@ -59,7 +59,7 @@
   -->
   <Target Name="BuildProject">
     <MSBuild Projects="$(ProjectFolder)\tools\WixRelease.relproj"
-             Properties="OFFICIAL_WIX_BUILD=$(OfficialBuildPrivateKeyPair)"
+             Properties="OFFICIAL_WIX_BUILD=$(OfficialBuildPrivateKeyPair);ProjectFolder=$(ProjectFolder);HistoryFolderRelativePath=$(ProjectHistoryFolderRelativePath);HistoryFile=$(ProjectHistoryFile);SpecialHistoryFileName=$(SpecialHistoryFileName)"
              Targets="Build" />
   </Target>
 
@@ -92,10 +92,6 @@
           Condition=" $(SkipUpdateHistory)=='' "
           DependsOnTargets="GetVersionNumber">
 
-    <MSBuild Projects="$(ProjectFolder)\tools\WixRelease.relproj"
-             Properties="OFFICIAL_WIX_BUILD=$(OfficialBuildPrivateKeyPair);ProjectFolder=$(ProjectFolder);ProjectHistoryFolderRelativePath=$(ProjectHistoryFolderRelativePath);ProjectHistoryFile=$(ProjectHistoryFile);SpecialHistoryFileName=$(SpecialHistoryFileName)"
-             Targets="TransformHistoryEntries" />
-
     <Exec Command="cscript $(MSBuildThisFileDirectory)histver.js $(ProjectHistoryFile) $(Version) //nologo"
           WorkingDirectory="$(ProjectFolder)" />
   </Target>