From 114d139466bae0fee87bb152d6462fa92684de37 Mon Sep 17 00:00:00 2001 From: jamaa <90166+jamaa@users.noreply.github.com> Date: Sat, 11 Nov 2023 15:25:22 +0100 Subject: [PATCH] bump version to v2.6.0 --- setup/Wave.Setup.vdproj | 206 +++++++++++++++--------------- source/CHANGELOG.md | 4 +- source/My Project/AssemblyInfo.vb | 6 +- 3 files changed, 108 insertions(+), 108 deletions(-) diff --git a/setup/Wave.Setup.vdproj b/setup/Wave.Setup.vdproj index 030f25eb..4d99bedf 100644 --- a/setup/Wave.Setup.vdproj +++ b/setup/Wave.Setup.vdproj @@ -21,12 +21,6 @@ } "Entry" { - "MsmKey" = "8:_051AC2210BBCDDC464F391E803231661" - "OwnerKey" = "8:_152A841758E942AE8286A4A2A0CCDD82" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_0F197AD7D0A642428F391E9D26095289" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -45,6 +39,12 @@ } "Entry" { + "MsmKey" = "8:_110DFE2C3733E371ABFE1061E184260F" + "OwnerKey" = "8:_152A841758E942AE8286A4A2A0CCDD82" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_13897E2598E244938CC47515C47E88A6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -142,13 +142,13 @@ "Entry" { "MsmKey" = "8:_7EB65CC86E2448158C32B1BE25DE9241" - "OwnerKey" = "8:_B55D3CEAECB3777E85E6824CE6D7EE32" + "OwnerKey" = "8:_B0FEB18BE0E20DD6214010D0F59ABA2F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_7EB65CC86E2448158C32B1BE25DE9241" - "OwnerKey" = "8:_F0AFB176DBF320B5AFC0B890DF96800D" + "OwnerKey" = "8:_110DFE2C3733E371ABFE1061E184260F" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -225,26 +225,26 @@ } "Entry" { - "MsmKey" = "8:_B5382723FA8D2AE3A85A611F08234390" + "MsmKey" = "8:_B0FEB18BE0E20DD6214010D0F59ABA2F" "OwnerKey" = "8:_152A841758E942AE8286A4A2A0CCDD82" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B53838DCCBF84C558B1E198D5CA8CE3F" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_B0FEB18BE0E20DD6214010D0F59ABA2F" + "OwnerKey" = "8:_EB4C7201A5EFE227B2CB97639A41F36E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B55D3CEAECB3777E85E6824CE6D7EE32" + "MsmKey" = "8:_B5382723FA8D2AE3A85A611F08234390" "OwnerKey" = "8:_152A841758E942AE8286A4A2A0CCDD82" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_B55D3CEAECB3777E85E6824CE6D7EE32" - "OwnerKey" = "8:_051AC2210BBCDDC464F391E803231661" + "MsmKey" = "8:_B53838DCCBF84C558B1E198D5CA8CE3F" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -321,6 +321,12 @@ } "Entry" { + "MsmKey" = "8:_EB4C7201A5EFE227B2CB97639A41F36E" + "OwnerKey" = "8:_152A841758E942AE8286A4A2A0CCDD82" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_EE3E7F262421700A0BD0468CED1E336A" "OwnerKey" = "8:_8DC36EE230E22798E785C3E7AEC43CD1" "MsmSig" = "8:_UNDEFINED" @@ -339,12 +345,6 @@ } "Entry" { - "MsmKey" = "8:_F0AFB176DBF320B5AFC0B890DF96800D" - "OwnerKey" = "8:_152A841758E942AE8286A4A2A0CCDD82" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_F5DE7F1676ED4B07B077AAA3C2AEDF49" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -400,19 +400,19 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_051AC2210BBCDDC464F391E803231661" + "OwnerKey" = "8:_EB4C7201A5EFE227B2CB97639A41F36E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_B55D3CEAECB3777E85E6824CE6D7EE32" + "OwnerKey" = "8:_B0FEB18BE0E20DD6214010D0F59ABA2F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F0AFB176DBF320B5AFC0B890DF96800D" + "OwnerKey" = "8:_110DFE2C3733E371ABFE1061E184260F" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -607,21 +607,10 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_051AC2210BBCDDC464F391E803231661" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F197AD7D0A642428F391E9D26095289" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:TeeChart.Xaml.WPF, Version=4.2022.8.23, Culture=neutral, PublicKeyToken=9406d226170aa089, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_051AC2210BBCDDC464F391E803231661" - { - "Name" = "8:TeeChart.Xaml.WPF.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:TeeChart.Xaml.WPF.dll" - "TargetName" = "8:" + "SourcePath" = "8:assets\\ten.ico" + "TargetName" = "8:ten.ico" "Tag" = "8:" "Folder" = "8:_1335334A1EB042F3AB241758004683C2" "Condition" = "8:" @@ -634,14 +623,25 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "Exclude" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F197AD7D0A642428F391E9D26095289" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0F7D7B4F60E7EF99AF52D9DF9433D636" { - "SourcePath" = "8:assets\\ten.ico" - "TargetName" = "8:ten.ico" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:DHI.Generic.MikeZero.EUM, Version=21.0.0.0, Culture=neutral, PublicKeyToken=c513450b5d0bf0bf, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_0F7D7B4F60E7EF99AF52D9DF9433D636" + { + "Name" = "8:DHI.Generic.MikeZero.EUM.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:DHI.Generic.MikeZero.EUM.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_1335334A1EB042F3AB241758004683C2" "Condition" = "8:" @@ -654,24 +654,24 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:FALSE" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0F7D7B4F60E7EF99AF52D9DF9433D636" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_110DFE2C3733E371ABFE1061E184260F" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:DHI.Generic.MikeZero.EUM, Version=21.0.0.0, Culture=neutral, PublicKeyToken=c513450b5d0bf0bf, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:TeeChart, Version=4.2023.4.18, Culture=neutral, PublicKeyToken=9c8126276c77bdb7, processorArchitecture=MSIL" "ScatterAssemblies" { - "_0F7D7B4F60E7EF99AF52D9DF9433D636" + "_110DFE2C3733E371ABFE1061E184260F" { - "Name" = "8:DHI.Generic.MikeZero.EUM.dll" + "Name" = "8:TeeChart.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:DHI.Generic.MikeZero.EUM.dll" + "SourcePath" = "8:TeeChart.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_1335334A1EB042F3AB241758004683C2" @@ -1308,20 +1308,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B5382723FA8D2AE3A85A611F08234390" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B0FEB18BE0E20DD6214010D0F59ABA2F" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:MathParserNet, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:TeeChart.WPF, Version=4.2023.4.18, Culture=neutral, PublicKeyToken=98e8c3f289a4e286, processorArchitecture=MSIL" "ScatterAssemblies" { - "_B5382723FA8D2AE3A85A611F08234390" + "_B0FEB18BE0E20DD6214010D0F59ABA2F" { - "Name" = "8:MathParserNet.dll" + "Name" = "8:TeeChart.WPF.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:MathParserNet.dll" + "SourcePath" = "8:TeeChart.WPF.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_1335334A1EB042F3AB241758004683C2" @@ -1339,10 +1339,21 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B53838DCCBF84C558B1E198D5CA8CE3F" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B5382723FA8D2AE3A85A611F08234390" { - "SourcePath" = "8:..\\source\\lib\\Newtonsoft.Json\\Newtonsoft.Json.LICENSE.md" - "TargetName" = "8:Newtonsoft.Json.LICENSE.md" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:MathParserNet, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_B5382723FA8D2AE3A85A611F08234390" + { + "Name" = "8:MathParserNet.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:MathParserNet.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_1335334A1EB042F3AB241758004683C2" "Condition" = "8:" @@ -1356,24 +1367,13 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B55D3CEAECB3777E85E6824CE6D7EE32" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B53838DCCBF84C558B1E198D5CA8CE3F" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:TeeChart.WPF, Version=4.2022.8.23, Culture=neutral, PublicKeyToken=98e8c3f289a4e286, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_B55D3CEAECB3777E85E6824CE6D7EE32" - { - "Name" = "8:TeeChart.WPF.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:TeeChart.WPF.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\source\\lib\\Newtonsoft.Json\\Newtonsoft.Json.LICENSE.md" + "TargetName" = "8:Newtonsoft.Json.LICENSE.md" "Tag" = "8:" "Folder" = "8:_1335334A1EB042F3AB241758004683C2" "Condition" = "8:" @@ -1387,7 +1387,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C012FB83DF6D4A7782E3AF17CFF0B0E6" @@ -1574,20 +1574,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EE3E7F262421700A0BD0468CED1E336A" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EB4C7201A5EFE227B2CB97639A41F36E" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:TeeChart.Xaml.WPF, Version=4.2023.4.18, Culture=neutral, PublicKeyToken=9406d226170aa089, processorArchitecture=MSIL" "ScatterAssemblies" { - "_EE3E7F262421700A0BD0468CED1E336A" + "_EB4C7201A5EFE227B2CB97639A41F36E" { - "Name" = "8:System.IO.Compression.dll" + "Name" = "8:TeeChart.Xaml.WPF.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.IO.Compression.dll" + "SourcePath" = "8:TeeChart.Xaml.WPF.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_1335334A1EB042F3AB241758004683C2" @@ -1601,14 +1601,25 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EF238C7BD2FE4408AF2DCD5E2B45887B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EE3E7F262421700A0BD0468CED1E336A" { - "SourcePath" = "8:..\\source\\bin\\x64\\Release\\ufs.dll" - "TargetName" = "8:ufs.dll" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_EE3E7F262421700A0BD0468CED1E336A" + { + "Name" = "8:System.IO.Compression.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.IO.Compression.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_1335334A1EB042F3AB241758004683C2" "Condition" = "8:" @@ -1621,25 +1632,14 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F0AFB176DBF320B5AFC0B890DF96800D" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EF238C7BD2FE4408AF2DCD5E2B45887B" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:TeeChart, Version=4.2022.8.23, Culture=neutral, PublicKeyToken=9c8126276c77bdb7, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_F0AFB176DBF320B5AFC0B890DF96800D" - { - "Name" = "8:TeeChart.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:TeeChart.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\source\\bin\\x64\\Release\\ufs.dll" + "TargetName" = "8:ufs.dll" "Tag" = "8:" "Folder" = "8:_1335334A1EB042F3AB241758004683C2" "Condition" = "8:" @@ -1653,7 +1653,7 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F5DE7F1676ED4B07B077AAA3C2AEDF49" @@ -1869,15 +1869,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:BlueM.Wave" - "ProductCode" = "8:{B988E5C6-EA2B-4C39-9F3F-B0E21344FFA3}" - "PackageCode" = "8:{A0BE46D1-3863-4536-AB7E-83B48B68127B}" + "ProductCode" = "8:{434612D9-F80E-4A96-9632-056F334B70D1}" + "PackageCode" = "8:{1160FBCE-03F7-45C5-BB9A-25FB2BCC6AE4}" "UpgradeCode" = "8:{8AC270DC-0E8D-4087-98AB-3A2C358096B9}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:2.5.0" + "ProductVersion" = "8:2.6.0" "Manufacturer" = "8:BlueM Dev Group" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:https://wiki.bluemodel.org/index.php/BlueM.Wave" diff --git a/source/CHANGELOG.md b/source/CHANGELOG.md index b93934dc..ceca87a5 100644 --- a/source/CHANGELOG.md +++ b/source/CHANGELOG.md @@ -1,10 +1,10 @@ BlueM.Wave Release Notes ======================== -Development +Version 2.6.0 ------------- NEW: -* Added a new series selection dialog for known (non-CSV) file types +* Added a new, simpler, series selection dialog for known file types * Added the ability to reorder series from within the Time Series Properties window * Wave project file (WVP): * Added support for additional series options in WVP files #117 diff --git a/source/My Project/AssemblyInfo.vb b/source/My Project/AssemblyInfo.vb index 8a997b6b..55902b6e 100644 --- a/source/My Project/AssemblyInfo.vb +++ b/source/My Project/AssemblyInfo.vb @@ -1,4 +1,4 @@ -Imports System +Imports System Imports System.Reflection Imports System.Runtime.InteropServices @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - -' + +'