Moved git info to the Main executable, so it is updated on each build.

maforget · Jul 12, 2024 · 8a8a7b2 · 8a8a7b2
1 parent 704da79
commit 8a8a7b2
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -339,6 +339,6 @@ ASALocalRun/
 # BeatPulse healthcheck temp database
 healthchecksdb
 /Reference
-/cYo.Common/CurrentCommit.txt
-/cYo.Common/isDirty.txt
-/cYo.Common/Tags.txt
+*/CurrentCommit.txt
+*/isDirty.txt
+*/Tags.txt
diff --git a/ComicRack/ComicRack.csproj b/ComicRack/ComicRack.csproj
@@ -554,6 +554,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="ReaderForm.resx">
       <DependentUpon>ReaderForm.cs</DependentUpon>
@@ -611,6 +612,7 @@
     <Content Include="ComicRack.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <EmbeddedResource Include="CurrentCommit.txt" />
     <Content Include="Help\ComicRack Introduction.djvu">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -620,6 +622,7 @@
     <Content Include="Help\ComicRack Wiki.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <EmbeddedResource Include="isDirty.txt" />
     <Content Include="Languages\cs-CZ.zip">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -887,8 +890,10 @@ del /Q *.pdb
 : Exit</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
+    <PreBuildEvent>cd ..\..\
+git rev-parse HEAD &gt; "CurrentCommit.txt"
+git status --porcelain &gt; "isDirty.txt"
+exit 0</PreBuildEvent>
   </PropertyGroup>
   <Target Name="Clean">
     <RemoveDir Directories="$(TargetDir)\Resources\Icons" />

diff --git a/cYo.Common/Properties/Resources.Designer.cs b/cYo.Common/Properties/Resources.Designer.cs
diff --git a/cYo.Common/Properties/Resources.resx b/cYo.Common/Properties/Resources.resx
@@ -161,11 +161,4 @@
         AAAP//D//wAAAA//////AAAAAAAAAAAAAAA=
 </value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="CurrentCommit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\CurrentCommit.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
-  <data name="isDirty" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\isDirty.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
 </root>
diff --git a/cYo.Common/Runtime/GitVersion.cs b/cYo.Common/Runtime/GitVersion.cs
@@ -3,19 +3,44 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace cYo.Common.Runtime
 {
     public static class GitVersion
     {
         public static string GetCurrentVersionInfo()
         {
-            var isDirty = string.IsNullOrEmpty(Properties.Resources.isDirty?.Trim()) ? "" : "-dirty";
-            var currentCommit = string.IsNullOrEmpty(Properties.Resources.CurrentCommit) ? "" : $" [{Properties.Resources.CurrentCommit?[..7]}{isDirty}]";
+            Assembly assembly = Assembly.GetEntryAssembly();
+            var isDirty = string.IsNullOrEmpty(GetString("isDirty", assembly)?.Trim()) ? "" : "-dirty";
+            string currentCommit = GetString("CurrentCommit", assembly);
+            return string.IsNullOrEmpty(currentCommit) ? "" : $" [{currentCommit[..7]}{isDirty}]";
+        }
+
+        public static Stream GetStream(string resourceName, Assembly assembly)
+        {
+            string fullResourceName = assembly.GetManifestResourceNames().FirstOrDefault(x => x.Contains(resourceName));
+            return assembly.GetManifestResourceStream(fullResourceName); ;
+        }
+
+
+        public static string GetString(string resourceName, Assembly containingAssembly)
+        {
+            string result = String.Empty;
+            Stream sourceStream = GetStream(resourceName, containingAssembly);
+
+            if (sourceStream != null)
+            {
+                using (StreamReader streamReader = new StreamReader(sourceStream))
+                {
+                    result = streamReader.ReadToEnd();
+                }
+            }
 
-            return currentCommit;
+            return result;
         }
     }
 }
diff --git a/cYo.Common/cYo.Common.csproj b/cYo.Common/cYo.Common.csproj
@@ -353,8 +353,8 @@
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -372,9 +372,7 @@
   <!-- </ItemGroup> -->
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>cd ..\..\
-git rev-parse HEAD &gt; "CurrentCommit.txt"
-git status --porcelain &gt; "isDirty.txt"
-exit 0</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
 </Project>