Skip to content
Snippets Groups Projects
Commit 1ee6ae47 authored by Niko Ehrenfeuchter's avatar Niko Ehrenfeuchter :keyboard:
Browse files

Include commit reference into startup message.

This is done using a git-hook script generating a text file which is
used as a resource by VS. The pre-build script in VS makes sure the file
is actually existing (using a default string) since otherwise the build
would fail.
parent 04a73b10
No related branches found
No related tags found
No related merge requests found
...@@ -147,10 +147,12 @@ ...@@ -147,10 +147,12 @@
<ItemGroup> <ItemGroup>
<None Include="Resources\BuildDate.txt" /> <None Include="Resources\BuildDate.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Resources\BuildCommit.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PreBuildEvent>PowerShell -Command "Get-Date -Format 'yyyy-MM-dd HH:mm:ss' &gt; $(ProjectDir)\Resources\BuildDate.txt ; Get-Content $(ProjectDir)\Resources\BuildDate.txt" <PreBuildEvent>PowerShell -Command "$BCommit = '$(ProjectDir)\Resources\BuildCommit.txt' ; $BDate = '$(ProjectDir)\Resources\BuildDate.txt' ; if (-Not (Test-Path $BCommit)) { Write-Output 'UNKNOWN' &gt; $BCommit } ; Get-Date -Format 'yyyy-MM-dd HH:mm:ss' &gt; $BDate ; Get-Content $BDate"</PreBuildEvent>
</PreBuildEvent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>PowerShell -Command "Write-Host $(ConfigurationName)" &gt; $(ProjectDir)\Resources\BuildConfiguration.txt <PostBuildEvent>PowerShell -Command "Write-Host $(ConfigurationName)" &gt; $(ProjectDir)\Resources\BuildConfiguration.txt
... ...
......
...@@ -251,8 +251,11 @@ namespace AutoTx ...@@ -251,8 +251,11 @@ namespace AutoTx
// read the build timestamp from the resources: // read the build timestamp from the resources:
var buildTimestamp = Properties.Resources.BuildDate.Trim(); var buildTimestamp = Properties.Resources.BuildDate.Trim();
var buildCommitName = Properties.Resources.BuildCommit.Trim();
writeLog("-----------------------"); writeLog("-----------------------");
writeLog(ServiceName + " service started <build " + buildTimestamp + ">"); writeLog(ServiceName + " service started.");
writeLog("build: [" + buildTimestamp + "]");
writeLog("commit: [" + buildCommitName + "]");
writeLog("-----------------------"); writeLog("-----------------------");
} }
... ...
......
...@@ -61,7 +61,17 @@ namespace AutoTx.Properties { ...@@ -61,7 +61,17 @@ namespace AutoTx.Properties {
} }
/// <summary> /// <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> /// </summary>
internal static string BuildDate { internal static string BuildDate {
... ...
......
...@@ -118,6 +118,9 @@ ...@@ -118,6 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <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"> <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> <value>..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data> </data>
... ...
......
BuildDate.txt BuildDate.txt
BuildConfiguration.txt BuildConfiguration.txt
BuildCommit.txt
\ No newline at end of file
#!/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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment