Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 11:46:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dotnet-core-upgrade

Browse Source 
# Conflicts:
#	src/modules/launcher/Wox.Core/Wox.Core.csproj
This commit is contained in:
Barbara Kudiess
2020-03-27 10:25:39 -07:00
parent cdad6f74cf 93e2cc367b
commit c5df7d4249
26 changed files with 3 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs
View File

@@ -66,7 +66,6 @@ namespace Wox.Infrastructure.Exception
sb.AppendLine($"* OS Version: {Environment.OSVersion.VersionString}");
sb.AppendLine($"* IntPtr Length: {IntPtr.Size}");
sb.AppendLine($"* x64: {Environment.Is64BitOperatingSystem}");
sb.AppendLine($"* Python Path: {Constant.PythonPath}");
sb.AppendLine($"* Everything SDK Path: {Constant.EverythingSDKPath}");
sb.AppendLine($"* CLR Version: {Environment.Version}");
sb.AppendLine($"* Installed .NET Framework: ");

1
src/modules/launcher/Wox.Infrastructure/UserSettings/PluginSettings.cs
View File

@@ -5,7 +5,6 @@ namespace Wox.Infrastructure.UserSettings
{
public class PluginsSettings : BaseModel
{
public string PythonDirectory { get; set; }
public Dictionary<string, Plugin> Plugins { get; set; } = new Dictionary<string, Plugin>();
public void UpdatePluginSettings(List<PluginMetadata> metadatas)

1
src/modules/launcher/Wox.Infrastructure/Wox.cs
View File

@@ -40,7 +40,6 @@ namespace Wox.Infrastructure
public static readonly string DefaultIcon = Path.Combine(ProgramDirectory, "Images", "app.png");
public static readonly string ErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.png");
public static string PythonPath;
public static string EverythingSDKPath;
}
}