From f3df791a82217b0486f352c6a3889b3436c5cec8 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 10 Jan 2020 14:41:00 +0100 Subject: [PATCH 1/4] Temporary fix for the song list reset Temporary fix for the song list reset described in issue #390. --- VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index 02cfac02..1a173393 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -288,7 +288,9 @@ namespace VocaluxeLib.Menu.SongMenu public void LeaveSelectedCategory() { - _LeaveCategory(); + // Stefan1200: This was implemented with the pull request #359 and is the reason for the bug described in issue #390. + // Currently disabled until we know if this is still needed or we find a better solution! + // _LeaveCategory(); } public virtual void UnloadSkin() {} @@ -425,4 +427,4 @@ namespace VocaluxeLib.Menu.SongMenu } #endregion ThemeEdit } -} \ No newline at end of file +} From de258bebb553eb7ed862e662d831489505b61934 Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Fri, 10 Jan 2020 17:16:14 +0100 Subject: [PATCH 2/4] Fix: x64 build is failing as the sonarcloud plugin has a problem with d:sonar.organization --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8fdf1640..4774c28d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -63,7 +63,7 @@ before_build: choco install "msbuild-sonarqube-runner" -y SonarScanner.MSBuild.exe begin ` /k:"Vocaluxe" ` - /d:sonar.organization="vocaluxe" ` + /o:"vocaluxe" ` /d:sonar.host.url="https://sonarcloud.io" ` /d:sonar.login="$Env:SonarQubeToken" ` /d:"sonar.pullrequest.key=$env:APPVEYOR_PULL_REQUEST_NUMBER" ` @@ -74,7 +74,7 @@ before_build: choco install "msbuild-sonarqube-runner" -y SonarScanner.MSBuild.exe begin ` /k:"Vocaluxe" ` - /d:sonar.organization="vocaluxe" ` + /o:"vocaluxe" ` /d:sonar.host.url="https://sonarcloud.io" ` /v:"$Env:GIT_VERSION_TAG" ` /d:sonar.login="$Env:SonarQubeToken" ` From eef1ea5c55acf554ca5b541971c9de685af51110 Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Fri, 10 Jan 2020 18:07:03 +0100 Subject: [PATCH 3/4] Fix: CLogTest use uninterpolated string as expected value --- Tests/VocaluxeLib/Log/CLogTest.cs | 20 ++++++++++---------- Tests/VocaluxeLib/Log/CLogTest.tt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Tests/VocaluxeLib/Log/CLogTest.cs b/Tests/VocaluxeLib/Log/CLogTest.cs index 56ddf159..48eb5b84 100644 --- a/Tests/VocaluxeLib/Log/CLogTest.cs +++ b/Tests/VocaluxeLib/Log/CLogTest.cs @@ -76,7 +76,7 @@ namespace Tests.VocaluxeLib.Log StringAssert.Contains("Version = " + versionTag, log, "Main log version tag entry wrong"); StringAssert.Contains("[Verbose] " + _TestMessageWithResolvedData, log, "Main log entry wrong"); - StringAssert.Contains(_TestMessageWithData, error, "Error message wrong"); + StringAssert.Contains(_TestMessageWithResolvedData, error, "Error message wrong"); }, ELogLevel.Verbose); @@ -129,7 +129,7 @@ namespace Tests.VocaluxeLib.Log StringAssert.Contains("Version = " + versionTag, log, "Main log version tag entry wrong"); StringAssert.Contains("[Verbose] " + _TestMessageWithResolvedData, log, "Main log entry wrong"); - StringAssert.Contains(_TestMessageWithData, error, "Error message wrong"); + StringAssert.Contains(_TestMessageWithResolvedData, error, "Error message wrong"); }, ELogLevel.Verbose); @@ -287,7 +287,7 @@ namespace Tests.VocaluxeLib.Log StringAssert.Contains("Version = " + versionTag, log, "Main log version tag entry wrong"); StringAssert.Contains("[Debug] " + _TestMessageWithResolvedData, log, "Main log entry wrong"); - StringAssert.Contains(_TestMessageWithData, error, "Error message wrong"); + StringAssert.Contains(_TestMessageWithResolvedData, error, "Error message wrong"); }, ELogLevel.Verbose); @@ -340,7 +340,7 @@ namespace Tests.VocaluxeLib.Log StringAssert.Contains("Version = " + versionTag, log, "Main log version tag entry wrong"); StringAssert.Contains("[Debug] " + _TestMessageWithResolvedData, log, "Main log entry wrong"); - StringAssert.Contains(_TestMessageWithData, error, "Error message wrong"); + StringAssert.Contains(_TestMessageWithResolvedData, error, "Error message wrong"); }, ELogLevel.Verbose); @@ -498,7 +498,7 @@ namespace Tests.VocaluxeLib.Log StringAssert.Contains("Version = " + versionTag, log, "Main log version tag entry wrong"); StringAssert.Contains("[Information] " + _TestMessageWithResolvedData, log, "Main log entry wrong"); - StringAssert.Contains(_TestMessageWithData, error, "Error message wrong"); + StringAssert.Contains(_TestMessageWithResolvedData, error, "Error message wrong"); }, ELogLevel.Verbose); @@ -551,7 +551,7 @@ namespace Tests.VocaluxeLib.Log StringAssert.Contains("Version = " + versionTag, log, "Main log version tag entry wrong"); StringAssert.Contains("[Information] " + _TestMessageWithResolvedData, log, "Main log entry wrong"); - StringAssert.Contains(_TestMessageWithData, error, "Error message wrong"); + StringAssert.Contains(_TestMessageWithResolvedData, error, "Error message wrong"); }, ELogLevel.Verbose); @@ -709,7 +709,7 @@ namespace Tests.VocaluxeLib.Log StringAssert.Contains("Version = " + versionTag, log, "Main log version tag entry wrong"); StringAssert.Contains("[Warning] " + _TestMessageWithResolvedData, log, "Main log entry wrong"); - StringAssert.Contains(_TestMessageWithData, error, "Error message wrong"); + StringAssert.Contains(_TestMessageWithResolvedData, error, "Error message wrong"); }, ELogLevel.Verbose); @@ -762,7 +762,7 @@ namespace Tests.VocaluxeLib.Log StringAssert.Contains("Version = " + versionTag, log, "Main log version tag entry wrong"); StringAssert.Contains("[Warning] " + _TestMessageWithResolvedData, log, "Main log entry wrong"); - StringAssert.Contains(_TestMessageWithData, error, "Error message wrong"); + StringAssert.Contains(_TestMessageWithResolvedData, error, "Error message wrong"); }, ELogLevel.Verbose); @@ -920,7 +920,7 @@ namespace Tests.VocaluxeLib.Log StringAssert.Contains("Version = " + versionTag, log, "Main log version tag entry wrong"); StringAssert.Contains("[Error] " + _TestMessageWithResolvedData, log, "Main log entry wrong"); - StringAssert.Contains(_TestMessageWithData, error, "Error message wrong"); + StringAssert.Contains(_TestMessageWithResolvedData, error, "Error message wrong"); }, ELogLevel.Verbose); @@ -973,7 +973,7 @@ namespace Tests.VocaluxeLib.Log StringAssert.Contains("Version = " + versionTag, log, "Main log version tag entry wrong"); StringAssert.Contains("[Error] " + _TestMessageWithResolvedData, log, "Main log entry wrong"); - StringAssert.Contains(_TestMessageWithData, error, "Error message wrong"); + StringAssert.Contains(_TestMessageWithResolvedData, error, "Error message wrong"); }, ELogLevel.Verbose); diff --git a/Tests/VocaluxeLib/Log/CLogTest.tt b/Tests/VocaluxeLib/Log/CLogTest.tt index fac62cfb..1ca560dd 100644 --- a/Tests/VocaluxeLib/Log/CLogTest.tt +++ b/Tests/VocaluxeLib/Log/CLogTest.tt @@ -101,7 +101,7 @@ namespace Tests.VocaluxeLib.Log StringAssert.Contains("Version = " + versionTag, log, "Main log version tag entry wrong"); StringAssert.Contains("[<#= LogLevel #>] " + <#= WithData?"_TestMessageWithResolvedData":"_TestMessage" #>, log, "Main log entry wrong"); - StringAssert.Contains(<#= WithData?"_TestMessageWithData":"_TestMessage" #>, error, "Error message wrong"); + StringAssert.Contains(<#= WithData?"_TestMessageWithResolvedData":"_TestMessage" #>, error, "Error message wrong"); }, ELogLevel.Verbose); From 22699e05cc8345124ef669fc2446ad4f01e7938a Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Fri, 10 Jan 2020 18:08:54 +0100 Subject: [PATCH 4/4] Fix: CLog._FormatMessageTemplate does not wrap values in double quotes as all the other functions do --- VocaluxeLib/Log/CLog.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VocaluxeLib/Log/CLog.cs b/VocaluxeLib/Log/CLog.cs index 2b78b8cb..6d1d3535 100644 --- a/VocaluxeLib/Log/CLog.cs +++ b/VocaluxeLib/Log/CLog.cs @@ -198,7 +198,7 @@ namespace VocaluxeLib.Log { if (i >= propertyValues.Length) return match.Value; - return propertyValues[i++].ToString(); + return "\"" + propertyValues[i++] + "\""; }); }