From f1d8ca30459ea452a5b840432a687a6bf76d401e Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Tue, 20 Mar 2018 09:20:37 -0700
Subject: [PATCH] Add CommitHash to file info (#700)

---
 build/native.targets                      | 25 +++++++++++++++++++++++
 build/repo.targets                        |  4 ++--
 src/AspNetCore/AspNetCore.vcxproj         | 19 +----------------
 src/AspNetCore/aspnetcoremodule.rc        |  4 +++-
 src/RequestHandler/RequestHandler.vcxproj | 19 +----------------
 src/RequestHandler/requesthandler.rc      |  4 +++-
 6 files changed, 35 insertions(+), 40 deletions(-)
 create mode 100644 build/native.targets

diff --git a/build/native.targets b/build/native.targets
new file mode 100644
index 0000000000..1c5a981691
--- /dev/null
+++ b/build/native.targets
@@ -0,0 +1,25 @@
+<Project>
+
+  <Target Name="CreateVersionHeader" BeforeTargets="PrepareForBuild">
+    <ItemGroup>
+      <VersionHeaderContents Include="// Copyright (c) .NET Foundation. All rights reserved." />
+      <VersionHeaderContents Include="// Licensed under the MIT License. See LICENSE.txt in the project root for license information." />
+      <VersionHeaderContents Include="%0a" />
+      <VersionHeaderContents Include="// This file is auto-generated" />
+      <VersionHeaderContents Include="%0a" />
+      <VersionHeaderContents Include="#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AssemblyBuild),$(AspNetCoreModuleVersionRevision)" />
+      <VersionHeaderContents Include="#define FileVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AssemblyBuild).$(AspNetCoreModuleVersionRevision)\0&quot;" />
+      <VersionHeaderContents Include="#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AssemblyBuild),$(AspNetCoreModuleVersionRevision)" />
+      <VersionHeaderContents Include="#define ProductVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AssemblyBuild).$(AspNetCoreModuleVersionRevision)\0&quot;" />
+      <VersionHeaderContents Include="#define PlatformToolset &quot;$(PlatformToolset)\0&quot;" />
+      <VersionHeaderContents Include="#define CommitHash &quot;$(CommitHash)\0&quot;" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <FileWrites Include="version.h" />
+    </ItemGroup>
+
+    <WriteLinesToFile File="version.h" Lines="@(VersionHeaderContents)" OverWrite="true" WriteOnlyWhenDifferent="True" />
+  </Target>
+
+</Project>
diff --git a/build/repo.targets b/build/repo.targets
index 3c932491ad..161887405e 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -7,9 +7,9 @@
     <NuGetVerifierRuleFile Condition="'$(OS)' != 'Windows_NT'">$(RepositoryRoot)NuGetPackageVerifier.xplat.json</NuGetVerifierRuleFile>
   </PropertyGroup>
 
-  <Target Name="BuildNativeAssets" DependsOnTargets="GetToolsets" >
+  <Target Name="BuildNativeAssets" DependsOnTargets="Prepare;GetToolsets" >
     <PropertyGroup>
-      <BuildArgs>-p:Configuration=$(Configuration) -v:m -nologo -clp:NoSummary</BuildArgs>
+      <BuildArgs>-p:Configuration=$(Configuration) -v:m -nologo -clp:NoSummary -p:CommitHash=$(CommitHash)</BuildArgs>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/AspNetCore/AspNetCore.vcxproj b/src/AspNetCore/AspNetCore.vcxproj
index 675ae4cb87..4eee0392c1 100644
--- a/src/AspNetCore/AspNetCore.vcxproj
+++ b/src/AspNetCore/AspNetCore.vcxproj
@@ -227,24 +227,6 @@
     <ClCompile Include="src\globalmodule.cpp" />
     <ClCompile Include="Src\proxymodule.cxx" />
   </ItemGroup>
-  <Target Name="CreateVersionHeader" BeforeTargets="PrepareForBuild">
-    <ItemGroup>
-      <VersionHeaderContents Include="// Copyright (c) .NET Foundation. All rights reserved." />
-      <VersionHeaderContents Include="// Licensed under the MIT License. See LICENSE.txt in the project root for license information." />
-      <VersionHeaderContents Include="%0a" />
-      <VersionHeaderContents Include="// This file is auto-generated" />
-      <VersionHeaderContents Include="%0a" />
-      <VersionHeaderContents Include="#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AssemblyBuild),$(AspNetCoreModuleVersionRevision)" />
-      <VersionHeaderContents Include="#define FileVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AssemblyBuild).$(AspNetCoreModuleVersionRevision)\0&quot;" />
-      <VersionHeaderContents Include="#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AssemblyBuild),$(AspNetCoreModuleVersionRevision)" />
-      <VersionHeaderContents Include="#define ProductVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AssemblyBuild).$(AspNetCoreModuleVersionRevision)\0&quot;" />
-      <VersionHeaderContents Include="#define PlatformToolset &quot;$(PlatformToolset)\0&quot;" />
-    </ItemGroup>
-    <WriteLinesToFile File="version.h" Lines="@(VersionHeaderContents)" OverWrite="true" WriteOnlyWhenDifferent="True" />
-  </Target>
-  <ItemGroup>
-    <FileWrites Include="version.h" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CommonLib\CommonLib.vcxproj">
       <Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project>
@@ -272,6 +254,7 @@
   <ItemGroup>
     <Xml Include="aspnetcore_schema.xml" />
   </ItemGroup>
+  <Import Project="..\..\build\native.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/AspNetCore/aspnetcoremodule.rc b/src/AspNetCore/aspnetcoremodule.rc
index a35cbf0475..657dfe3712 100644
--- a/src/AspNetCore/aspnetcoremodule.rc
+++ b/src/AspNetCore/aspnetcoremodule.rc
@@ -10,6 +10,8 @@
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
+#define FileDescription "IIS AspNetCore Module. Commit: " CommitHash
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // 11
@@ -75,7 +77,7 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "Microsoft Corporation"
-            VALUE "FileDescription", "IIS AspNetCore Module"
+            VALUE "FileDescription", FileDescription
             VALUE "FileVersion", FileVersionStr
             VALUE "InternalName", "aspnetcore"
             VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation"
diff --git a/src/RequestHandler/RequestHandler.vcxproj b/src/RequestHandler/RequestHandler.vcxproj
index a94bfb248d..fd198ba5b3 100644
--- a/src/RequestHandler/RequestHandler.vcxproj
+++ b/src/RequestHandler/RequestHandler.vcxproj
@@ -238,24 +238,6 @@
     <ClCompile Include="outofprocess\websockethandler.cxx" />
     <ClCompile Include="outofprocess\winhttphelper.cxx" />
   </ItemGroup>
-  <Target Name="CreateVersionHeader" BeforeTargets="PrepareForBuild">
-    <ItemGroup>
-      <VersionHeaderContents Include="// Copyright (c) .NET Foundation. All rights reserved." />
-      <VersionHeaderContents Include="// Licensed under the MIT License. See LICENSE.txt in the project root for license information." />
-      <VersionHeaderContents Include="%0a" />
-      <VersionHeaderContents Include="// This file is auto-generated" />
-      <VersionHeaderContents Include="%0a" />
-      <VersionHeaderContents Include="#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AssemblyBuild),$(AspNetCoreModuleVersionRevision)" />
-      <VersionHeaderContents Include="#define FileVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AssemblyBuild).$(AspNetCoreModuleVersionRevision)\0&quot;" />
-      <VersionHeaderContents Include="#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AssemblyBuild),$(AspNetCoreModuleVersionRevision)" />
-      <VersionHeaderContents Include="#define ProductVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AssemblyBuild).$(AspNetCoreModuleVersionRevision)\0&quot;" />
-      <VersionHeaderContents Include="#define PlatformToolset &quot;$(PlatformToolset)\0&quot;" />
-    </ItemGroup>
-    <WriteLinesToFile File="version.h" Lines="@(VersionHeaderContents)" OverWrite="true" WriteOnlyWhenDifferent="True" />
-  </Target>
-  <ItemGroup>
-    <FileWrites Include="version.h" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CommonLib\CommonLib.vcxproj">
       <Project>{55494e58-e061-4c4c-a0a8-837008e72f85}</Project>
@@ -270,6 +252,7 @@
   <ItemGroup>
     <None Include="Source.def" />
   </ItemGroup>
+  <Import Project="..\..\build\native.targets" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/RequestHandler/requesthandler.rc b/src/RequestHandler/requesthandler.rc
index 1451904d47..2cc99c2331 100644
--- a/src/RequestHandler/requesthandler.rc
+++ b/src/RequestHandler/requesthandler.rc
@@ -9,6 +9,8 @@
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
+#define FileDescription "IIS ASP.NET Core Module Request Handler. Commit: " CommitHash
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // 11
@@ -74,7 +76,7 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "Microsoft"
-            VALUE "FileDescription", "IIS ASP.NET Core Module Request Handler"
+            VALUE "FileDescription", FileDescription
             VALUE "FileVersion", FileVersionStr
             VALUE "InternalName", "aspnetcorerh.dll"
             VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation"