Revert "Deprecate old version identification method"

This reverts commit d7fddca
MirisWisdom · Jul 13, 2019 · e4ef151 · e4ef151
1 parent dcbfe92
commit e4ef151
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/src/AmaiSosu.GUI/AmaiSosu.GUI.csproj b/src/AmaiSosu.GUI/AmaiSosu.GUI.csproj
@@ -130,8 +130,14 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Messages.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Version.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>git describe --tags &gt; "$(ProjectDir)\Resources\Version.txt"</PreBuildEvent>
+  </PropertyGroup>
   <Import Project="..\packages\Fody.4.2.1\build\Fody.targets" Condition="Exists('..\packages\Fody.4.2.1\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

diff --git a/src/AmaiSosu.GUI/Main.cs b/src/AmaiSosu.GUI/Main.cs
@@ -52,7 +52,18 @@ public sealed class Main : INotifyPropertyChanged
         /// <summary>
         ///     Git version.
         /// </summary>
-        public string Version => "build-0000";
+        public string Version
+        {
+            get
+            {
+                using (var stream = Assembly.GetExecutingAssembly()
+                    .GetManifestResourceStream(FileNames.AmaiSosuVersion))
+                using (var reader = new StreamReader(stream ?? throw new FileNotFoundException()))
+                {
+                    return reader.ReadToEnd().Trim();
+                }
+            }
+        }
 
         /// <summary>
         ///     Installation path.

diff --git a/src/AmaiSosu/AmaiSosu.csproj b/src/AmaiSosu/AmaiSosu.csproj
@@ -74,6 +74,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>FileNames.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Version.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/src/AmaiSosu/Resources/Version.txt b/src/AmaiSosu/Resources/Version.txt
@@ -0,0 +1 @@
+v0.3.1-7-gd4cfe3a