diff --git a/AutoTx/ATXProject.csproj b/AutoTx/ATXProject.csproj index 3e86040498a9b73d6942142bc5bc28a208f58f01..5af4a78b04a2e94d08992eeadbb71ef252a9b135 100644 --- a/AutoTx/ATXProject.csproj +++ b/AutoTx/ATXProject.csproj @@ -147,10 +147,12 @@ <ItemGroup> <None Include="Resources\BuildDate.txt" /> </ItemGroup> + <ItemGroup> + <None Include="Resources\BuildCommit.txt" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <PropertyGroup> - <PreBuildEvent>PowerShell -Command "Get-Date -Format 'yyyy-MM-dd HH:mm:ss' > $(ProjectDir)\Resources\BuildDate.txt ; Get-Content $(ProjectDir)\Resources\BuildDate.txt" -</PreBuildEvent> + <PreBuildEvent>PowerShell -Command "$BCommit = '$(ProjectDir)\Resources\BuildCommit.txt' ; $BDate = '$(ProjectDir)\Resources\BuildDate.txt' ; if (-Not (Test-Path $BCommit)) { Write-Output 'UNKNOWN' > $BCommit } ; Get-Date -Format 'yyyy-MM-dd HH:mm:ss' > $BDate ; Get-Content $BDate"</PreBuildEvent> </PropertyGroup> <PropertyGroup> <PostBuildEvent>PowerShell -Command "Write-Host $(ConfigurationName)" > $(ProjectDir)\Resources\BuildConfiguration.txt diff --git a/AutoTx/AutoTx.cs b/AutoTx/AutoTx.cs index 3c336262f21ac52ace2f17f3e9533fca087a34e1..bafec3d2cf692ab8bd031f07ead19769caaf5196 100644 --- a/AutoTx/AutoTx.cs +++ b/AutoTx/AutoTx.cs @@ -251,8 +251,11 @@ namespace AutoTx // read the build timestamp from the resources: var buildTimestamp = Properties.Resources.BuildDate.Trim(); + var buildCommitName = Properties.Resources.BuildCommit.Trim(); writeLog("-----------------------"); - writeLog(ServiceName + " service started <build " + buildTimestamp + ">"); + writeLog(ServiceName + " service started."); + writeLog("build: [" + buildTimestamp + "]"); + writeLog("commit: [" + buildCommitName + "]"); writeLog("-----------------------"); } diff --git a/AutoTx/Properties/Resources.Designer.cs b/AutoTx/Properties/Resources.Designer.cs index e18a2f6c508c88dc21c041f7abb3d3531c6757dd..adfac6303cf66b8ae068e5d619626e426a7e1395 100644 --- a/AutoTx/Properties/Resources.Designer.cs +++ b/AutoTx/Properties/Resources.Designer.cs @@ -61,7 +61,17 @@ namespace AutoTx.Properties { } /// <summary> - /// Looks up a localized string similar to 2017-08-28 18:49:13 + /// Looks up a localized string similar to autotransfer-v1-134-g04a73b1 + ///. + /// </summary> + internal static string BuildCommit { + get { + return ResourceManager.GetString("BuildCommit", resourceCulture); + } + } + + /// <summary> + /// Looks up a localized string similar to 2017-12-21 10:42:03 ///. /// </summary> internal static string BuildDate { diff --git a/AutoTx/Properties/Resources.resx b/AutoTx/Properties/Resources.resx index 32307e87f33ee323f619cd0b08cc53fabdcdc9ca..0cf010f92b4834cfd281dd28fcb065bda0126202 100644 --- a/AutoTx/Properties/Resources.resx +++ b/AutoTx/Properties/Resources.resx @@ -118,6 +118,9 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="BuildCommit" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\BuildCommit.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> + </data> <data name="BuildDate" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value> </data> diff --git a/AutoTx/Resources/.gitignore b/AutoTx/Resources/.gitignore index 8b0d5a6fe3aeee777e36cce66cfe514cb9741bec..06696d3d12240c7657519d4c0b6895d033dbf687 100644 --- a/AutoTx/Resources/.gitignore +++ b/AutoTx/Resources/.gitignore @@ -1,2 +1,3 @@ BuildDate.txt BuildConfiguration.txt +BuildCommit.txt \ No newline at end of file diff --git a/Scripts/git-hooks/post-commit b/Scripts/git-hooks/post-commit new file mode 100644 index 0000000000000000000000000000000000000000..0fb08a97906f2268c10446463323dc82321268a7 --- /dev/null +++ b/Scripts/git-hooks/post-commit @@ -0,0 +1,6 @@ +#!/bin/sh +# +# A hook script to generate a file containing the output of "git describe" for +# being used further down the build+packaging pipeline. + +git describe --tags > AutoTx/Resources/BuildCommit.txt \ No newline at end of file