From e5e7309fc273dcc2cb2b6dd727117fd11ae38d0f Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Wed, 6 Nov 2019 09:44:13 -0800 Subject: Update installer to vs2019 --- App/Version.h | 4 +- Installer/Installer.vdproj | 380 +++++++++++++++++++++------------------------ WitnessRandomizer.sln | 25 +-- 3 files changed, 189 insertions(+), 220 deletions(-) diff --git a/App/Version.h b/App/Version.h index 56988d4..cbb8fa3 100644 --- a/App/Version.h +++ b/App/Version.h @@ -4,8 +4,8 @@ #define TO_STRING(s) TO_STRING2(s) #define MAJOR 5 -#define MINOR 0 -#define PATCH 3 +#define MINOR 1 +#define PATCH 0 #define VERSION_STR TO_STRING(MAJOR) L"." TO_STRING(MINOR) L"." TO_STRING(PATCH) #define VERSION MAJOR, MINOR, PATCH diff --git a/Installer/Installer.vdproj b/Installer/Installer.vdproj index c25f549..18a5315 100644 --- a/Installer/Installer.vdproj +++ b/Installer/Installer.vdproj @@ -15,7 +15,7 @@ { "Entry" { - "MsmKey" = "8:_F4835D5BBF3E437390127C4C49888F07" + "MsmKey" = "8:_9D683AD9CFDD4F1E90EB22DB4509B5E4" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -37,22 +37,6 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:TRUE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:1" - "Url" = "8:" - "ComponentsUrl" = "8:" - "Items" - { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" - { - "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" - "ProductCode" = "8:.NETFramework,Version=v4.6.1" - } - } - } } "Release" { @@ -69,22 +53,6 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:TRUE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:1" - "Url" = "8:" - "ComponentsUrl" = "8:" - "Items" - { - "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1" - { - "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)" - "ProductCode" = "8:.NETFramework,Version=v4.6.1" - } - } - } } } "Deployable" @@ -112,7 +80,7 @@ } "Folder" { - "{1525181F-901A-416C-8A58-119130FE478E}:_1FD5AD1232C84F478EFC94AAEE035210" + "{1525181F-901A-416C-8A58-119130FE478E}:_0CCFDBB1FBF5438D8DCF3ECAA4E0408B" { "Name" = "8:#1916" "AlwaysCreate" = "11:FALSE" @@ -123,7 +91,7 @@ { } } - "{3C67513D-01DD-4637-8A68-80971EB9504F}:_8E9D847124D34D9D9008762077D816DE" + "{3C67513D-01DD-4637-8A68-80971EB9504F}:_CC86D8CA6D3943FAB5F6A91D54540360" { "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]" "Name" = "8:#1925" @@ -135,7 +103,7 @@ { } } - "{1525181F-901A-416C-8A58-119130FE478E}:_ADBF9BEF249647A7B9E33B56D9B4F497" + "{1525181F-901A-416C-8A58-119130FE478E}:_F60DCEC4FEDB4941B597F30EB2903A5C" { "Name" = "8:#1919" "AlwaysCreate" = "11:FALSE" @@ -162,19 +130,19 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Witness Randomizer" - "ProductCode" = "8:{4A738738-3445-4A55-8385-2A3CBCA65058}" - "PackageCode" = "8:{D8FAEE19-866A-461E-970D-EAB581DF3E75}" + "ProductCode" = "8:{0A0A8EA4-812F-4B39-8C02-9FB2EEFB38FC}" + "PackageCode" = "8:{F7844209-B903-470B-BAFF-39E0C2E6C919}" "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.0.3" + "ProductVersion" = "8:5.1.0" "Manufacturer" = "8:jbzdarkid" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues" - "Title" = "8:Installer" + "Title" = "8:Witness Randomizer" "Subject" = "8:" "ARPCONTACT" = "8:jbzdarkid" "Keywords" = "8:" @@ -195,7 +163,7 @@ { "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_30C31E4026394D739C781A8F615DBD1B" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_000FB06F80E746299D873B185EE2D764" { "Name" = "8:Software" "Condition" = "8:" @@ -204,7 +172,7 @@ "Transitive" = "11:FALSE" "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_CC3FFD5EF5A24864B8921B3D11FF87C9" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_D34C04A50E284F98B0AD1CD1F09769B9" { "Name" = "8:[Manufacturer]" "Condition" = "8:" @@ -229,7 +197,7 @@ { "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_86EAB0D9996C4DD4A7730F79B46BA7E9" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_A08F22230D254B7FA48916FD94CFF95A" { "Name" = "8:Software" "Condition" = "8:" @@ -238,7 +206,7 @@ "Transitive" = "11:FALSE" "Keys" { - "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_065C31ABC29D44A8AACC5C1DF0B00FFA" + "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_933605C8016B4844AB88EFE2F8431E34" { "Name" = "8:[Manufacturer]" "Condition" = "8:" @@ -283,7 +251,7 @@ } "Shortcut" { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_704973B0673F47C2A7EDC37615A5C901" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_ED6B4CE62E6A437CB3D6CA1CB759E6BD" { "Name" = "8:WitnessRandomizer" "Arguments" = "8:" @@ -291,29 +259,79 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_F4835D5BBF3E437390127C4C49888F07" - "Folder" = "8:_ADBF9BEF249647A7B9E33B56D9B4F497" - "WorkingFolder" = "8:_8E9D847124D34D9D9008762077D816DE" + "Target" = "8:_9D683AD9CFDD4F1E90EB22DB4509B5E4" + "Folder" = "8:_F60DCEC4FEDB4941B597F30EB2903A5C" + "WorkingFolder" = "8:_CC86D8CA6D3943FAB5F6A91D54540360" "Icon" = "8:" "Feature" = "8:" } } "UserInterface" { - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_38A567649FEB44008A1D1E584BC151FE" + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_17721FBDEDA5468BBFB205267183C70C" { - "Name" = "8:#1902" - "Sequence" = "3:1" - "Attributes" = "3:3" + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdBasicDialogs.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_33311EFFA08A4BE7A330DEFC83E86E7C" + { + "Name" = "8:#1900" + "Sequence" = "3:2" + "Attributes" = "3:1" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4091B2BBD40E4FB984D12FE05CC179C8" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4771417380B849C5A7164858CFF49062" + { + "Sequence" = "3:300" + "DisplayName" = "8:Confirm Installation" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8B5BF432E8CA4AFD89A3215A8824F98A" + { + "Sequence" = "3:200" + "DisplayName" = "8:Installation Folder" + "UseDynamicProperties" = "11:TRUE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdAdminFolderDlg.wid" + "Properties" + { + "BannerBitmap" + { + "Name" = "8:BannerBitmap" + "DisplayName" = "8:#1001" + "Description" = "8:#1101" + "Type" = "3:8" + "ContextData" = "8:Bitmap" + "Attributes" = "3:4" + "Setting" = "3:1" + "UsePlugInResources" = "11:TRUE" + } + } + } + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_9A9F4A50AB82425D9129299671557082" { "Sequence" = "3:100" - "DisplayName" = "8:Finished" + "DisplayName" = "8:Welcome" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFinishedDlg.wid" + "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" "Properties" { "BannerBitmap" @@ -327,31 +345,44 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } - "UpdateText" + "CopyrightWarning" { - "Name" = "8:UpdateText" - "DisplayName" = "8:#1058" - "Description" = "8:#1158" - "Type" = "3:15" + "Name" = "8:CopyrightWarning" + "DisplayName" = "8:#1002" + "Description" = "8:#1102" + "Type" = "3:3" "ContextData" = "8:" "Attributes" = "3:0" "Setting" = "3:1" - "Value" = "8:#1258" - "DefaultValue" = "8:#1258" + "Value" = "8:#1202" + "DefaultValue" = "8:#1202" + "UsePlugInResources" = "11:TRUE" + } + "Welcome" + { + "Name" = "8:Welcome" + "DisplayName" = "8:#1003" + "Description" = "8:#1103" + "Type" = "3:3" + "ContextData" = "8:" + "Attributes" = "3:0" + "Setting" = "3:1" + "Value" = "8:#1203" + "DefaultValue" = "8:#1203" "UsePlugInResources" = "11:TRUE" } } } } } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_3BB80DCD2F404C34BC76213696E81E08" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_3D4B34AFC85D4BFCBBB718134707EBC1" { "Name" = "8:#1902" "Sequence" = "3:2" "Attributes" = "3:3" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_89142FD957DE4CFB80E4BE8A71967884" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_2B7F08A8A7A24333B470F5475BDB93B0" { "Sequence" = "3:100" "DisplayName" = "8:Finished" @@ -375,20 +406,20 @@ } } } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_4F2068C04B0E466AA38331A55C59C41C" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_52BC63C740FD4BFD935C847E7C7874D3" { - "Name" = "8:#1901" - "Sequence" = "3:2" - "Attributes" = "3:2" + "Name" = "8:#1902" + "Sequence" = "3:1" + "Attributes" = "3:3" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_AE5C7BA6BD854603B2596FACA0B67D15" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D5F5F666D70548789B9FA43616D3DDDB" { "Sequence" = "3:100" - "DisplayName" = "8:Progress" + "DisplayName" = "8:Finished" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminProgressDlg.wid" + "SourcePath" = "8:\\VsdFinishedDlg.wid" "Properties" { "BannerBitmap" @@ -402,37 +433,37 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } - "ShowProgress" + "UpdateText" { - "Name" = "8:ShowProgress" - "DisplayName" = "8:#1009" - "Description" = "8:#1109" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" + "Name" = "8:UpdateText" + "DisplayName" = "8:#1058" + "Description" = "8:#1158" + "Type" = "3:15" + "ContextData" = "8:" "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" + "Setting" = "3:1" + "Value" = "8:#1258" + "DefaultValue" = "8:#1258" "UsePlugInResources" = "11:TRUE" } } } } } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_6C920D4CA33D4B6599231DE1EF0E32C4" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_73AD4BFFD51A438C8EB5E8395AE55EB3" { - "Name" = "8:#1901" + "Name" = "8:#1900" "Sequence" = "3:1" - "Attributes" = "3:2" + "Attributes" = "3:1" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1D0F1B147BF440128F8062B38CC1C1F2" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_57E566D0A3964A23B457E4E1F5AF23E9" { - "Sequence" = "3:100" - "DisplayName" = "8:Progress" + "Sequence" = "3:300" + "DisplayName" = "8:Confirm Installation" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdProgressDlg.wid" + "SourcePath" = "8:\\VsdConfirmDlg.wid" "Properties" { "BannerBitmap" @@ -446,43 +477,15 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } - "ShowProgress" - { - "Name" = "8:ShowProgress" - "DisplayName" = "8:#1009" - "Description" = "8:#1109" - "Type" = "3:5" - "ContextData" = "8:1;True=1;False=0" - "Attributes" = "3:0" - "Setting" = "3:0" - "Value" = "3:1" - "DefaultValue" = "3:1" - "UsePlugInResources" = "11:TRUE" - } } } - } - } - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_76D36C4D9B234E4AA4BC14C3045F8B20" - { - "UseDynamicProperties" = "11:FALSE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdBasicDialogs.wim" - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_B57EB774BE5C453B9EFE1692DDCAEE56" - { - "Name" = "8:#1900" - "Sequence" = "3:2" - "Attributes" = "3:1" - "Dialogs" - { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_15DF03155E9B4F54AE8E67807A4EFE1F" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8356ED675DE647028A3B8951D02F0715" { "Sequence" = "3:100" "DisplayName" = "8:Welcome" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminWelcomeDlg.wid" + "SourcePath" = "8:\\VsdWelcomeDlg.wid" "Properties" { "BannerBitmap" @@ -524,13 +527,13 @@ } } } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_25F82B1977D443ED87D578E106EA29F3" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E4D03E94554B47E7BDE8ADBC07D335AF" { "Sequence" = "3:200" "DisplayName" = "8:Installation Folder" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminFolderDlg.wid" + "SourcePath" = "8:\\VsdFolderDlg.wid" "Properties" { "BannerBitmap" @@ -544,52 +547,37 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C338B6DBF24844F0B3605A0A75B1DCF3" - { - "Sequence" = "3:300" - "DisplayName" = "8:Confirm Installation" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdAdminConfirmDlg.wid" - "Properties" - { - "BannerBitmap" + "InstallAllUsersVisible" { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" + "Name" = "8:InstallAllUsersVisible" + "DisplayName" = "8:#1059" + "Description" = "8:#1159" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" + "Attributes" = "3:0" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" "UsePlugInResources" = "11:TRUE" } } } } } - "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_C535242FE14D4956804B076BF1391396" - { - "UseDynamicProperties" = "11:FALSE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdUserInterface.wim" - } - "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_E3238729ED69443C9AC277130A087C7D" + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_9F9F9C1259EE4AA09655098D426881CE" { - "Name" = "8:#1900" - "Sequence" = "3:1" - "Attributes" = "3:1" + "Name" = "8:#1901" + "Sequence" = "3:2" + "Attributes" = "3:2" "Dialogs" { - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_048E6ACAB7D346DE98118F422CABA006" + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1594A3B412854467A1E2FF0938799083" { - "Sequence" = "3:200" - "DisplayName" = "8:Installation Folder" + "Sequence" = "3:100" + "DisplayName" = "8:Progress" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdFolderDlg.wid" + "SourcePath" = "8:\\VsdAdminProgressDlg.wid" "Properties" { "BannerBitmap" @@ -603,11 +591,11 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } - "InstallAllUsersVisible" + "ShowProgress" { - "Name" = "8:InstallAllUsersVisible" - "DisplayName" = "8:#1059" - "Description" = "8:#1159" + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" "Type" = "3:5" "ContextData" = "8:1;True=1;False=0" "Attributes" = "3:0" @@ -618,13 +606,28 @@ } } } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_63EC6443964E453FAC02347F7F5B94C9" + } + } + "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_E633238E54724C01BA3EB25E18C081E7" + { + "UseDynamicProperties" = "11:FALSE" + "IsDependency" = "11:FALSE" + "SourcePath" = "8:\\VsdUserInterface.wim" + } + "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_E7FE8B40184947369C27733605049D19" + { + "Name" = "8:#1901" + "Sequence" = "3:1" + "Attributes" = "3:2" + "Dialogs" + { + "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_0FCB2A066C604E5BAFC9D329F9BE1F1F" { "Sequence" = "3:100" - "DisplayName" = "8:Welcome" + "DisplayName" = "8:Progress" "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdWelcomeDlg.wid" + "SourcePath" = "8:\\VsdProgressDlg.wid" "Properties" { "BannerBitmap" @@ -638,52 +641,17 @@ "Setting" = "3:1" "UsePlugInResources" = "11:TRUE" } - "CopyrightWarning" - { - "Name" = "8:CopyrightWarning" - "DisplayName" = "8:#1002" - "Description" = "8:#1102" - "Type" = "3:3" - "ContextData" = "8:" - "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1202" - "DefaultValue" = "8:#1202" - "UsePlugInResources" = "11:TRUE" - } - "Welcome" + "ShowProgress" { - "Name" = "8:Welcome" - "DisplayName" = "8:#1003" - "Description" = "8:#1103" - "Type" = "3:3" - "ContextData" = "8:" + "Name" = "8:ShowProgress" + "DisplayName" = "8:#1009" + "Description" = "8:#1109" + "Type" = "3:5" + "ContextData" = "8:1;True=1;False=0" "Attributes" = "3:0" - "Setting" = "3:1" - "Value" = "8:#1203" - "DefaultValue" = "8:#1203" - "UsePlugInResources" = "11:TRUE" - } - } - } - "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C5D7E2F30F564B78B6463ECCBF213F65" - { - "Sequence" = "3:300" - "DisplayName" = "8:Confirm Installation" - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:FALSE" - "SourcePath" = "8:\\VsdConfirmDlg.wid" - "Properties" - { - "BannerBitmap" - { - "Name" = "8:BannerBitmap" - "DisplayName" = "8:#1001" - "Description" = "8:#1101" - "Type" = "3:8" - "ContextData" = "8:Bitmap" - "Attributes" = "3:4" - "Setting" = "3:1" + "Setting" = "3:0" + "Value" = "3:1" + "DefaultValue" = "3:1" "UsePlugInResources" = "11:TRUE" } } @@ -696,12 +664,12 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F4835D5BBF3E437390127C4C49888F07" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9D683AD9CFDD4F1E90EB22DB4509B5E4" { - "SourcePath" = "8:..\\GithubPackage\\WitnessRandomizer.exe" + "SourcePath" = "8:..\\x64\\Debug\\WitnessRandomizer.exe" "TargetName" = "8:" "Tag" = "8:" - "Folder" = "8:_8E9D847124D34D9D9008762077D816DE" + "Folder" = "8:_CC86D8CA6D3943FAB5F6A91D54540360" "Condition" = "8:" "Transitive" = "11:FALSE" "Vital" = "11:TRUE" diff --git a/WitnessRandomizer.sln b/WitnessRandomizer.sln index 0ece4ec..9017978 100644 --- a/WitnessRandomizer.sln +++ b/WitnessRandomizer.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2048 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29411.108 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App", "App\App.vcxproj", "{235D27F1-9907-489B-8D58-636A0C5CD079}" ProjectSection(ProjectDependencies) = postProject @@ -10,10 +10,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App", "App\App.vcxproj", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Source", "Source\Source.vcxproj", "{6B5DF051-A51A-48CB-8ACD-C6FAD726019F}" EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{78DEDBBE-AC84-496D-8907-40089B464A5B}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test\Test.vcxproj", "{128784C2-9157-4291-8FD6-44637BE162FB}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}" + ProjectSection(ProjectDependencies) = postProject + {6B5DF051-A51A-48CB-8ACD-C6FAD726019F} = {6B5DF051-A51A-48CB-8ACD-C6FAD726019F} + {235D27F1-9907-489B-8D58-636A0C5CD079} = {235D27F1-9907-489B-8D58-636A0C5CD079} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -38,14 +42,6 @@ Global {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x64.Build.0 = Release|x64 {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x86.ActiveCfg = Debug|x64 {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x86.Build.0 = Debug|x64 - {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x64.ActiveCfg = Debug - {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x64.Build.0 = Debug - {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x86.ActiveCfg = Debug - {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x86.Build.0 = Debug - {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x64.ActiveCfg = Release - {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x64.Build.0 = Release - {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x86.ActiveCfg = Debug - {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x86.Build.0 = Debug {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x64.ActiveCfg = Debug|x64 {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x64.Build.0 = Debug|x64 {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x86.ActiveCfg = Debug|x64 @@ -54,6 +50,11 @@ Global {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x64.Build.0 = Release|x64 {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x86.ActiveCfg = Debug|x64 {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x86.Build.0 = Debug|x64 + {F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}.Debug|x64.ActiveCfg = Debug + {F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}.Debug|x64.Build.0 = Debug + {F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}.Debug|x86.ActiveCfg = Debug + {F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}.Release|x64.ActiveCfg = Release + {F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- cgit 1.4.1