summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--App/Version.h4
-rw-r--r--Installer/Installer.vdproj380
-rw-r--r--WitnessRandomizer.sln25
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 @@
4#define TO_STRING(s) TO_STRING2(s) 4#define TO_STRING(s) TO_STRING2(s)
5 5
6#define MAJOR 5 6#define MAJOR 5
7#define MINOR 0 7#define MINOR 1
8#define PATCH 3 8#define PATCH 0
9 9
10#define VERSION_STR TO_STRING(MAJOR) L"." TO_STRING(MINOR) L"." TO_STRING(PATCH) 10#define VERSION_STR TO_STRING(MAJOR) L"." TO_STRING(MINOR) L"." TO_STRING(PATCH)
11#define VERSION MAJOR, MINOR, PATCH 11#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 @@
15 { 15 {
16 "Entry" 16 "Entry"
17 { 17 {
18 "MsmKey" = "8:_F4835D5BBF3E437390127C4C49888F07" 18 "MsmKey" = "8:_9D683AD9CFDD4F1E90EB22DB4509B5E4"
19 "OwnerKey" = "8:_UNDEFINED" 19 "OwnerKey" = "8:_UNDEFINED"
20 "MsmSig" = "8:_UNDEFINED" 20 "MsmSig" = "8:_UNDEFINED"
21 } 21 }
@@ -37,22 +37,6 @@
37 "PrivateKeyFile" = "8:" 37 "PrivateKeyFile" = "8:"
38 "TimeStampServer" = "8:" 38 "TimeStampServer" = "8:"
39 "InstallerBootstrapper" = "3:2" 39 "InstallerBootstrapper" = "3:2"
40 "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
41 {
42 "Enabled" = "11:TRUE"
43 "PromptEnabled" = "11:TRUE"
44 "PrerequisitesLocation" = "2:1"
45 "Url" = "8:"
46 "ComponentsUrl" = "8:"
47 "Items"
48 {
49 "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1"
50 {
51 "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)"
52 "ProductCode" = "8:.NETFramework,Version=v4.6.1"
53 }
54 }
55 }
56 } 40 }
57 "Release" 41 "Release"
58 { 42 {
@@ -69,22 +53,6 @@
69 "PrivateKeyFile" = "8:" 53 "PrivateKeyFile" = "8:"
70 "TimeStampServer" = "8:" 54 "TimeStampServer" = "8:"
71 "InstallerBootstrapper" = "3:2" 55 "InstallerBootstrapper" = "3:2"
72 "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
73 {
74 "Enabled" = "11:TRUE"
75 "PromptEnabled" = "11:TRUE"
76 "PrerequisitesLocation" = "2:1"
77 "Url" = "8:"
78 "ComponentsUrl" = "8:"
79 "Items"
80 {
81 "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1"
82 {
83 "Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)"
84 "ProductCode" = "8:.NETFramework,Version=v4.6.1"
85 }
86 }
87 }
88 } 56 }
89 } 57 }
90 "Deployable" 58 "Deployable"
@@ -112,7 +80,7 @@
112 } 80 }
113 "Folder" 81 "Folder"
114 { 82 {
115 "{1525181F-901A-416C-8A58-119130FE478E}:_1FD5AD1232C84F478EFC94AAEE035210" 83 "{1525181F-901A-416C-8A58-119130FE478E}:_0CCFDBB1FBF5438D8DCF3ECAA4E0408B"
116 { 84 {
117 "Name" = "8:#1916" 85 "Name" = "8:#1916"
118 "AlwaysCreate" = "11:FALSE" 86 "AlwaysCreate" = "11:FALSE"
@@ -123,7 +91,7 @@
123 { 91 {
124 } 92 }
125 } 93 }
126 "{3C67513D-01DD-4637-8A68-80971EB9504F}:_8E9D847124D34D9D9008762077D816DE" 94 "{3C67513D-01DD-4637-8A68-80971EB9504F}:_CC86D8CA6D3943FAB5F6A91D54540360"
127 { 95 {
128 "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]" 96 "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]"
129 "Name" = "8:#1925" 97 "Name" = "8:#1925"
@@ -135,7 +103,7 @@
135 { 103 {
136 } 104 }
137 } 105 }
138 "{1525181F-901A-416C-8A58-119130FE478E}:_ADBF9BEF249647A7B9E33B56D9B4F497" 106 "{1525181F-901A-416C-8A58-119130FE478E}:_F60DCEC4FEDB4941B597F30EB2903A5C"
139 { 107 {
140 "Name" = "8:#1919" 108 "Name" = "8:#1919"
141 "AlwaysCreate" = "11:FALSE" 109 "AlwaysCreate" = "11:FALSE"
@@ -162,19 +130,19 @@
162 { 130 {
163 "Name" = "8:Microsoft Visual Studio" 131 "Name" = "8:Microsoft Visual Studio"
164 "ProductName" = "8:Witness Randomizer" 132 "ProductName" = "8:Witness Randomizer"
165 "ProductCode" = "8:{4A738738-3445-4A55-8385-2A3CBCA65058}" 133 "ProductCode" = "8:{0A0A8EA4-812F-4B39-8C02-9FB2EEFB38FC}"
166 "PackageCode" = "8:{D8FAEE19-866A-461E-970D-EAB581DF3E75}" 134 "PackageCode" = "8:{F7844209-B903-470B-BAFF-39E0C2E6C919}"
167 "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}" 135 "UpgradeCode" = "8:{4CB5496B-A47E-41D3-B4A7-677E29AB7513}"
168 "AspNetVersion" = "8:2.0.50727.0" 136 "AspNetVersion" = "8:2.0.50727.0"
169 "RestartWWWService" = "11:FALSE" 137 "RestartWWWService" = "11:FALSE"
170 "RemovePreviousVersions" = "11:TRUE" 138 "RemovePreviousVersions" = "11:TRUE"
171 "DetectNewerInstalledVersion" = "11:TRUE" 139 "DetectNewerInstalledVersion" = "11:TRUE"
172 "InstallAllUsers" = "11:FALSE" 140 "InstallAllUsers" = "11:FALSE"
173 "ProductVersion" = "8:5.0.3" 141 "ProductVersion" = "8:5.1.0"
174 "Manufacturer" = "8:jbzdarkid" 142 "Manufacturer" = "8:jbzdarkid"
175 "ARPHELPTELEPHONE" = "8:" 143 "ARPHELPTELEPHONE" = "8:"
176 "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues" 144 "ARPHELPLINK" = "8:https://www.github.com/jbzdarkid/witness-randomizer/issues"
177 "Title" = "8:Installer" 145 "Title" = "8:Witness Randomizer"
178 "Subject" = "8:" 146 "Subject" = "8:"
179 "ARPCONTACT" = "8:jbzdarkid" 147 "ARPCONTACT" = "8:jbzdarkid"
180 "Keywords" = "8:" 148 "Keywords" = "8:"
@@ -195,7 +163,7 @@
195 { 163 {
196 "Keys" 164 "Keys"
197 { 165 {
198 "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_30C31E4026394D739C781A8F615DBD1B" 166 "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_000FB06F80E746299D873B185EE2D764"
199 { 167 {
200 "Name" = "8:Software" 168 "Name" = "8:Software"
201 "Condition" = "8:" 169 "Condition" = "8:"
@@ -204,7 +172,7 @@
204 "Transitive" = "11:FALSE" 172 "Transitive" = "11:FALSE"
205 "Keys" 173 "Keys"
206 { 174 {
207 "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_CC3FFD5EF5A24864B8921B3D11FF87C9" 175 "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_D34C04A50E284F98B0AD1CD1F09769B9"
208 { 176 {
209 "Name" = "8:[Manufacturer]" 177 "Name" = "8:[Manufacturer]"
210 "Condition" = "8:" 178 "Condition" = "8:"
@@ -229,7 +197,7 @@
229 { 197 {
230 "Keys" 198 "Keys"
231 { 199 {
232 "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_86EAB0D9996C4DD4A7730F79B46BA7E9" 200 "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_A08F22230D254B7FA48916FD94CFF95A"
233 { 201 {
234 "Name" = "8:Software" 202 "Name" = "8:Software"
235 "Condition" = "8:" 203 "Condition" = "8:"
@@ -238,7 +206,7 @@
238 "Transitive" = "11:FALSE" 206 "Transitive" = "11:FALSE"
239 "Keys" 207 "Keys"
240 { 208 {
241 "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_065C31ABC29D44A8AACC5C1DF0B00FFA" 209 "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_933605C8016B4844AB88EFE2F8431E34"
242 { 210 {
243 "Name" = "8:[Manufacturer]" 211 "Name" = "8:[Manufacturer]"
244 "Condition" = "8:" 212 "Condition" = "8:"
@@ -283,7 +251,7 @@
283 } 251 }
284 "Shortcut" 252 "Shortcut"
285 { 253 {
286 "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_704973B0673F47C2A7EDC37615A5C901" 254 "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_ED6B4CE62E6A437CB3D6CA1CB759E6BD"
287 { 255 {
288 "Name" = "8:WitnessRandomizer" 256 "Name" = "8:WitnessRandomizer"
289 "Arguments" = "8:" 257 "Arguments" = "8:"
@@ -291,29 +259,79 @@
291 "ShowCmd" = "3:1" 259 "ShowCmd" = "3:1"
292 "IconIndex" = "3:0" 260 "IconIndex" = "3:0"
293 "Transitive" = "11:FALSE" 261 "Transitive" = "11:FALSE"
294 "Target" = "8:_F4835D5BBF3E437390127C4C49888F07" 262 "Target" = "8:_9D683AD9CFDD4F1E90EB22DB4509B5E4"
295 "Folder" = "8:_ADBF9BEF249647A7B9E33B56D9B4F497" 263 "Folder" = "8:_F60DCEC4FEDB4941B597F30EB2903A5C"
296 "WorkingFolder" = "8:_8E9D847124D34D9D9008762077D816DE" 264 "WorkingFolder" = "8:_CC86D8CA6D3943FAB5F6A91D54540360"
297 "Icon" = "8:" 265 "Icon" = "8:"
298 "Feature" = "8:" 266 "Feature" = "8:"
299 } 267 }
300 } 268 }
301 "UserInterface" 269 "UserInterface"
302 { 270 {
303 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_38A567649FEB44008A1D1E584BC151FE" 271 "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_17721FBDEDA5468BBFB205267183C70C"
304 { 272 {
305 "Name" = "8:#1902" 273 "UseDynamicProperties" = "11:FALSE"
306 "Sequence" = "3:1" 274 "IsDependency" = "11:FALSE"
307 "Attributes" = "3:3" 275 "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"
276 }
277 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_33311EFFA08A4BE7A330DEFC83E86E7C"
278 {
279 "Name" = "8:#1900"
280 "Sequence" = "3:2"
281 "Attributes" = "3:1"
308 "Dialogs" 282 "Dialogs"
309 { 283 {
310 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4091B2BBD40E4FB984D12FE05CC179C8" 284 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_4771417380B849C5A7164858CFF49062"
285 {
286 "Sequence" = "3:300"
287 "DisplayName" = "8:Confirm Installation"
288 "UseDynamicProperties" = "11:TRUE"
289 "IsDependency" = "11:FALSE"
290 "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
291 "Properties"
292 {
293 "BannerBitmap"
294 {
295 "Name" = "8:BannerBitmap"
296 "DisplayName" = "8:#1001"
297 "Description" = "8:#1101"
298 "Type" = "3:8"
299 "ContextData" = "8:Bitmap"
300 "Attributes" = "3:4"
301 "Setting" = "3:1"
302 "UsePlugInResources" = "11:TRUE"
303 }
304 }
305 }
306 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8B5BF432E8CA4AFD89A3215A8824F98A"
307 {
308 "Sequence" = "3:200"
309 "DisplayName" = "8:Installation Folder"
310 "UseDynamicProperties" = "11:TRUE"
311 "IsDependency" = "11:FALSE"
312 "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid"
313 "Properties"
314 {
315 "BannerBitmap"
316 {
317 "Name" = "8:BannerBitmap"
318 "DisplayName" = "8:#1001"
319 "Description" = "8:#1101"
320 "Type" = "3:8"
321 "ContextData" = "8:Bitmap"
322 "Attributes" = "3:4"
323 "Setting" = "3:1"
324 "UsePlugInResources" = "11:TRUE"
325 }
326 }
327 }
328 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_9A9F4A50AB82425D9129299671557082"
311 { 329 {
312 "Sequence" = "3:100" 330 "Sequence" = "3:100"
313 "DisplayName" = "8:Finished" 331 "DisplayName" = "8:Welcome"
314 "UseDynamicProperties" = "11:TRUE" 332 "UseDynamicProperties" = "11:TRUE"
315 "IsDependency" = "11:FALSE" 333 "IsDependency" = "11:FALSE"
316 "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid" 334 "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid"
317 "Properties" 335 "Properties"
318 { 336 {
319 "BannerBitmap" 337 "BannerBitmap"
@@ -327,31 +345,44 @@
327 "Setting" = "3:1" 345 "Setting" = "3:1"
328 "UsePlugInResources" = "11:TRUE" 346 "UsePlugInResources" = "11:TRUE"
329 } 347 }
330 "UpdateText" 348 "CopyrightWarning"
331 { 349 {
332 "Name" = "8:UpdateText" 350 "Name" = "8:CopyrightWarning"
333 "DisplayName" = "8:#1058" 351 "DisplayName" = "8:#1002"
334 "Description" = "8:#1158" 352 "Description" = "8:#1102"
335 "Type" = "3:15" 353 "Type" = "3:3"
336 "ContextData" = "8:" 354 "ContextData" = "8:"
337 "Attributes" = "3:0" 355 "Attributes" = "3:0"
338 "Setting" = "3:1" 356 "Setting" = "3:1"
339 "Value" = "8:#1258" 357 "Value" = "8:#1202"
340 "DefaultValue" = "8:#1258" 358 "DefaultValue" = "8:#1202"
359 "UsePlugInResources" = "11:TRUE"
360 }
361 "Welcome"
362 {
363 "Name" = "8:Welcome"
364 "DisplayName" = "8:#1003"
365 "Description" = "8:#1103"
366 "Type" = "3:3"
367 "ContextData" = "8:"
368 "Attributes" = "3:0"
369 "Setting" = "3:1"
370 "Value" = "8:#1203"
371 "DefaultValue" = "8:#1203"
341 "UsePlugInResources" = "11:TRUE" 372 "UsePlugInResources" = "11:TRUE"
342 } 373 }
343 } 374 }
344 } 375 }
345 } 376 }
346 } 377 }
347 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_3BB80DCD2F404C34BC76213696E81E08" 378 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_3D4B34AFC85D4BFCBBB718134707EBC1"
348 { 379 {
349 "Name" = "8:#1902" 380 "Name" = "8:#1902"
350 "Sequence" = "3:2" 381 "Sequence" = "3:2"
351 "Attributes" = "3:3" 382 "Attributes" = "3:3"
352 "Dialogs" 383 "Dialogs"
353 { 384 {
354 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_89142FD957DE4CFB80E4BE8A71967884" 385 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_2B7F08A8A7A24333B470F5475BDB93B0"
355 { 386 {
356 "Sequence" = "3:100" 387 "Sequence" = "3:100"
357 "DisplayName" = "8:Finished" 388 "DisplayName" = "8:Finished"
@@ -375,20 +406,20 @@
375 } 406 }
376 } 407 }
377 } 408 }
378 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_4F2068C04B0E466AA38331A55C59C41C" 409 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_52BC63C740FD4BFD935C847E7C7874D3"
379 { 410 {
380 "Name" = "8:#1901" 411 "Name" = "8:#1902"
381 "Sequence" = "3:2" 412 "Sequence" = "3:1"
382 "Attributes" = "3:2" 413 "Attributes" = "3:3"
383 "Dialogs" 414 "Dialogs"
384 { 415 {
385 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_AE5C7BA6BD854603B2596FACA0B67D15" 416 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_D5F5F666D70548789B9FA43616D3DDDB"
386 { 417 {
387 "Sequence" = "3:100" 418 "Sequence" = "3:100"
388 "DisplayName" = "8:Progress" 419 "DisplayName" = "8:Finished"
389 "UseDynamicProperties" = "11:TRUE" 420 "UseDynamicProperties" = "11:TRUE"
390 "IsDependency" = "11:FALSE" 421 "IsDependency" = "11:FALSE"
391 "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid" 422 "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
392 "Properties" 423 "Properties"
393 { 424 {
394 "BannerBitmap" 425 "BannerBitmap"
@@ -402,37 +433,37 @@
402 "Setting" = "3:1" 433 "Setting" = "3:1"
403 "UsePlugInResources" = "11:TRUE" 434 "UsePlugInResources" = "11:TRUE"
404 } 435 }
405 "ShowProgress" 436 "UpdateText"
406 { 437 {
407 "Name" = "8:ShowProgress" 438 "Name" = "8:UpdateText"
408 "DisplayName" = "8:#1009" 439 "DisplayName" = "8:#1058"
409 "Description" = "8:#1109" 440 "Description" = "8:#1158"
410 "Type" = "3:5" 441 "Type" = "3:15"
411 "ContextData" = "8:1;True=1;False=0" 442 "ContextData" = "8:"
412 "Attributes" = "3:0" 443 "Attributes" = "3:0"
413 "Setting" = "3:0" 444 "Setting" = "3:1"
414 "Value" = "3:1" 445 "Value" = "8:#1258"
415 "DefaultValue" = "3:1" 446 "DefaultValue" = "8:#1258"
416 "UsePlugInResources" = "11:TRUE" 447 "UsePlugInResources" = "11:TRUE"
417 } 448 }
418 } 449 }
419 } 450 }
420 } 451 }
421 } 452 }
422 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_6C920D4CA33D4B6599231DE1EF0E32C4" 453 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_73AD4BFFD51A438C8EB5E8395AE55EB3"
423 { 454 {
424 "Name" = "8:#1901" 455 "Name" = "8:#1900"
425 "Sequence" = "3:1" 456 "Sequence" = "3:1"
426 "Attributes" = "3:2" 457 "Attributes" = "3:1"
427 "Dialogs" 458 "Dialogs"
428 { 459 {
429 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1D0F1B147BF440128F8062B38CC1C1F2" 460 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_57E566D0A3964A23B457E4E1F5AF23E9"
430 { 461 {
431 "Sequence" = "3:100" 462 "Sequence" = "3:300"
432 "DisplayName" = "8:Progress" 463 "DisplayName" = "8:Confirm Installation"
433 "UseDynamicProperties" = "11:TRUE" 464 "UseDynamicProperties" = "11:TRUE"
434 "IsDependency" = "11:FALSE" 465 "IsDependency" = "11:FALSE"
435 "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid" 466 "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
436 "Properties" 467 "Properties"
437 { 468 {
438 "BannerBitmap" 469 "BannerBitmap"
@@ -446,43 +477,15 @@
446 "Setting" = "3:1" 477 "Setting" = "3:1"
447 "UsePlugInResources" = "11:TRUE" 478 "UsePlugInResources" = "11:TRUE"
448 } 479 }
449 "ShowProgress"
450 {
451 "Name" = "8:ShowProgress"
452 "DisplayName" = "8:#1009"
453 "Description" = "8:#1109"
454 "Type" = "3:5"
455 "ContextData" = "8:1;True=1;False=0"
456 "Attributes" = "3:0"
457 "Setting" = "3:0"
458 "Value" = "3:1"
459 "DefaultValue" = "3:1"
460 "UsePlugInResources" = "11:TRUE"
461 }
462 } 480 }
463 } 481 }
464 } 482 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_8356ED675DE647028A3B8951D02F0715"
465 }
466 "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_76D36C4D9B234E4AA4BC14C3045F8B20"
467 {
468 "UseDynamicProperties" = "11:FALSE"
469 "IsDependency" = "11:FALSE"
470 "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"
471 }
472 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_B57EB774BE5C453B9EFE1692DDCAEE56"
473 {
474 "Name" = "8:#1900"
475 "Sequence" = "3:2"
476 "Attributes" = "3:1"
477 "Dialogs"
478 {
479 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_15DF03155E9B4F54AE8E67807A4EFE1F"
480 { 483 {
481 "Sequence" = "3:100" 484 "Sequence" = "3:100"
482 "DisplayName" = "8:Welcome" 485 "DisplayName" = "8:Welcome"
483 "UseDynamicProperties" = "11:TRUE" 486 "UseDynamicProperties" = "11:TRUE"
484 "IsDependency" = "11:FALSE" 487 "IsDependency" = "11:FALSE"
485 "SourcePath" = "8:<VsdDialogDir>\\VsdAdminWelcomeDlg.wid" 488 "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid"
486 "Properties" 489 "Properties"
487 { 490 {
488 "BannerBitmap" 491 "BannerBitmap"
@@ -524,13 +527,13 @@
524 } 527 }
525 } 528 }
526 } 529 }
527 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_25F82B1977D443ED87D578E106EA29F3" 530 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E4D03E94554B47E7BDE8ADBC07D335AF"
528 { 531 {
529 "Sequence" = "3:200" 532 "Sequence" = "3:200"
530 "DisplayName" = "8:Installation Folder" 533 "DisplayName" = "8:Installation Folder"
531 "UseDynamicProperties" = "11:TRUE" 534 "UseDynamicProperties" = "11:TRUE"
532 "IsDependency" = "11:FALSE" 535 "IsDependency" = "11:FALSE"
533 "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFolderDlg.wid" 536 "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid"
534 "Properties" 537 "Properties"
535 { 538 {
536 "BannerBitmap" 539 "BannerBitmap"
@@ -544,52 +547,37 @@
544 "Setting" = "3:1" 547 "Setting" = "3:1"
545 "UsePlugInResources" = "11:TRUE" 548 "UsePlugInResources" = "11:TRUE"
546 } 549 }
547 } 550 "InstallAllUsersVisible"
548 }
549 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C338B6DBF24844F0B3605A0A75B1DCF3"
550 {
551 "Sequence" = "3:300"
552 "DisplayName" = "8:Confirm Installation"
553 "UseDynamicProperties" = "11:TRUE"
554 "IsDependency" = "11:FALSE"
555 "SourcePath" = "8:<VsdDialogDir>\\VsdAdminConfirmDlg.wid"
556 "Properties"
557 {
558 "BannerBitmap"
559 { 551 {
560 "Name" = "8:BannerBitmap" 552 "Name" = "8:InstallAllUsersVisible"
561 "DisplayName" = "8:#1001" 553 "DisplayName" = "8:#1059"
562 "Description" = "8:#1101" 554 "Description" = "8:#1159"
563 "Type" = "3:8" 555 "Type" = "3:5"
564 "ContextData" = "8:Bitmap" 556 "ContextData" = "8:1;True=1;False=0"
565 "Attributes" = "3:4" 557 "Attributes" = "3:0"
566 "Setting" = "3:1" 558 "Setting" = "3:0"
559 "Value" = "3:1"
560 "DefaultValue" = "3:1"
567 "UsePlugInResources" = "11:TRUE" 561 "UsePlugInResources" = "11:TRUE"
568 } 562 }
569 } 563 }
570 } 564 }
571 } 565 }
572 } 566 }
573 "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_C535242FE14D4956804B076BF1391396" 567 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_9F9F9C1259EE4AA09655098D426881CE"
574 {
575 "UseDynamicProperties" = "11:FALSE"
576 "IsDependency" = "11:FALSE"
577 "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"
578 }
579 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_E3238729ED69443C9AC277130A087C7D"
580 { 568 {
581 "Name" = "8:#1900" 569 "Name" = "8:#1901"
582 "Sequence" = "3:1" 570 "Sequence" = "3:2"
583 "Attributes" = "3:1" 571 "Attributes" = "3:2"
584 "Dialogs" 572 "Dialogs"
585 { 573 {
586 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_048E6ACAB7D346DE98118F422CABA006" 574 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1594A3B412854467A1E2FF0938799083"
587 { 575 {
588 "Sequence" = "3:200" 576 "Sequence" = "3:100"
589 "DisplayName" = "8:Installation Folder" 577 "DisplayName" = "8:Progress"
590 "UseDynamicProperties" = "11:TRUE" 578 "UseDynamicProperties" = "11:TRUE"
591 "IsDependency" = "11:FALSE" 579 "IsDependency" = "11:FALSE"
592 "SourcePath" = "8:<VsdDialogDir>\\VsdFolderDlg.wid" 580 "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
593 "Properties" 581 "Properties"
594 { 582 {
595 "BannerBitmap" 583 "BannerBitmap"
@@ -603,11 +591,11 @@
603 "Setting" = "3:1" 591 "Setting" = "3:1"
604 "UsePlugInResources" = "11:TRUE" 592 "UsePlugInResources" = "11:TRUE"
605 } 593 }
606 "InstallAllUsersVisible" 594 "ShowProgress"
607 { 595 {
608 "Name" = "8:InstallAllUsersVisible" 596 "Name" = "8:ShowProgress"
609 "DisplayName" = "8:#1059" 597 "DisplayName" = "8:#1009"
610 "Description" = "8:#1159" 598 "Description" = "8:#1109"
611 "Type" = "3:5" 599 "Type" = "3:5"
612 "ContextData" = "8:1;True=1;False=0" 600 "ContextData" = "8:1;True=1;False=0"
613 "Attributes" = "3:0" 601 "Attributes" = "3:0"
@@ -618,13 +606,28 @@
618 } 606 }
619 } 607 }
620 } 608 }
621 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_63EC6443964E453FAC02347F7F5B94C9" 609 }
610 }
611 "{2479F3F5-0309-486D-8047-8187E2CE5BA0}:_E633238E54724C01BA3EB25E18C081E7"
612 {
613 "UseDynamicProperties" = "11:FALSE"
614 "IsDependency" = "11:FALSE"
615 "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"
616 }
617 "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_E7FE8B40184947369C27733605049D19"
618 {
619 "Name" = "8:#1901"
620 "Sequence" = "3:1"
621 "Attributes" = "3:2"
622 "Dialogs"
623 {
624 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_0FCB2A066C604E5BAFC9D329F9BE1F1F"
622 { 625 {
623 "Sequence" = "3:100" 626 "Sequence" = "3:100"
624 "DisplayName" = "8:Welcome" 627 "DisplayName" = "8:Progress"
625 "UseDynamicProperties" = "11:TRUE" 628 "UseDynamicProperties" = "11:TRUE"
626 "IsDependency" = "11:FALSE" 629 "IsDependency" = "11:FALSE"
627 "SourcePath" = "8:<VsdDialogDir>\\VsdWelcomeDlg.wid" 630 "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
628 "Properties" 631 "Properties"
629 { 632 {
630 "BannerBitmap" 633 "BannerBitmap"
@@ -638,52 +641,17 @@
638 "Setting" = "3:1" 641 "Setting" = "3:1"
639 "UsePlugInResources" = "11:TRUE" 642 "UsePlugInResources" = "11:TRUE"
640 } 643 }
641 "CopyrightWarning" 644 "ShowProgress"
642 {
643 "Name" = "8:CopyrightWarning"
644 "DisplayName" = "8:#1002"
645 "Description" = "8:#1102"
646 "Type" = "3:3"
647 "ContextData" = "8:"
648 "Attributes" = "3:0"
649 "Setting" = "3:1"
650 "Value" = "8:#1202"
651 "DefaultValue" = "8:#1202"
652 "UsePlugInResources" = "11:TRUE"
653 }
654 "Welcome"
655 { 645 {
656 "Name" = "8:Welcome" 646 "Name" = "8:ShowProgress"
657 "DisplayName" = "8:#1003" 647 "DisplayName" = "8:#1009"
658 "Description" = "8:#1103" 648 "Description" = "8:#1109"
659 "Type" = "3:3" 649 "Type" = "3:5"
660 "ContextData" = "8:" 650 "ContextData" = "8:1;True=1;False=0"
661 "Attributes" = "3:0" 651 "Attributes" = "3:0"
662 "Setting" = "3:1" 652 "Setting" = "3:0"
663 "Value" = "8:#1203" 653 "Value" = "3:1"
664 "DefaultValue" = "8:#1203" 654 "DefaultValue" = "3:1"
665 "UsePlugInResources" = "11:TRUE"
666 }
667 }
668 }
669 "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_C5D7E2F30F564B78B6463ECCBF213F65"
670 {
671 "Sequence" = "3:300"
672 "DisplayName" = "8:Confirm Installation"
673 "UseDynamicProperties" = "11:TRUE"
674 "IsDependency" = "11:FALSE"
675 "SourcePath" = "8:<VsdDialogDir>\\VsdConfirmDlg.wid"
676 "Properties"
677 {
678 "BannerBitmap"
679 {
680 "Name" = "8:BannerBitmap"
681 "DisplayName" = "8:#1001"
682 "Description" = "8:#1101"
683 "Type" = "3:8"
684 "ContextData" = "8:Bitmap"
685 "Attributes" = "3:4"
686 "Setting" = "3:1"
687 "UsePlugInResources" = "11:TRUE" 655 "UsePlugInResources" = "11:TRUE"
688 } 656 }
689 } 657 }
@@ -696,12 +664,12 @@
696 } 664 }
697 "ProjectOutput" 665 "ProjectOutput"
698 { 666 {
699 "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F4835D5BBF3E437390127C4C49888F07" 667 "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9D683AD9CFDD4F1E90EB22DB4509B5E4"
700 { 668 {
701 "SourcePath" = "8:..\\GithubPackage\\WitnessRandomizer.exe" 669 "SourcePath" = "8:..\\x64\\Debug\\WitnessRandomizer.exe"
702 "TargetName" = "8:" 670 "TargetName" = "8:"
703 "Tag" = "8:" 671 "Tag" = "8:"
704 "Folder" = "8:_8E9D847124D34D9D9008762077D816DE" 672 "Folder" = "8:_CC86D8CA6D3943FAB5F6A91D54540360"
705 "Condition" = "8:" 673 "Condition" = "8:"
706 "Transitive" = "11:FALSE" 674 "Transitive" = "11:FALSE"
707 "Vital" = "11:TRUE" 675 "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 @@
1 1
2Microsoft Visual Studio Solution File, Format Version 12.00 2Microsoft Visual Studio Solution File, Format Version 12.00
3# Visual Studio 15 3# Visual Studio Version 16
4VisualStudioVersion = 15.0.28010.2048 4VisualStudioVersion = 16.0.29411.108
5MinimumVisualStudioVersion = 10.0.40219.1 5MinimumVisualStudioVersion = 10.0.40219.1
6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App", "App\App.vcxproj", "{235D27F1-9907-489B-8D58-636A0C5CD079}" 6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App", "App\App.vcxproj", "{235D27F1-9907-489B-8D58-636A0C5CD079}"
7 ProjectSection(ProjectDependencies) = postProject 7 ProjectSection(ProjectDependencies) = postProject
@@ -10,10 +10,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App", "App\App.vcxproj", "{
10EndProject 10EndProject
11Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Source", "Source\Source.vcxproj", "{6B5DF051-A51A-48CB-8ACD-C6FAD726019F}" 11Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Source", "Source\Source.vcxproj", "{6B5DF051-A51A-48CB-8ACD-C6FAD726019F}"
12EndProject 12EndProject
13Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{78DEDBBE-AC84-496D-8907-40089B464A5B}"
14EndProject
15Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test\Test.vcxproj", "{128784C2-9157-4291-8FD6-44637BE162FB}" 13Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test\Test.vcxproj", "{128784C2-9157-4291-8FD6-44637BE162FB}"
16EndProject 14EndProject
15Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}"
16 ProjectSection(ProjectDependencies) = postProject
17 {6B5DF051-A51A-48CB-8ACD-C6FAD726019F} = {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}
18 {235D27F1-9907-489B-8D58-636A0C5CD079} = {235D27F1-9907-489B-8D58-636A0C5CD079}
19 EndProjectSection
20EndProject
17Global 21Global
18 GlobalSection(SolutionConfigurationPlatforms) = preSolution 22 GlobalSection(SolutionConfigurationPlatforms) = preSolution
19 Debug|x64 = Debug|x64 23 Debug|x64 = Debug|x64
@@ -38,14 +42,6 @@ Global
38 {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x64.Build.0 = Release|x64 42 {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x64.Build.0 = Release|x64
39 {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x86.ActiveCfg = Debug|x64 43 {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x86.ActiveCfg = Debug|x64
40 {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x86.Build.0 = Debug|x64 44 {6B5DF051-A51A-48CB-8ACD-C6FAD726019F}.Release|x86.Build.0 = Debug|x64
41 {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x64.ActiveCfg = Debug
42 {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x64.Build.0 = Debug
43 {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x86.ActiveCfg = Debug
44 {78DEDBBE-AC84-496D-8907-40089B464A5B}.Debug|x86.Build.0 = Debug
45 {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x64.ActiveCfg = Release
46 {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x64.Build.0 = Release
47 {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x86.ActiveCfg = Debug
48 {78DEDBBE-AC84-496D-8907-40089B464A5B}.Release|x86.Build.0 = Debug
49 {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x64.ActiveCfg = Debug|x64 45 {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x64.ActiveCfg = Debug|x64
50 {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x64.Build.0 = Debug|x64 46 {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x64.Build.0 = Debug|x64
51 {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x86.ActiveCfg = Debug|x64 47 {128784C2-9157-4291-8FD6-44637BE162FB}.Debug|x86.ActiveCfg = Debug|x64
@@ -54,6 +50,11 @@ Global
54 {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x64.Build.0 = Release|x64 50 {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x64.Build.0 = Release|x64
55 {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x86.ActiveCfg = Debug|x64 51 {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x86.ActiveCfg = Debug|x64
56 {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x86.Build.0 = Debug|x64 52 {128784C2-9157-4291-8FD6-44637BE162FB}.Release|x86.Build.0 = Debug|x64
53 {F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}.Debug|x64.ActiveCfg = Debug
54 {F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}.Debug|x64.Build.0 = Debug
55 {F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}.Debug|x86.ActiveCfg = Debug
56 {F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}.Release|x64.ActiveCfg = Release
57 {F1B9D251-3DCC-4B19-A5C9-CA23AFD38632}.Release|x86.ActiveCfg = Release
57 EndGlobalSection 58 EndGlobalSection
58 GlobalSection(SolutionProperties) = preSolution 59 GlobalSection(SolutionProperties) = preSolution
59 HideSolutionNode = FALSE 60 HideSolutionNode = FALSE