From 929b368f2b3b1db5e3c585deff41c2c8845599a0 Mon Sep 17 00:00:00 2001
From: ezsh <ezsh.junk@gmail.com>
Date: Tue, 9 Jun 2020 22:43:08 +0200
Subject: [PATCH] Update MSBuild project to inject GitHash in App.Version

---
 devTools/FC.targets |  3 ++-
 fc-pregmod.proj     | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/devTools/FC.targets b/devTools/FC.targets
index 55d1d19f4bb..da1098baed0 100644
--- a/devTools/FC.targets
+++ b/devTools/FC.targets
@@ -25,6 +25,7 @@
 	</UsingTask>
 
 	<!-- https://stackoverflow.com/questions/7837644/how-to-replace-string-in-file-using-msbuild -->
+<!-- Unused
 	<UsingTask TaskName="ReplaceFileText" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
 	<ParameterGroup>
 		<InputFilename ParameterType="System.String" Required="true" />
@@ -46,7 +47,7 @@
 		</Code>
 	</Task>
 	</UsingTask>
-
+-->
 	<!-- https://stackoverflow.com/questions/3524317/regex-to-strip-line-comments-from-c-sharp/3524689#3524689 -->
 	<UsingTask TaskName="StripComments" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
 	<ParameterGroup>
diff --git a/fc-pregmod.proj b/fc-pregmod.proj
index c9b9ea7d66f..31ecdd3bb6c 100644
--- a/fc-pregmod.proj
+++ b/fc-pregmod.proj
@@ -50,24 +50,23 @@
 		<ConcatFiles Inputs="@(jsSCripts)" BaseDir="$(MSBuildProjectDirectory)" Output="$(OutputDirectory)\$(JSMoudleFileName)"/>
 	</Target>
 
-	<Target Name="AlphaDisclaimer" DependsOnTargets="CollectGitInfo" Condition=" '$(GitExeFound)'" >
-		<ReplaceFileText
-			InputFilename="$(MSBuildProjectDirectory)\src\gui\mainMenu\AlphaDisclaimer.tw"
-			OutputFilename="$(MSBuildProjectDirectory)\src\gui\mainMenu\AlphaDisclaimer.tw"
-			MatchExpression="(build: \$releaseID)"
-			ReplacementText="$1, git commit: $(GitHash)"
-		/>
+	<Target Name="InjectGitHash" DependsOnTargets="CollectGitInfo" Condition=" '$(GitExeFound)'" >
+		<WriteLinesToFile
+			File="src/002-config/fc-version.js.commitHash.js"
+			Lines="App.Version.commitHash = '$(GitHash)'%3B"
+			Overwrite="true"
+			Encoding="UTF-8"/>
 	</Target>
 
-	<Target Name="ResetAlphaDisclaimer" DependsOnTargets="FindGit" Condition=" '$(GitExeFound)'" >
-		<Exec Command="$(GitExe) checkout -- src/gui/mainMenu/AlphaDisclaimer.tw" />
+	<Target Name="RemoveGeneratedFiles" DependsOnTargets="FindGit" Condition=" '$(GitExeFound)'" >
+		<Delete Files="src/002-config/fc-version.js.commitHash.js"/>
 	</Target>
 
-	<Target Name="tmpOutput" DependsOnTargets="JSModule;AlphaDisclaimer">
+	<Target Name="tmpOutput" DependsOnTargets="JSModule;InjectGitHash">
 		<Exec Command="devTools\tweeGo\$(TweeGoExe) --module=$(OutputDirectory)\$(JSMoudleFileName) --head devTools\head.html -o $(OutputDirectory)\tmp.html src\" />
 	</Target>
 
-	<Target Name="FinalHTML" DependsOnTargets="tmpOutput;ResetAlphaDisclaimer">
+	<Target Name="FinalHTML" DependsOnTargets="tmpOutput;RemoveGeneratedFiles">
 		<Delete Files="$(OutputDirectory)\$(JSMoudleFileName)" />
 		<Move SourceFiles="$(OutputDirectory)\tmp.html" DestinationFiles="$(OutputDirectory)\FC_pregmod.html" />
 	</Target>
-- 
GitLab