Merge pull request #34 from Toumash/feature/gitinfo

adds build git commit info + tag
Toumash · Dec 3, 2019 · c0cfcfc · c0cfcfc
2 parents 544ed48 + 98deec1
commit c0cfcfc
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 0 deletions.
diff --git a/DailyStatus.Common/BuildInfo.cs b/DailyStatus.Common/BuildInfo.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DailyStatus.Common
+{
+    public static class DailyStatusBuildInfo
+    {
+        public static string ShortVersion => $"{ThisAssembly.Git.BaseTag}-{ThisAssembly.Git.Commit}";
+        public static string LongVersion => $"{ThisAssembly.Git.BaseTag}-{ThisAssembly.Git.Branch}-{ThisAssembly.Git.Commit}-{ThisAssembly.Git.Commits + (ThisAssembly.Git.IsDirty ? "-dirty" : "")}";
+    }
+}
diff --git a/DailyStatus.Common/DailyStatus.Common.csproj b/DailyStatus.Common/DailyStatus.Common.csproj
@@ -11,6 +11,8 @@
     <AssemblyName>DailyStatus.Common</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -81,6 +83,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BLL\WorkDaysCalculator.cs" />
+    <Compile Include="BuildInfo.cs" />
     <Compile Include="Configuration\AppConfig.cs" />
     <Compile Include="Configuration\DailyStatusConfiguration.cs" />
     <Compile Include="Extensions\DateTimeExtensions.cs" />
@@ -96,4 +99,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\GitInfo.2.0.21\build\GitInfo.targets" Condition="Exists('..\packages\GitInfo.2.0.21\build\GitInfo.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GitInfo.2.0.21\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitInfo.2.0.21\build\GitInfo.targets'))" />
+  </Target>
 </Project>
diff --git a/DailyStatus.Common/packages.config b/DailyStatus.Common/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CredentialManagement" version="1.0.2" targetFramework="net461" />
+  <package id="GitInfo" version="2.0.21" targetFramework="net461" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net461" />
   <package id="System.Net.Http" version="4.3.3" targetFramework="net461" />
   <package id="System.Reactive.Core" version="3.1.1" targetFramework="net461" />

diff --git a/DailyStatus.UI/App.config b/DailyStatus.UI/App.config
@@ -33,4 +33,6 @@
       </setting>
     </DailyStatus.UI.Properties.Settings>
   </userSettings>
+  <runtime>
+  </runtime>
 </configuration>
diff --git a/DailyStatus.UI/ViewModel/StatusViewModel.cs b/DailyStatus.UI/ViewModel/StatusViewModel.cs
@@ -399,6 +399,7 @@ public List<MenuItem> ContextMenu
                         SumSince = prompt.Date ?? new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1);
                     })
                 });
+                items.Add(new MenuItem() { Header = DailyStatusBuildInfo.ShortVersion, Command = new RelayCommand((_)=> { })});
                 items.Add(new MenuItem() { Header = "Minimize", Command = new RelayCommand((_) => WindowState = WindowState.Minimized) });
                 items.Add(new MenuItem() { Header = "Close", Command = CloseCommand });
                 return items;