diff --git a/src/LwFileAssociations/Properties/AssemblyInfo.cs b/src/LwFileAssociations/Properties/AssemblyInfo.cs index 209dc4c..d9f1b21 100644 --- a/src/LwFileAssociations/Properties/AssemblyInfo.cs +++ b/src/LwFileAssociations/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.15.0")] -[assembly: AssemblyFileVersion("1.8.15.0")] +[assembly: AssemblyVersion("1.8.16.0")] +[assembly: AssemblyFileVersion("1.8.16.0")] diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index 3a5d52b..a826f18 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -50,5 +50,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.15.0")] -[assembly: AssemblyFileVersion("1.8.15.0")] +[assembly: AssemblyVersion("1.8.16.0")] +[assembly: AssemblyFileVersion("1.8.16.0")] diff --git a/src/docs/history.md b/src/docs/history.md index f444488..fe650ea 100644 --- a/src/docs/history.md +++ b/src/docs/history.md @@ -1,4 +1,6 @@ +1.8.16 +- fixes: when setup kit run first time, did not load setup sample correctly 1.8.15 diff --git a/src/logwizardsetup/logwizardsetup.vdproj b/src/logwizardsetup/logwizardsetup.vdproj index b975775..215226a 100644 --- a/src/logwizardsetup/logwizardsetup.vdproj +++ b/src/logwizardsetup/logwizardsetup.vdproj @@ -13,24 +13,6 @@ "SccProvider" = "8:" "Hierarchy" { - "Entry" - { - "MsmKey" = "8:_02B8F8382B65D40F6B6A3A95FFADACBB" - "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_02B8F8382B65D40F6B6A3A95FFADACBB" - "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_02B8F8382B65D40F6B6A3A95FFADACBB" - "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" - "MsmSig" = "8:_UNDEFINED" - } "Entry" { "MsmKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" @@ -105,78 +87,90 @@ } "Entry" { - "MsmKey" = "8:_539C02429D956E8FBF4DF77D62D41C4E" - "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" + "MsmKey" = "8:_65633CB2F15B47949BBA26A63700E785" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_539C02429D956E8FBF4DF77D62D41C4E" + "MsmKey" = "8:_820C961080BECE943B0CBB285A1209BA" "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_539C02429D956E8FBF4DF77D62D41C4E" - "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" + "MsmKey" = "8:_89B4AC6DB39740B97792E984214287FD" + "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_65633CB2F15B47949BBA26A63700E785" + "MsmKey" = "8:_900BA54346A2479085BF08862BE89061" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_820C961080BECE943B0CBB285A1209BA" - "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" + "MsmKey" = "8:_966B495A39D8FF43968A2C8EACD91BE1" + "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_89B4AC6DB39740B97792E984214287FD" - "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" + "MsmKey" = "8:_966B495A39D8FF43968A2C8EACD91BE1" + "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_900BA54346A2479085BF08862BE89061" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_B335AE1919BB91BBC2AFE5727C613BF2" + "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_966B495A39D8FF43968A2C8EACD91BE1" - "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" + "MsmKey" = "8:_B335AE1919BB91BBC2AFE5727C613BF2" + "OwnerKey" = "8:_1672BD01B03E44A57D45307329B3E68E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_966B495A39D8FF43968A2C8EACD91BE1" - "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" + "MsmKey" = "8:_B335AE1919BB91BBC2AFE5727C613BF2" + "OwnerKey" = "8:_89B4AC6DB39740B97792E984214287FD" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ACC42FCA563B08AB5DBE4626477480B2" + "MsmKey" = "8:_B335AE1919BB91BBC2AFE5727C613BF2" + "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B335AE1919BB91BBC2AFE5727C613BF2" "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ACC42FCA563B08AB5DBE4626477480B2" - "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" + "MsmKey" = "8:_C065ACDBA66E8B30899AECA33A5A051E" + "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ACC42FCA563B08AB5DBE4626477480B2" + "MsmKey" = "8:_C065ACDBA66E8B30899AECA33A5A051E" "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_C065ACDBA66E8B30899AECA33A5A051E" + "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" "MsmSig" = "8:_UNDEFINED" @@ -189,50 +183,56 @@ } "Entry" { - "MsmKey" = "8:_D2E59C7D7FA78714FF03DC7638387E2D" + "MsmKey" = "8:_D2A3C8165DCF15D32089A99546CBF23E" "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2E59C7D7FA78714FF03DC7638387E2D" - "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" + "MsmKey" = "8:_D2A3C8165DCF15D32089A99546CBF23E" + "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D865CF1828E3ADACD3B7E1ED3DFDB9C6" - "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" + "MsmKey" = "8:_D2A3C8165DCF15D32089A99546CBF23E" + "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EBB3835E85BC4968DB6EDB4D167F1B5F" + "MsmKey" = "8:_D2E59C7D7FA78714FF03DC7638387E2D" "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EBB3835E85BC4968DB6EDB4D167F1B5F" - "OwnerKey" = "8:_1672BD01B03E44A57D45307329B3E68E" + "MsmKey" = "8:_D2E59C7D7FA78714FF03DC7638387E2D" + "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EBB3835E85BC4968DB6EDB4D167F1B5F" - "OwnerKey" = "8:_89B4AC6DB39740B97792E984214287FD" + "MsmKey" = "8:_D865CF1828E3ADACD3B7E1ED3DFDB9C6" + "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EBB3835E85BC4968DB6EDB4D167F1B5F" + "MsmKey" = "8:_FA145F5AF65090E3F4A9D3A2366E2DD8" + "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FA145F5AF65090E3F4A9D3A2366E2DD8" "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_EBB3835E85BC4968DB6EDB4D167F1B5F" - "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" + "MsmKey" = "8:_FA145F5AF65090E3F4A9D3A2366E2DD8" + "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -244,97 +244,97 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_820C961080BECE943B0CBB285A1209BA" + "OwnerKey" = "8:_1672BD01B03E44A57D45307329B3E68E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_091F0B6BEDCDFF8BECF32823AB47EF09" + "OwnerKey" = "8:_89B4AC6DB39740B97792E984214287FD" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" + "OwnerKey" = "8:_D865CF1828E3ADACD3B7E1ED3DFDB9C6" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D2E59C7D7FA78714FF03DC7638387E2D" + "OwnerKey" = "8:_424CBE4839F866CCBBD13C8537810B6A" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1BD61D6EEEDCF9C461BF2F745AED1697" + "OwnerKey" = "8:_820C961080BECE943B0CBB285A1209BA" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_22E505A97FF6358D681DFC3888FC73C8" + "OwnerKey" = "8:_091F0B6BEDCDFF8BECF32823AB47EF09" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_966B495A39D8FF43968A2C8EACD91BE1" + "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1672BD01B03E44A57D45307329B3E68E" + "OwnerKey" = "8:_C8B46DF279E1B4F613E1AB160AF480C8" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_89B4AC6DB39740B97792E984214287FD" + "OwnerKey" = "8:_B335AE1919BB91BBC2AFE5727C613BF2" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D865CF1828E3ADACD3B7E1ED3DFDB9C6" + "OwnerKey" = "8:_D2A3C8165DCF15D32089A99546CBF23E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_424CBE4839F866CCBBD13C8537810B6A" + "OwnerKey" = "8:_D2E59C7D7FA78714FF03DC7638387E2D" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0381E054C8674E65AFFF4042D1EADEE4" + "OwnerKey" = "8:_FA145F5AF65090E3F4A9D3A2366E2DD8" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EBB3835E85BC4968DB6EDB4D167F1B5F" + "OwnerKey" = "8:_1BD61D6EEEDCF9C461BF2F745AED1697" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_539C02429D956E8FBF4DF77D62D41C4E" + "OwnerKey" = "8:_C065ACDBA66E8B30899AECA33A5A051E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_02B8F8382B65D40F6B6A3A95FFADACBB" + "OwnerKey" = "8:_22E505A97FF6358D681DFC3888FC73C8" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_ACC42FCA563B08AB5DBE4626477480B2" + "OwnerKey" = "8:_966B495A39D8FF43968A2C8EACD91BE1" "MsmSig" = "8:_UNDEFINED" } } @@ -510,37 +510,6 @@ } "File" { - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_02B8F8382B65D40F6B6A3A95FFADACBB" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_02B8F8382B65D40F6B6A3A95FFADACBB" - { - "Name" = "8:log4net.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:log4net.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_E297CB39A550491681319D6F014A659B" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_091F0B6BEDCDFF8BECF32823AB47EF09" { "AssemblyRegister" = "3:1" @@ -696,20 +665,40 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_539C02429D956E8FBF4DF77D62D41C4E" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_65633CB2F15B47949BBA26A63700E785" + { + "SourcePath" = "8:..\\icons\\app.ico" + "TargetName" = "8:app.ico" + "Tag" = "8:" + "Folder" = "8:_E297CB39A550491681319D6F014A659B" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_820C961080BECE943B0CBB285A1209BA" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ObjectListView_lw, Version=2.8.1.31571, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_539C02429D956E8FBF4DF77D62D41C4E" + "_820C961080BECE943B0CBB285A1209BA" { - "Name" = "8:Oracle.ManagedDataAccess.dll" + "Name" = "8:ObjectListView_lw.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Oracle.ManagedDataAccess.dll" + "SourcePath" = "8:ObjectListView_lw.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -727,10 +716,21 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_65633CB2F15B47949BBA26A63700E785" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_89B4AC6DB39740B97792E984214287FD" { - "SourcePath" = "8:..\\icons\\app.ico" - "TargetName" = "8:app.ico" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Data.SQLite.EF6, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_89B4AC6DB39740B97792E984214287FD" + { + "Name" = "8:System.Data.SQLite.EF6.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.Data.SQLite.EF6.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" "Condition" = "8:" @@ -744,23 +744,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_820C961080BECE943B0CBB285A1209BA" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_966B495A39D8FF43968A2C8EACD91BE1" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ObjectListView_lw, Version=2.8.1.27817, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ColorPicker, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_820C961080BECE943B0CBB285A1209BA" + "_966B495A39D8FF43968A2C8EACD91BE1" { - "Name" = "8:ObjectListView_lw.dll" + "Name" = "8:ColorPicker.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:ObjectListView_lw.dll" + "SourcePath" = "8:ColorPicker.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -778,20 +778,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_89B4AC6DB39740B97792E984214287FD" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B335AE1919BB91BBC2AFE5727C613BF2" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Data.SQLite.EF6, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" "ScatterAssemblies" { - "_89B4AC6DB39740B97792E984214287FD" + "_B335AE1919BB91BBC2AFE5727C613BF2" { - "Name" = "8:System.Data.SQLite.EF6.dll" + "Name" = "8:System.Data.SQLite.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Data.SQLite.EF6.dll" + "SourcePath" = "8:System.Data.SQLite.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -809,20 +809,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_966B495A39D8FF43968A2C8EACD91BE1" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C065ACDBA66E8B30899AECA33A5A051E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ColorPicker, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:fastJSON, Version=2.1.0.0, Culture=neutral, PublicKeyToken=6b75a806b86095cd, processorArchitecture=MSIL" "ScatterAssemblies" { - "_966B495A39D8FF43968A2C8EACD91BE1" + "_C065ACDBA66E8B30899AECA33A5A051E" { - "Name" = "8:ColorPicker.dll" + "Name" = "8:fastJSON.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:ColorPicker.dll" + "SourcePath" = "8:fastJSON.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -840,20 +840,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ACC42FCA563B08AB5DBE4626477480B2" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C8B46DF279E1B4F613E1AB160AF480C8" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:fastJSON, Version=2.1.0.0, Culture=neutral, PublicKeyToken=6b75a806b86095cd, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:lw_common, Version=1.8.16.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_ACC42FCA563B08AB5DBE4626477480B2" + "_C8B46DF279E1B4F613E1AB160AF480C8" { - "Name" = "8:fastJSON.dll" + "Name" = "8:lw_common.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:fastJSON.dll" + "SourcePath" = "8:lw_common.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -871,20 +871,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C8B46DF279E1B4F613E1AB160AF480C8" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D2A3C8165DCF15D32089A99546CBF23E" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:lw_common, Version=1.8.15.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Oracle.ManagedDataAccess, Version=4.121.2.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL" "ScatterAssemblies" { - "_C8B46DF279E1B4F613E1AB160AF480C8" + "_D2A3C8165DCF15D32089A99546CBF23E" { - "Name" = "8:lw_common.dll" + "Name" = "8:Oracle.ManagedDataAccess.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:lw_common.dll" + "SourcePath" = "8:Oracle.ManagedDataAccess.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -906,7 +906,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ObjectListView_lw, Version=2.8.1.27817, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ObjectListView_lw, Version=2.8.1.31571, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { "_D2E59C7D7FA78714FF03DC7638387E2D" @@ -964,20 +964,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EBB3835E85BC4968DB6EDB4D167F1B5F" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FA145F5AF65090E3F4A9D3A2366E2DD8" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Data.SQLite, Version=1.0.99.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_EBB3835E85BC4968DB6EDB4D167F1B5F" + "_FA145F5AF65090E3F4A9D3A2366E2DD8" { - "Name" = "8:System.Data.SQLite.dll" + "Name" = "8:log4net.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Data.SQLite.dll" + "SourcePath" = "8:log4net.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -1073,15 +1073,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Log Wizard Setup" - "ProductCode" = "8:{DBBC8556-C28C-4059-B96A-DB974B3C5B14}" - "PackageCode" = "8:{D1076C2E-82BE-4C75-AF85-F508614D80AC}" + "ProductCode" = "8:{47CD7E02-01C3-4051-A4F8-CD69D8FD7B66}" + "PackageCode" = "8:{E62845ED-9272-4BF6-8FBB-6C07E495FDD7}" "UpgradeCode" = "8:{0E5BB812-A969-415B-9362-F64234C67C4A}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.8.15" + "ProductVersion" = "8:1.8.16" "Manufacturer" = "8:John Torjo" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -1623,7 +1623,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0381E054C8674E65AFFF4042D1EADEE4" { - "SourcePath" = "8:..\\LwFileAssociations\\obj\\Release\\LwFileAssociations.exe" + "SourcePath" = "8:..\\LwFileAssociations\\obj\\Debug\\LwFileAssociations.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -1679,7 +1679,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_900BA54346A2479085BF08862BE89061" { - "SourcePath" = "8:..\\obj\\x86\\Release\\LogWizard.exe" + "SourcePath" = "8:..\\obj\\x64\\Dbg64\\LogWizard.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" diff --git a/src/lw_common/Properties/AssemblyInfo.cs b/src/lw_common/Properties/AssemblyInfo.cs index 8875fd8..ccf2293 100644 --- a/src/lw_common/Properties/AssemblyInfo.cs +++ b/src/lw_common/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.15.0")] -[assembly: AssemblyFileVersion("1.8.15.0")] +[assembly: AssemblyVersion("1.8.16.0")] +[assembly: AssemblyFileVersion("1.8.16.0")] diff --git a/src/lw_common/parse_config/parse_config.cs b/src/lw_common/parse_config/parse_config.cs index 182e03c..57c3a7f 100644 --- a/src/lw_common/parse_config/parse_config.cs +++ b/src/lw_common/parse_config/parse_config.cs @@ -54,6 +54,10 @@ public static string find_config_file(string file_name_or_dir) { if (File.Exists(file_name_or_dir)) dir = new FileInfo(file_name_or_dir).DirectoryName; + // 1.8.16 - sample files' context+syntax are pre-set in the settings file + if (dir.ToLower().EndsWith("logwizard\\samples")) + return ""; + // gather possible .config files - order counts! List config_files = new List(); if (File.Exists(file_name_or_dir + ".config")) diff --git a/src/packages/repositories.config b/src/packages/repositories.config index b2dc8e8..7e39d1f 100644 --- a/src/packages/repositories.config +++ b/src/packages/repositories.config @@ -4,4 +4,7 @@ + + + \ No newline at end of file diff --git a/src/tests/test_ui/Properties/AssemblyInfo.cs b/src/tests/test_ui/Properties/AssemblyInfo.cs index 29da570..3675f14 100644 --- a/src/tests/test_ui/Properties/AssemblyInfo.cs +++ b/src/tests/test_ui/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.15.0")] -[assembly: AssemblyFileVersion("1.8.15.0")] +[assembly: AssemblyVersion("1.8.16.0")] +[assembly: AssemblyFileVersion("1.8.16.0")] diff --git a/src/ui/log_wizard.cs b/src/ui/log_wizard.cs index 3c13bd7..1106fae 100644 --- a/src/ui/log_wizard.cs +++ b/src/ui/log_wizard.cs @@ -1467,7 +1467,7 @@ private void refresh_Tick(object sender, EventArgs ea) { show_tips_.handle_tips(); } } catch (Exception e) { - logger.Error("Refresh error" + e.Message); + logger.Error("Refresh error: " + e.Message); } } @@ -1733,6 +1733,13 @@ private string least_unused_context_name(string prefix) { } } + private void fill_file_default_log_settings(log_settings_string file_settings, string name, string friendly_name) { + file_settings.type.set( log_type.file); + file_settings.name.set(name); + file_settings.friendly_name.set(friendly_name); + file_settings.guid.set( Guid.NewGuid().ToString()); + } + private void on_new_file_log(string name, string friendly_name) { string guid = sett_.get("file_to_guid." + name); if (guid != "") @@ -1740,16 +1747,19 @@ private void on_new_file_log(string name, string friendly_name) { else { // at this point, we know it's a ***new*** file log_settings_string file_settings = new log_settings_string(""); - - // 1.8.11+ see if any config file found - var config_file = parse_config.find_config_file(name); - if (config_file != "") - file_settings = parse_config.load_config_file(config_file) ; - - file_settings.type.set( log_type.file); - file_settings.name.set(name); - file_settings.friendly_name.set(friendly_name); - file_settings.guid.set( Guid.NewGuid().ToString()); + fill_file_default_log_settings(file_settings, name, friendly_name); + + // 1.8.16+ - once we have a context, keep using that (since the user can modify things to it) + ui_context log_ctx = settings_to_context(file_settings); + bool already_has_context = log_ctx.name != "Default"; + if (!already_has_context) { + // 1.8.11+ see if any config file found + var config_file = parse_config.find_config_file(name); + if (config_file != "") { + file_settings = parse_config.load_config_file(config_file); + fill_file_default_log_settings(file_settings, name, friendly_name); + } + } create_text_reader(file_settings); } }