Skip to content

Commit de1bbae

Browse files
jtorjojtorjo
committed
1.6.10
- solved setup issue - error at trying to copy to invalid directory
1 parent 93d3528 commit de1bbae

File tree

6 files changed

+74
-82
lines changed

6 files changed

+74
-82
lines changed

‎src/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@
5050
// You can specify all the values or you can default the Build and Revision Numbers
5151
// by using the '*' as shown below:
5252
// [assembly: AssemblyVersion("1.0.*")]
53-
[assembly: AssemblyVersion("1.6.8.0")]
54-
[assembly: AssemblyFileVersion("1.6.8.0")]
53+
[assembly: AssemblyVersion("1.6.10.0")]
54+
[assembly: AssemblyFileVersion("1.6.10.0")]

‎src/docs/history.txt‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11

22

3-
4-
... so that I see the latest as first
5-
6-
For now, the only reason I can think about this is for Event Logs (since that's what Event Viewer does).
7-
8-
Once I do this, new entries are shown to the top (as opposed to at the bottom, as is now)
9-
10-
IMPORTANT: basically, i need to be able to add records to the end and to the beginning. Need to figure out how to do it
11-
12-
13-
14-
153
- post on https://www.reddit.com/r/dotnet/
164
https://news.ycombinator.com/news (9 jan 2016)
175
quora
186

197

8+
- setup kit ran for first time -> does not show correctly the logwizard.setup sample (32bit)
9+
2010

2111
- event viewer: convert computername/username to friendly?
2212

13+
1.6.10
14+
- solved setup issue - error at trying to copy to invalid directory
15+
2316

2417
1.6.10c
2518
#20 fully solved

‎src/logwizardsetup/logwizardsetup.vdproj‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,38 @@
1515
{
1616
"Entry"
1717
{
18-
"MsmKey" = "8:_02D1A93B8AF097E49CCF08282FDD7B56"
18+
"MsmKey" = "8:_091F0B6BEDCDFF8BECF32823AB47EF09"
1919
"OwnerKey" = "8:_900BA54346A2479085BF08862BE89061"
2020
"MsmSig" = "8:_UNDEFINED"
2121
}
2222
"Entry"
2323
{
24-
"MsmKey" = "8:_02D1A93B8AF097E49CCF08282FDD7B56"
25-
"OwnerKey" = "8:_F773D0E76058479A0C871FCAFC64A8B0"
24+
"MsmKey" = "8:_091F0B6BEDCDFF8BECF32823AB47EF09"
25+
"OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8"
2626
"MsmSig" = "8:_UNDEFINED"
2727
}
2828
"Entry"
2929
{
30-
"MsmKey" = "8:_191D38704C7A22A5115628F836950F1B"
30+
"MsmKey" = "8:_1BD61D6EEEDCF9C461BF2F745AED1697"
3131
"OwnerKey" = "8:_900BA54346A2479085BF08862BE89061"
3232
"MsmSig" = "8:_UNDEFINED"
3333
}
3434
"Entry"
3535
{
36-
"MsmKey" = "8:_191D38704C7A22A5115628F836950F1B"
37-
"OwnerKey" = "8:_F773D0E76058479A0C871FCAFC64A8B0"
36+
"MsmKey" = "8:_1BD61D6EEEDCF9C461BF2F745AED1697"
37+
"OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8"
3838
"MsmSig" = "8:_UNDEFINED"
3939
}
4040
"Entry"
4141
{
42-
"MsmKey" = "8:_33D7D3063BB8732A2D0DD11F91D8CE78"
42+
"MsmKey" = "8:_22E505A97FF6358D681DFC3888FC73C8"
4343
"OwnerKey" = "8:_900BA54346A2479085BF08862BE89061"
4444
"MsmSig" = "8:_UNDEFINED"
4545
}
4646
"Entry"
4747
{
48-
"MsmKey" = "8:_33D7D3063BB8732A2D0DD11F91D8CE78"
49-
"OwnerKey" = "8:_F773D0E76058479A0C871FCAFC64A8B0"
48+
"MsmKey" = "8:_22E505A97FF6358D681DFC3888FC73C8"
49+
"OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8"
5050
"MsmSig" = "8:_UNDEFINED"
5151
}
5252
"Entry"
@@ -57,32 +57,32 @@
5757
}
5858
"Entry"
5959
{
60-
"MsmKey" = "8:_8E7257CE1212CEB37EBDB033046FDDFF"
60+
"MsmKey" = "8:_6B4AA4F9DC15FDF49F51A17EE0D77BB9"
6161
"OwnerKey" = "8:_900BA54346A2479085BF08862BE89061"
6262
"MsmSig" = "8:_UNDEFINED"
6363
}
6464
"Entry"
6565
{
66-
"MsmKey" = "8:_8E7257CE1212CEB37EBDB033046FDDFF"
67-
"OwnerKey" = "8:_F773D0E76058479A0C871FCAFC64A8B0"
66+
"MsmKey" = "8:_6B4AA4F9DC15FDF49F51A17EE0D77BB9"
67+
"OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8"
6868
"MsmSig" = "8:_UNDEFINED"
6969
}
7070
"Entry"
7171
{
72-
"MsmKey" = "8:_900BA54346A2479085BF08862BE89061"
73-
"OwnerKey" = "8:_UNDEFINED"
72+
"MsmKey" = "8:_820C961080BECE943B0CBB285A1209BA"
73+
"OwnerKey" = "8:_900BA54346A2479085BF08862BE89061"
7474
"MsmSig" = "8:_UNDEFINED"
7575
}
7676
"Entry"
7777
{
78-
"MsmKey" = "8:_9C8EF77D6DAA191CE3098020B5AEAB74"
79-
"OwnerKey" = "8:_900BA54346A2479085BF08862BE89061"
78+
"MsmKey" = "8:_820C961080BECE943B0CBB285A1209BA"
79+
"OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8"
8080
"MsmSig" = "8:_UNDEFINED"
8181
}
8282
"Entry"
8383
{
84-
"MsmKey" = "8:_9C8EF77D6DAA191CE3098020B5AEAB74"
85-
"OwnerKey" = "8:_F773D0E76058479A0C871FCAFC64A8B0"
84+
"MsmKey" = "8:_900BA54346A2479085BF08862BE89061"
85+
"OwnerKey" = "8:_UNDEFINED"
8686
"MsmSig" = "8:_UNDEFINED"
8787
}
8888
"Entry"
@@ -94,12 +94,12 @@
9494
"Entry"
9595
{
9696
"MsmKey" = "8:_ACC42FCA563B08AB5DBE4626477480B2"
97-
"OwnerKey" = "8:_F773D0E76058479A0C871FCAFC64A8B0"
97+
"OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8"
9898
"MsmSig" = "8:_UNDEFINED"
9999
}
100100
"Entry"
101101
{
102-
"MsmKey" = "8:_F773D0E76058479A0C871FCAFC64A8B0"
102+
"MsmKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8"
103103
"OwnerKey" = "8:_900BA54346A2479085BF08862BE89061"
104104
"MsmSig" = "8:_UNDEFINED"
105105
}
@@ -112,43 +112,43 @@
112112
"Entry"
113113
{
114114
"MsmKey" = "8:_UNDEFINED"
115-
"OwnerKey" = "8:_F773D0E76058479A0C871FCAFC64A8B0"
115+
"OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8"
116116
"MsmSig" = "8:_UNDEFINED"
117117
}
118118
"Entry"
119119
{
120120
"MsmKey" = "8:_UNDEFINED"
121-
"OwnerKey" = "8:_8E7257CE1212CEB37EBDB033046FDDFF"
121+
"OwnerKey" = "8:_1BD61D6EEEDCF9C461BF2F745AED1697"
122122
"MsmSig" = "8:_UNDEFINED"
123123
}
124124
"Entry"
125125
{
126126
"MsmKey" = "8:_UNDEFINED"
127-
"OwnerKey" = "8:_ACC42FCA563B08AB5DBE4626477480B2"
127+
"OwnerKey" = "8:_22E505A97FF6358D681DFC3888FC73C8"
128128
"MsmSig" = "8:_UNDEFINED"
129129
}
130130
"Entry"
131131
{
132132
"MsmKey" = "8:_UNDEFINED"
133-
"OwnerKey" = "8:_9C8EF77D6DAA191CE3098020B5AEAB74"
133+
"OwnerKey" = "8:_820C961080BECE943B0CBB285A1209BA"
134134
"MsmSig" = "8:_UNDEFINED"
135135
}
136136
"Entry"
137137
{
138138
"MsmKey" = "8:_UNDEFINED"
139-
"OwnerKey" = "8:_33D7D3063BB8732A2D0DD11F91D8CE78"
139+
"OwnerKey" = "8:_6B4AA4F9DC15FDF49F51A17EE0D77BB9"
140140
"MsmSig" = "8:_UNDEFINED"
141141
}
142142
"Entry"
143143
{
144144
"MsmKey" = "8:_UNDEFINED"
145-
"OwnerKey" = "8:_02D1A93B8AF097E49CCF08282FDD7B56"
145+
"OwnerKey" = "8:_091F0B6BEDCDFF8BECF32823AB47EF09"
146146
"MsmSig" = "8:_UNDEFINED"
147147
}
148148
"Entry"
149149
{
150150
"MsmKey" = "8:_UNDEFINED"
151-
"OwnerKey" = "8:_191D38704C7A22A5115628F836950F1B"
151+
"OwnerKey" = "8:_ACC42FCA563B08AB5DBE4626477480B2"
152152
"MsmSig" = "8:_UNDEFINED"
153153
}
154154
}
@@ -324,20 +324,20 @@
324324
}
325325
"File"
326326
{
327-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_02D1A93B8AF097E49CCF08282FDD7B56"
327+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_091F0B6BEDCDFF8BECF32823AB47EF09"
328328
{
329329
"AssemblyRegister" = "3:1"
330330
"AssemblyIsInGAC" = "11:FALSE"
331-
"AssemblyAsmDisplayName" = "8:log4net_1_2_11, Version=1.2.12.2, Culture=neutral, processorArchitecture=MSIL"
331+
"AssemblyAsmDisplayName" = "8:ColorPicker, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
332332
"ScatterAssemblies"
333333
{
334-
"_02D1A93B8AF097E49CCF08282FDD7B56"
334+
"_091F0B6BEDCDFF8BECF32823AB47EF09"
335335
{
336-
"Name" = "8:log4net_1_2_11.dll"
336+
"Name" = "8:ColorPicker.dll"
337337
"Attributes" = "3:512"
338338
}
339339
}
340-
"SourcePath" = "8:log4net_1_2_11.dll"
340+
"SourcePath" = "8:ColorPicker.dll"
341341
"TargetName" = "8:"
342342
"Tag" = "8:"
343343
"Folder" = "8:_E297CB39A550491681319D6F014A659B"
@@ -355,20 +355,20 @@
355355
"IsDependency" = "11:TRUE"
356356
"IsolateTo" = "8:"
357357
}
358-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_191D38704C7A22A5115628F836950F1B"
358+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1BD61D6EEEDCF9C461BF2F745AED1697"
359359
{
360360
"AssemblyRegister" = "3:1"
361361
"AssemblyIsInGAC" = "11:FALSE"
362-
"AssemblyAsmDisplayName" = "8:ColorPicker, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
362+
"AssemblyAsmDisplayName" = "8:ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL"
363363
"ScatterAssemblies"
364364
{
365-
"_191D38704C7A22A5115628F836950F1B"
365+
"_1BD61D6EEEDCF9C461BF2F745AED1697"
366366
{
367-
"Name" = "8:ColorPicker.dll"
367+
"Name" = "8:ICSharpCode.SharpZipLib.dll"
368368
"Attributes" = "3:512"
369369
}
370370
}
371-
"SourcePath" = "8:ColorPicker.dll"
371+
"SourcePath" = "8:ICSharpCode.SharpZipLib.dll"
372372
"TargetName" = "8:"
373373
"Tag" = "8:"
374374
"Folder" = "8:_E297CB39A550491681319D6F014A659B"
@@ -386,20 +386,20 @@
386386
"IsDependency" = "11:TRUE"
387387
"IsolateTo" = "8:"
388388
}
389-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_33D7D3063BB8732A2D0DD11F91D8CE78"
389+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_22E505A97FF6358D681DFC3888FC73C8"
390390
{
391391
"AssemblyRegister" = "3:1"
392392
"AssemblyIsInGAC" = "11:FALSE"
393-
"AssemblyAsmDisplayName" = "8:ObjectListView_lw, Version=2.8.1.16882, Culture=neutral, processorArchitecture=MSIL"
393+
"AssemblyAsmDisplayName" = "8:EncodingTools, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
394394
"ScatterAssemblies"
395395
{
396-
"_33D7D3063BB8732A2D0DD11F91D8CE78"
396+
"_22E505A97FF6358D681DFC3888FC73C8"
397397
{
398-
"Name" = "8:ObjectListView_lw.dll"
398+
"Name" = "8:EncodingTools.dll"
399399
"Attributes" = "3:512"
400400
}
401401
}
402-
"SourcePath" = "8:ObjectListView_lw.dll"
402+
"SourcePath" = "8:EncodingTools.dll"
403403
"TargetName" = "8:"
404404
"Tag" = "8:"
405405
"Folder" = "8:_E297CB39A550491681319D6F014A659B"
@@ -437,20 +437,20 @@
437437
"IsDependency" = "11:FALSE"
438438
"IsolateTo" = "8:"
439439
}
440-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8E7257CE1212CEB37EBDB033046FDDFF"
440+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6B4AA4F9DC15FDF49F51A17EE0D77BB9"
441441
{
442442
"AssemblyRegister" = "3:1"
443443
"AssemblyIsInGAC" = "11:FALSE"
444-
"AssemblyAsmDisplayName" = "8:ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL"
444+
"AssemblyAsmDisplayName" = "8:log4net_1_2_11, Version=1.2.12.2, Culture=neutral, processorArchitecture=MSIL"
445445
"ScatterAssemblies"
446446
{
447-
"_8E7257CE1212CEB37EBDB033046FDDFF"
447+
"_6B4AA4F9DC15FDF49F51A17EE0D77BB9"
448448
{
449-
"Name" = "8:ICSharpCode.SharpZipLib.dll"
449+
"Name" = "8:log4net_1_2_11.dll"
450450
"Attributes" = "3:512"
451451
}
452452
}
453-
"SourcePath" = "8:ICSharpCode.SharpZipLib.dll"
453+
"SourcePath" = "8:log4net_1_2_11.dll"
454454
"TargetName" = "8:"
455455
"Tag" = "8:"
456456
"Folder" = "8:_E297CB39A550491681319D6F014A659B"
@@ -468,20 +468,20 @@
468468
"IsDependency" = "11:TRUE"
469469
"IsolateTo" = "8:"
470470
}
471-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9C8EF77D6DAA191CE3098020B5AEAB74"
471+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_820C961080BECE943B0CBB285A1209BA"
472472
{
473473
"AssemblyRegister" = "3:1"
474474
"AssemblyIsInGAC" = "11:FALSE"
475-
"AssemblyAsmDisplayName" = "8:EncodingTools, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
475+
"AssemblyAsmDisplayName" = "8:ObjectListView_lw, Version=2.8.1.26262, Culture=neutral, processorArchitecture=MSIL"
476476
"ScatterAssemblies"
477477
{
478-
"_9C8EF77D6DAA191CE3098020B5AEAB74"
478+
"_820C961080BECE943B0CBB285A1209BA"
479479
{
480-
"Name" = "8:EncodingTools.dll"
480+
"Name" = "8:ObjectListView_lw.dll"
481481
"Attributes" = "3:512"
482482
}
483483
}
484-
"SourcePath" = "8:EncodingTools.dll"
484+
"SourcePath" = "8:ObjectListView_lw.dll"
485485
"TargetName" = "8:"
486486
"Tag" = "8:"
487487
"Folder" = "8:_E297CB39A550491681319D6F014A659B"
@@ -530,14 +530,14 @@
530530
"IsDependency" = "11:TRUE"
531531
"IsolateTo" = "8:"
532532
}
533-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F773D0E76058479A0C871FCAFC64A8B0"
533+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C8B46DF279E1B4F613E1AB160AF480C8"
534534
{
535535
"AssemblyRegister" = "3:1"
536536
"AssemblyIsInGAC" = "11:FALSE"
537-
"AssemblyAsmDisplayName" = "8:lw_common, Version=1.6.6.0, Culture=neutral, processorArchitecture=MSIL"
537+
"AssemblyAsmDisplayName" = "8:lw_common, Version=1.6.10.0, Culture=neutral, processorArchitecture=MSIL"
538538
"ScatterAssemblies"
539539
{
540-
"_F773D0E76058479A0C871FCAFC64A8B0"
540+
"_C8B46DF279E1B4F613E1AB160AF480C8"
541541
{
542542
"Name" = "8:lw_common.dll"
543543
"Attributes" = "3:512"
@@ -639,15 +639,15 @@
639639
{
640640
"Name" = "8:Microsoft Visual Studio"
641641
"ProductName" = "8:Log Wizard Setup"
642-
"ProductCode" = "8:{A31B36F3-0EC0-47DD-AEC2-B35FE1241936}"
643-
"PackageCode" = "8:{C9C63DC2-8675-443A-BE0F-45FC13EC8F31}"
642+
"ProductCode" = "8:{279F684F-E1D9-42B3-B9AC-CF6C1E39020A}"
643+
"PackageCode" = "8:{B3422EB7-B1A3-423A-B766-A248B309A8B8}"
644644
"UpgradeCode" = "8:{0E5BB812-A969-415B-9362-F64234C67C4A}"
645645
"AspNetVersion" = "8:4.0.30319.0"
646646
"RestartWWWService" = "11:FALSE"
647647
"RemovePreviousVersions" = "11:TRUE"
648648
"DetectNewerInstalledVersion" = "11:TRUE"
649649
"InstallAllUsers" = "11:FALSE"
650-
"ProductVersion" = "8:1.6.8"
650+
"ProductVersion" = "8:1.6.10"
651651
"Manufacturer" = "8:John Torjo"
652652
"ARPHELPTELEPHONE" = "8:"
653653
"ARPHELPLINK" = "8:"
@@ -1217,7 +1217,7 @@
12171217
}
12181218
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_900BA54346A2479085BF08862BE89061"
12191219
{
1220-
"SourcePath" = "8:..\\obj\\x64\\Dbg64\\LogWizard.exe"
1220+
"SourcePath" = "8:..\\obj\\x64\\Release64\\LogWizard.exe"
12211221
"TargetName" = "8:"
12221222
"Tag" = "8:"
12231223
"Folder" = "8:_E297CB39A550491681319D6F014A659B"

‎src/lw_common/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.6.8.0")]
36-
[assembly: AssemblyFileVersion("1.6.8.0")]
35+
[assembly: AssemblyVersion("1.6.10.0")]
36+
[assembly: AssemblyFileVersion("1.6.10.0")]

‎src/lw_common/util/util.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,13 +1030,12 @@ private static string old_local_dir() {
10301030

10311031
static public void set_current_dir() {
10321032
if (!is_debug) {
1033-
// 1.6.5+ use the Local dir, instead of Roaming - https://github.com/jtorjo/logwizard/issues/3
1034-
if (File.Exists(old_local_dir() + "logwizard_user.txt")) {
1035-
File.Move( old_local_dir() + "logwizard_user.txt", local_dir() + "logwizard_user.txt");
1036-
}
1037-
10381033
try {
10391034
Directory.CreateDirectory(local_dir());
1035+
// 1.6.10+ use the Local dir, instead of Roaming - https://github.com/jtorjo/logwizard/issues/3
1036+
if (File.Exists(old_local_dir() + "logwizard_user.txt")) {
1037+
File.Move( old_local_dir() + "logwizard_user.txt", local_dir() + "logwizard_user.txt");
1038+
}
10401039
} catch {
10411040
}
10421041

0 commit comments

Comments
 (0)