Bump version

jbzdarkid · Nov 23, 2019 · 6059a1d · 6059a1d
1 parent 059e44f
commit 6059a1d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/App/Main.cpp b/App/Main.cpp
@@ -267,12 +267,13 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
     // g_rngDebug = CreateWindow(L"STATIC", L"",
 	//     WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT,
 	//     200, 80, 200, 200, g_hwnd, NULL, g_hInstance, NULL);
-
+#ifndef NDEBUG
     g_panelId = CreateText(200, 100, 100, L"59");
     CreateButton(200, 130, 100, L"Read", TMP1);
     CreateButton(200, 160, 100, L"Write", TMP2);
     CreateButton(200, 190, 100, L"Solve", TMP3);
     CreateButton(200, 220, 100, L"Randomize2", TMP4);
+#endif
 
     g_witnessProc->StartHeartbeat(g_hwnd);
 

diff --git a/App/Version.h b/App/Version.h
@@ -3,8 +3,8 @@
 #define TO_STRING2(s) L#s
 #define TO_STRING(s) TO_STRING2(s)
 
-#define MAJOR 5
-#define MINOR 2
+#define MAJOR 6
+#define MINOR 0
 #define PATCH 0
 
 #define VERSION_STR     TO_STRING(MAJOR) L"." TO_STRING(MINOR) L"." TO_STRING(PATCH)

diff --git a/Installer/Installer.vdproj b/Installer/Installer.vdproj
@@ -162,15 +162,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Witness Randomizer"
-        "ProductCode" = "8:{5A3C6188-EA4B-4FEE-94EE-BF7D91681792}"
-        "PackageCode" = "8:{E8C66354-4ED4-4958-9D6C-A0DC3BD6C3EA}"
+        "ProductCode" = "8:{45A4772A-100E-4B94-B73A-F2F0C355D0F0}"
+        "PackageCode" = "8:{9D15D892-3C9C-4007-86A4-AA6BA2138CE9}"
         "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:5.2.0"
+        "ProductVersion" = "8:6.0.0"
         "Manufacturer" = "8:jbzdarkid"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues"

diff --git a/Source/Memory.h b/Source/Memory.h
@@ -5,8 +5,8 @@
 #include <vector>
 #include <windows.h>
 
-#define GLOBALS 0x5B28C0
-// #define GLOBALS 0x62D0A0
+// #define GLOBALS 0x5B28C0
+#define GLOBALS 0x62D0A0
 
 #define HEARTBEAT 0x401
 enum class ProcStatus {

diff --git a/Test/Test.vcxproj b/Test/Test.vcxproj
@@ -67,6 +67,7 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -87,6 +88,7 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -107,6 +109,7 @@
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -127,6 +130,7 @@
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">