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

Merging master into changes from launcherUI. Wox.Infrastructure assembly info I took the changes from both branches as they will be needed. This currently doesn't build I will make the changes to get it building atomically.

Browse Source
This commit is contained in:
ryanbodrug-microsoft
2020-04-07 14:33:45 -07:00
parent 983b2ebe0e 9380a243ba
commit b45b585edf
47 changed files with 177 additions and 1220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj
View File

@@ -49,8 +49,8 @@
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NLog.Schema" Version="4.7.0-rc1" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
<PackageReference Include="NLog.Schema" Version="4.7.0" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.9.1" />
<PackageReference Include="Pinyin4DotNet" Version="2016.4.23.4" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />

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

@@ -7,7 +7,7 @@ namespace Wox.Infrastructure
{
public static class Constant
{
public const string Wox = "Wox";
public const string Wox = "PowerLauncher";
public const string Plugins = "Plugins";
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
@@ -33,7 +33,7 @@ namespace Wox.Infrastructure
public static readonly string DataDirectory = DetermineDataDirectory();
public static readonly string PluginsDirectory = Path.Combine(DataDirectory, Plugins);
public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins);
public const string Issue = "https://github.com/Wox-launcher/Wox/issues/new";
public const string Issue = "https://github.com/microsoft/PowerToys/issues/new";
public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
public static readonly int ThumbnailSize = 64;