From 44625583b930d2eb3a5272cc33b01d7faaf4435b Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 20 Oct 2018 18:47:36 -0700
Subject: [PATCH] Unify the version information

---
 mish/Product.wxs            |  2 +-
 miss/miss.rc                |  4 ++--
 miss/miss.vcxproj           |  2 +-
 miss/miss.vcxproj.filters   |  2 +-
 mist/mist.rc                | 21 +++++++++++++++++++++
 mist/mist.vcxproj           |  6 ++++++
 mist/mist.vcxproj.filters   |  5 +++++
 miss/version.h => version.h |  1 -
 8 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 mist/mist.rc
 rename miss/version.h => version.h (70%)

diff --git a/mish/Product.wxs b/mish/Product.wxs
index 58fde21..d285eb1 100644
--- a/mish/Product.wxs
+++ b/mish/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension">
-  <Product Id="*" Name="Moonlight Internet Streaming Helper" Language="1033" Version="1.0.0.0" Manufacturer="Cameron Gutman" UpgradeCode="cfc2fb53-88e2-4867-851d-9ed9fe7ab2a3">
+  <Product Id="*" Name="Moonlight Internet Streaming Helper" Language="1033" Version="!(bind.fileVersion.MistExe)" Manufacturer="Cameron Gutman" UpgradeCode="cfc2fb53-88e2-4867-851d-9ed9fe7ab2a3">
     <Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
diff --git a/miss/miss.rc b/miss/miss.rc
index c8341b9..10e3406 100644
--- a/miss/miss.rc
+++ b/miss/miss.rc
@@ -1,5 +1,5 @@
 #include <windows.h>
-#include "version.h"
+#include "../version.h"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
@@ -9,7 +9,7 @@ BEGIN
         BLOCK "040904E4"
         BEGIN
             VALUE "CompanyName",        VER_COMPANYNAME_STR
-            VALUE "FileDescription",    VER_FILEDESCRIPTION_STR
+            VALUE "FileDescription",    "Moonlight Internet Streaming Service"
             VALUE "FileVersion",        VER_FILEVERSION_STR
         END
     END
diff --git a/miss/miss.vcxproj b/miss/miss.vcxproj
index e93ad00..0bbc313 100644
--- a/miss/miss.vcxproj
+++ b/miss/miss.vcxproj
@@ -167,7 +167,7 @@
     <ResourceCompile Include="miss.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="version.h" />
+    <ClInclude Include="..\version.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/miss/miss.vcxproj.filters b/miss/miss.vcxproj.filters
index 3bfb84f..b9080b1 100644
--- a/miss/miss.vcxproj.filters
+++ b/miss/miss.vcxproj.filters
@@ -25,7 +25,7 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="version.h">
+    <ClInclude Include="..\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/mist/mist.rc b/mist/mist.rc
new file mode 100644
index 0000000..e386053
--- /dev/null
+++ b/mist/mist.rc
@@ -0,0 +1,21 @@
+#include <windows.h>
+#include "../version.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     VER_FILEVERSION
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName",        VER_COMPANYNAME_STR
+            VALUE "FileDescription",    "Moonlight Internet Streaming Tester"
+            VALUE "FileVersion",        VER_FILEVERSION_STR
+        END
+    END
+
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
\ No newline at end of file
diff --git a/mist/mist.vcxproj b/mist/mist.vcxproj
index 9172b2b..24a3896 100644
--- a/mist/mist.vcxproj
+++ b/mist/mist.vcxproj
@@ -161,6 +161,12 @@
   <ItemGroup>
     <ClCompile Include="mist.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="mist.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\version.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/mist/mist.vcxproj.filters b/mist/mist.vcxproj.filters
index 6a69e5f..3b941ed 100644
--- a/mist/mist.vcxproj.filters
+++ b/mist/mist.vcxproj.filters
@@ -19,4 +19,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/miss/version.h b/version.h
similarity index 70%
rename from miss/version.h
rename to version.h
index 8214aaf..4c39e3b 100644
--- a/miss/version.h
+++ b/version.h
@@ -3,4 +3,3 @@
 #define VER_COMPANYNAME_STR         "Moonlight Game Streaming Project"
 #define VER_FILEVERSION             1,0,0,0
 #define VER_FILEVERSION_STR         "1.0.0.0\0"
-#define VER_FILEDESCRIPTION_STR     "Moonlight Internet Streaming Service"