From da78467e2b2b1d725e4fa642fd906591170bbd43 Mon Sep 17 00:00:00 2001 From: jtorjo Date: Tue, 10 Nov 2015 02:55:01 +0200 Subject: [PATCH] 1.5.1 - updated release no. --- Properties/AssemblyInfo.cs | 4 +- docs/history.txt | 2 +- logwizardsetup/logwizardsetup.vdproj | 173 +++++++++++++++++---------- lw_common/Properties/AssemblyInfo.cs | 4 +- test_ui/Properties/AssemblyInfo.cs | 4 +- 5 files changed, 118 insertions(+), 69 deletions(-) diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 2c2fbdd..d63da6e 100644 --- a/Properties/AssemblyInfo.cs +++ b/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.4.9.0")] -[assembly: AssemblyFileVersion("1.4.9.0")] +[assembly: AssemblyVersion("1.5.1.0")] +[assembly: AssemblyFileVersion("1.5.1.0")] diff --git a/docs/history.txt b/docs/history.txt index 502c013..ea1f656 100644 --- a/docs/history.txt +++ b/docs/history.txt @@ -1,6 +1,6 @@ -1.5.0 +1.5.1 - retested getting release info from github - released to git diff --git a/logwizardsetup/logwizardsetup.vdproj b/logwizardsetup/logwizardsetup.vdproj index fe03d0f..d26bc8b 100644 --- a/logwizardsetup/logwizardsetup.vdproj +++ b/logwizardsetup/logwizardsetup.vdproj @@ -15,80 +15,92 @@ { "Entry" { - "MsmKey" = "8:_187FEA7CF0B3BD29BEB9725EAA603ED5" + "MsmKey" = "8:_33AD9CDAB33406EDC1F9886FEB9E6294" "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_187FEA7CF0B3BD29BEB9725EAA603ED5" - "OwnerKey" = "8:_70135191B71EE9820831F349BF8A823E" + "MsmKey" = "8:_33AD9CDAB33406EDC1F9886FEB9E6294" + "OwnerKey" = "8:_92392AC5156DEBEF4C502203C9121527" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_264ACE8638B5C7A7BA9DDD169AFBE2E3" + "MsmKey" = "8:_65633CB2F15B47949BBA26A63700E785" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_733F8E262119CEEA5A2A6956F6E03070" "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_264ACE8638B5C7A7BA9DDD169AFBE2E3" - "OwnerKey" = "8:_70135191B71EE9820831F349BF8A823E" + "MsmKey" = "8:_733F8E262119CEEA5A2A6956F6E03070" + "OwnerKey" = "8:_92392AC5156DEBEF4C502203C9121527" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2819FF1B498DBEECB1683E5459B44DAB" + "MsmKey" = "8:_73FF3A1F6C3530BE3286143D5769BD46" "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2819FF1B498DBEECB1683E5459B44DAB" - "OwnerKey" = "8:_70135191B71EE9820831F349BF8A823E" + "MsmKey" = "8:_73FF3A1F6C3530BE3286143D5769BD46" + "OwnerKey" = "8:_92392AC5156DEBEF4C502203C9121527" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_52B4C67E9B47794E8460A7675BC50CCC" + "MsmKey" = "8:_8E050ABDC6FBAEE6FFF065E9FA6746D9" "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_52B4C67E9B47794E8460A7675BC50CCC" - "OwnerKey" = "8:_70135191B71EE9820831F349BF8A823E" + "MsmKey" = "8:_8E050ABDC6FBAEE6FFF065E9FA6746D9" + "OwnerKey" = "8:_92392AC5156DEBEF4C502203C9121527" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_65633CB2F15B47949BBA26A63700E785" + "MsmKey" = "8:_900BA54346A2479085BF08862BE89061" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_69F744972D2505679D513EB2818224FF" + "MsmKey" = "8:_92392AC5156DEBEF4C502203C9121527" + "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_D4EFFC738C161384F5CED85A88E3E6B9" "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_69F744972D2505679D513EB2818224FF" - "OwnerKey" = "8:_70135191B71EE9820831F349BF8A823E" + "MsmKey" = "8:_D4EFFC738C161384F5CED85A88E3E6B9" + "OwnerKey" = "8:_92392AC5156DEBEF4C502203C9121527" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_70135191B71EE9820831F349BF8A823E" + "MsmKey" = "8:_F477B7A595FB60E313994D0B28C89E68" "OwnerKey" = "8:_900BA54346A2479085BF08862BE89061" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_900BA54346A2479085BF08862BE89061" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_F477B7A595FB60E313994D0B28C89E68" + "OwnerKey" = "8:_92392AC5156DEBEF4C502203C9121527" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -100,37 +112,43 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_70135191B71EE9820831F349BF8A823E" + "OwnerKey" = "8:_92392AC5156DEBEF4C502203C9121527" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2819FF1B498DBEECB1683E5459B44DAB" + "OwnerKey" = "8:_733F8E262119CEEA5A2A6956F6E03070" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_187FEA7CF0B3BD29BEB9725EAA603ED5" + "OwnerKey" = "8:_D4EFFC738C161384F5CED85A88E3E6B9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_264ACE8638B5C7A7BA9DDD169AFBE2E3" + "OwnerKey" = "8:_F477B7A595FB60E313994D0B28C89E68" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_69F744972D2505679D513EB2818224FF" + "OwnerKey" = "8:_8E050ABDC6FBAEE6FFF065E9FA6746D9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_52B4C67E9B47794E8460A7675BC50CCC" + "OwnerKey" = "8:_33AD9CDAB33406EDC1F9886FEB9E6294" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_73FF3A1F6C3530BE3286143D5769BD46" "MsmSig" = "8:_UNDEFINED" } } @@ -306,20 +324,20 @@ } "File" { - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_187FEA7CF0B3BD29BEB9725EAA603ED5" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_33AD9CDAB33406EDC1F9886FEB9E6294" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:EncodingTools, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:log4net_1_2_11, Version=1.2.12.2, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_187FEA7CF0B3BD29BEB9725EAA603ED5" + "_33AD9CDAB33406EDC1F9886FEB9E6294" { - "Name" = "8:EncodingTools.dll" + "Name" = "8:log4net_1_2_11.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:EncodingTools.dll" + "SourcePath" = "8:log4net_1_2_11.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -337,20 +355,40 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_264ACE8638B5C7A7BA9DDD169AFBE2E3" + "{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}:_733F8E262119CEEA5A2A6956F6E03070" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ObjectListView_lw, Version=2.8.1.32182, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_264ACE8638B5C7A7BA9DDD169AFBE2E3" + "_733F8E262119CEEA5A2A6956F6E03070" { - "Name" = "8:ObjectListView_lw.dll" + "Name" = "8:ICSharpCode.SharpZipLib.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:ObjectListView_lw.dll" + "SourcePath" = "8:ICSharpCode.SharpZipLib.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -368,20 +406,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2819FF1B498DBEECB1683E5459B44DAB" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_73FF3A1F6C3530BE3286143D5769BD46" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ColorPicker, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_2819FF1B498DBEECB1683E5459B44DAB" + "_73FF3A1F6C3530BE3286143D5769BD46" { - "Name" = "8:ICSharpCode.SharpZipLib.dll" + "Name" = "8:ColorPicker.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:ICSharpCode.SharpZipLib.dll" + "SourcePath" = "8:ColorPicker.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -399,20 +437,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_52B4C67E9B47794E8460A7675BC50CCC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8E050ABDC6FBAEE6FFF065E9FA6746D9" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ColorPicker, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:ObjectListView_lw, Version=2.8.1.33957, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_52B4C67E9B47794E8460A7675BC50CCC" + "_8E050ABDC6FBAEE6FFF065E9FA6746D9" { - "Name" = "8:ColorPicker.dll" + "Name" = "8:ObjectListView_lw.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:ColorPicker.dll" + "SourcePath" = "8:ObjectListView_lw.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -430,10 +468,21 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_65633CB2F15B47949BBA26A63700E785" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_92392AC5156DEBEF4C502203C9121527" { - "SourcePath" = "8:..\\icons\\app.ico" - "TargetName" = "8:app.ico" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:lw_common, Version=1.4.9.0, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_92392AC5156DEBEF4C502203C9121527" + { + "Name" = "8:lw_common.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:lw_common.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" "Condition" = "8:" @@ -447,23 +496,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_69F744972D2505679D513EB2818224FF" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D4EFFC738C161384F5CED85A88E3E6B9" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:log4net_1_2_11, Version=1.2.12.2, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:fastJSON, Version=2.1.0.0, Culture=neutral, PublicKeyToken=6b75a806b86095cd, processorArchitecture=MSIL" "ScatterAssemblies" { - "_69F744972D2505679D513EB2818224FF" + "_D4EFFC738C161384F5CED85A88E3E6B9" { - "Name" = "8:log4net_1_2_11.dll" + "Name" = "8:fastJSON.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:log4net_1_2_11.dll" + "SourcePath" = "8:fastJSON.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -481,20 +530,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_70135191B71EE9820831F349BF8A823E" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F477B7A595FB60E313994D0B28C89E68" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:lw_common, Version=1.4.8.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:EncodingTools, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_70135191B71EE9820831F349BF8A823E" + "_F477B7A595FB60E313994D0B28C89E68" { - "Name" = "8:lw_common.dll" + "Name" = "8:EncodingTools.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:lw_common.dll" + "SourcePath" = "8:EncodingTools.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E297CB39A550491681319D6F014A659B" @@ -623,15 +672,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Log Wizard Setup" - "ProductCode" = "8:{E977C116-CB9E-4121-98D8-DD37BD7A78CA}" - "PackageCode" = "8:{7EA30A46-5E4B-4E87-B1A5-BD30F9A8157F}" + "ProductCode" = "8:{D1C685F0-99A3-4075-BA16-79ED241F9F20}" + "PackageCode" = "8:{37D41BE5-5792-464F-8230-06D5542852E3}" "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.4.9" + "ProductVersion" = "8:1.5.1" "Manufacturer" = "8:John Torjo" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/lw_common/Properties/AssemblyInfo.cs b/lw_common/Properties/AssemblyInfo.cs index 1957fd1..27cfc60 100644 --- a/lw_common/Properties/AssemblyInfo.cs +++ b/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.4.9.0")] -[assembly: AssemblyFileVersion("1.4.9.0")] +[assembly: AssemblyVersion("1.5.1.0")] +[assembly: AssemblyFileVersion("1.5.1.0")] diff --git a/test_ui/Properties/AssemblyInfo.cs b/test_ui/Properties/AssemblyInfo.cs index 06f4b57..938f61d 100644 --- a/test_ui/Properties/AssemblyInfo.cs +++ b/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.4.9.0")] -[assembly: AssemblyFileVersion("1.4.9.0")] +[assembly: AssemblyVersion("1.5.1.0")] +[assembly: AssemblyFileVersion("1.5.1.0")]