diff --git a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj index 2f3a71065d..4903f2077c 100644 --- a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj +++ b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj @@ -16,7 +16,6 @@ ColorPicker PowerToys.ColorPickerUI net6.0-windows10.0.19041.0 - 8.0 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj index 71653066af..c427a77d99 100644 --- a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj +++ b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj @@ -7,7 +7,6 @@ Microsoft.ColorPicker.UnitTests false enable - 8.0 Library $(Version).0 diff --git a/src/modules/launcher/PowerLauncher/App.xaml.cs b/src/modules/launcher/PowerLauncher/App.xaml.cs index c0398d501b..704906044e 100644 --- a/src/modules/launcher/PowerLauncher/App.xaml.cs +++ b/src/modules/launcher/PowerLauncher/App.xaml.cs @@ -4,6 +4,7 @@ using System; using System.Diagnostics; +using System.Globalization; using System.Linq; using System.Text; using System.Threading; @@ -101,7 +102,7 @@ namespace PowerLauncher { var textToLog = new StringBuilder(); textToLog.AppendLine("Begin PowerToys Run startup ----------------------------------------------------"); - textToLog.AppendLine($"Runtime info:{ErrorReporting.RuntimeInfo()}"); + textToLog.AppendLine(CultureInfo.InvariantCulture, $"Runtime info:{ErrorReporting.RuntimeInfo()}"); RegisterAppDomainExceptions(); RegisterDispatcherUnhandledException(); diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index 9127c4e449..1ade81c982 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -25,7 +25,6 @@ DEBUG;TRACE full - 7.3 prompt 4 false @@ -36,7 +35,6 @@ TRACE;RELEASE true pdbonly - 7.3 prompt 4 diff --git a/src/modules/launcher/PowerLauncher/ReportWindow.xaml.cs b/src/modules/launcher/PowerLauncher/ReportWindow.xaml.cs index 97c957f7f4..1ed201413c 100644 --- a/src/modules/launcher/PowerLauncher/ReportWindow.xaml.cs +++ b/src/modules/launcher/PowerLauncher/ReportWindow.xaml.cs @@ -47,7 +47,7 @@ namespace PowerLauncher content.AppendLine(ErrorReporting.RuntimeInfo()); // Using CurrentCulture since this is displayed to user in the report window - content.AppendLine($"Date: {DateTime.Now.ToString(CultureInfo.CurrentCulture)}"); + content.AppendLine(CultureInfo.CurrentCulture, $"Date: {DateTime.Now.ToString(CultureInfo.CurrentCulture)}"); content.AppendLine("Exception:"); content.AppendLine(exception.ToString()); var paragraph = new Paragraph(); diff --git a/src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs b/src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs index 3f35913b7e..cb4735ee9c 100644 --- a/src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs +++ b/src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs @@ -69,16 +69,16 @@ namespace Wox.Infrastructure.Exception sb.AppendLine(); sb.AppendLine("## Environment"); - sb.AppendLine($"* Command Line: {Environment.CommandLine}"); + sb.AppendLine(CultureInfo.InvariantCulture, $"* Command Line: {Environment.CommandLine}"); // Using InvariantCulture since this is internal - sb.AppendLine($"* Timestamp: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}"); - sb.AppendLine($"* Wox version: {Constant.Version}"); - sb.AppendLine($"* OS Version: {Environment.OSVersion.VersionString}"); - sb.AppendLine($"* IntPtr Length: {IntPtr.Size}"); - sb.AppendLine($"* x64: {Environment.Is64BitOperatingSystem}"); - sb.AppendLine($"* CLR Version: {Environment.Version}"); - sb.AppendLine($"* Installed .NET Framework: "); + sb.AppendLine(CultureInfo.InvariantCulture, $"* Timestamp: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}"); + sb.AppendLine(CultureInfo.InvariantCulture, $"* Wox version: {Constant.Version}"); + sb.AppendLine(CultureInfo.InvariantCulture, $"* OS Version: {Environment.OSVersion.VersionString}"); + sb.AppendLine(CultureInfo.InvariantCulture, $"* IntPtr Length: {IntPtr.Size}"); + sb.AppendLine(CultureInfo.InvariantCulture, $"* x64: {Environment.Is64BitOperatingSystem}"); + sb.AppendLine(CultureInfo.InvariantCulture, $"* CLR Version: {Environment.Version}"); + sb.AppendLine(CultureInfo.InvariantCulture, $"* Installed .NET Framework: "); foreach (var result in GetFrameworkVersionFromRegistry()) { sb.Append(" * "); diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj index 7ba44612e5..9cef9b7dce 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj +++ b/src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj @@ -20,7 +20,6 @@ DEBUG;TRACE true full - 7.3 prompt 4 false @@ -30,7 +29,6 @@ TRACE true pdbonly - 7.3 prompt 4 diff --git a/src/modules/launcher/Wox.Plugin/Logger/Log.cs b/src/modules/launcher/Wox.Plugin/Logger/Log.cs index 31b02a9cb0..a52fc63a8a 100644 --- a/src/modules/launcher/Wox.Plugin/Logger/Log.cs +++ b/src/modules/launcher/Wox.Plugin/Logger/Log.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using System.Globalization; using System.IO.Abstractions; using System.Runtime.CompilerServices; using System.Text; @@ -53,7 +54,7 @@ namespace Wox.Plugin.Logger var formattedOutput = new StringBuilder(); formattedOutput.AppendLine("-------------------------- Begin exception --------------------------"); - formattedOutput.AppendLine($"Message: {message}"); + formattedOutput.AppendLine(CultureInfo.InvariantCulture, $"Message: {message}"); do { diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj index 2eaf08ff07..e9a522bdfc 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -21,7 +21,6 @@ true DEBUG;TRACE full - 7.3 prompt 4 false @@ -31,7 +30,6 @@ TRACE true pdbonly - 7.3 prompt 4 diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index eaeddda0b6..4f81a621b9 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -18,7 +18,6 @@ true DEBUG;TRACE full - 7.3 prompt 4 false @@ -29,7 +28,6 @@ TRACE true pdbonly - 7.3 prompt 4