Moving Plugins from Wox.Plugin.* to Microsoft.Plugin.*. This is to rename the assemblies that get saved to the settings directory. External plugins will get saved to their on assembly folder in the future.

This commit is contained in:
ryanbodrug-microsoft 2020-05-03 18:20:27 -07:00
parent 3bdcf1077b
commit e776f9c7d8
93 changed files with 124 additions and 110 deletions

View File

@ -176,13 +176,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Test", "src\modules\lau
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{4AFC9975-2456-4C70-94A4-84073C1CED93}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Calculator", "src\modules\launcher\Plugins\Wox.Plugin.Calculator\Wox.Plugin.Calculator.csproj", "{59BD9891-3837-438A-958D-ADC7F91F6F7E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Calculator", "src\modules\launcher\Plugins\Microsoft.Plugin.Calculator\Microsoft.Plugin.Calculator.csproj", "{59BD9891-3837-438A-958D-ADC7F91F6F7E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.WindowWalker", "src\modules\launcher\Plugins\Wox.Plugin.WindowWalker\Wox.Plugin.WindowWalker.csproj", "{74F1B9ED-F59C-4FE7-B473-7B453E30837E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.WindowWalker", "src\modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\Microsoft.Plugin.WindowWalker.csproj", "{74F1B9ED-F59C-4FE7-B473-7B453E30837E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Program", "src\modules\launcher\Plugins\Wox.Plugin.Program\Wox.Plugin.Program.csproj", "{FDB3555B-58EF-4AE6-B5F1-904719637AB4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Program", "src\modules\launcher\Plugins\Microsoft.Plugin.Program\Microsoft.Plugin.Program.csproj", "{FDB3555B-58EF-4AE6-B5F1-904719637AB4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Shell", "src\modules\launcher\Plugins\Wox.Plugin.Shell\Wox.Plugin.Shell.csproj", "{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Shell", "src\modules\launcher\Plugins\Microsoft.Plugin.Shell\Microsoft.Plugin.Shell.csproj", "{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Indexer", "src\modules\launcher\Plugins\Microsoft.Plugin.Indexer\Microsoft.Plugin.Indexer.csproj", "{F8B870EB-D5F5-45BA-9CF7-A5C459818820}"
ProjectSection(ProjectDependencies) = postProject
@ -242,7 +242,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common-md-flag", "src\commo
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "interop-tests", "src\common\interop-tests\interop-tests.csproj", "{437AD818-3F1F-4CA5-A79B-25233A157026}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Folder", "src\modules\launcher\Plugins\Wox.Plugin.Folder\Wox.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder", "src\modules\launcher\Plugins\Microsoft.Plugin.Folder\Microsoft.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

View File

@ -3,8 +3,9 @@ using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using System.Windows;
using Mages.Core;
using Wox.Plugin;
namespace Wox.Plugin.Caculator
namespace Microsoft.Plugin.Caculator
{
public class Main : IPlugin, IPluginI18n
{

View File

@ -4,8 +4,8 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<ProjectGuid>{59BD9891-3837-438A-958D-ADC7F91F6F7E}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Wox.Plugin.Caculator</RootNamespace>
<AssemblyName>Wox.Plugin.Caculator</AssemblyName>
<RootNamespace>Microsoft.Plugin.Caculator</RootNamespace>
<AssemblyName>Microsoft.Plugin.Caculator</AssemblyName>
<useWPF>true</useWPF>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@ -14,7 +14,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Caculator\</OutputPath>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Caculator\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
@ -26,7 +26,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Caculator\</OutputPath>
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Caculator\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>

View File

@ -6,7 +6,7 @@ using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace Wox.Plugin.Caculator
namespace Microsoft.Plugin.Caculator
{
/// <summary>
/// Tries to convert all numbers in a text from one culture format to another.

View File

@ -7,6 +7,6 @@
"Version":"1.0.0",
"Language":"csharp",
"Website":"http://www.wox.one/plugin",
"ExecuteFileName":"Wox.Plugin.Caculator.dll",
"ExecuteFileName":"Microsoft.Plugin.Caculator.dll",
"IcoPath":"Images\\calculator.png"
}

View File

@ -7,8 +7,9 @@ using System.Windows;
using Wox.Infrastructure.Logger;
using Wox.Infrastructure.Image;
using Wox.Plugin.SharedCommands;
using Wox.Plugin;
namespace Wox.Plugin.Folder
namespace Microsoft.Plugin.Folder
{
internal class ContextMenuLoader : IContextMenu
{
@ -118,7 +119,7 @@ namespace Wox.Plugin.Folder
public void LogException(string message, Exception e)
{
Log.Exception($"|Wox.Plugin.Folder.ContextMenu|{message}", e);
Log.Exception($"|Microsoft.Plugin.Folder.ContextMenu|{message}", e);
}
private bool CanRunAsDifferentUser(string path)

View File

@ -2,7 +2,7 @@
using System.Linq;
using Newtonsoft.Json;
namespace Wox.Plugin.Folder
namespace Microsoft.Plugin.Folder
{
[JsonObject(MemberSerialization.OptIn)]
public class FolderLink

View File

@ -1,4 +1,4 @@
<UserControl x:Class="Wox.Plugin.Folder.FileSystemSettings"
<UserControl x:Class="Microsoft.Plugin.Folder.FileSystemSettings"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

View File

@ -3,12 +3,13 @@ using System.IO;
using System.Linq;
using System.Windows;
using System.Windows.Forms;
using Wox.Plugin;
using DataFormats = System.Windows.DataFormats;
using DragDropEffects = System.Windows.DragDropEffects;
using DragEventArgs = System.Windows.DragEventArgs;
using MessageBox = System.Windows.MessageBox;
namespace Wox.Plugin.Folder
namespace Microsoft.Plugin.Folder
{
public partial class FileSystemSettings

View File

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 501 B

View File

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 290 B

View File

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 468 B

View File

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

View File

@ -8,8 +8,9 @@ using System.Windows;
using System.Windows.Controls;
using Wox.Infrastructure;
using Wox.Infrastructure.Storage;
using Wox.Plugin;
namespace Wox.Plugin.Folder
namespace Microsoft.Plugin.Folder
{
public class Main : IPlugin, ISettingProvider, IPluginI18n, ISavable, IContextMenu
{

View File

@ -4,8 +4,8 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<ProjectGuid>{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Wox.Plugin.Folder</RootNamespace>
<AssemblyName>Wox.Plugin.Folder</AssemblyName>
<RootNamespace>Microsoft.Plugin.Folder</RootNamespace>
<AssemblyName>Microsoft.Plugin.Folder</AssemblyName>
<UseWindowsForms>true</UseWindowsForms>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@ -14,7 +14,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Folder\</OutputPath>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Folder\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
@ -26,7 +26,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Folder\</OutputPath>
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Folder\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>

View File

@ -2,7 +2,7 @@
using Newtonsoft.Json;
using Wox.Infrastructure.Storage;
namespace Wox.Plugin.Folder
namespace Microsoft.Plugin.Folder
{
public class Settings
{

View File

@ -7,6 +7,6 @@
"Version":"1.0.0",
"Language":"csharp",
"Website":"http://www.wox.one/plugin",
"ExecuteFileName":"Wox.Plugin.Folder.dll",
"ExecuteFileName":"Microsoft.Plugin.Folder.dll",
"IcoPath":"Images\\folder.png"
}

View File

@ -97,7 +97,7 @@ namespace Microsoft.Plugin.Indexer
public void LogException(string message, Exception e)
{
Log.Exception($"|Wox.Plugin.Folder.ContextMenu|{message}", e);
Log.Exception($"|Microsoft.Plugin.Folder.ContextMenu|{message}", e);
}
}

View File

@ -1,4 +1,4 @@
<Window x:Class="Wox.Plugin.Program.AddProgramSource"
<Window x:Class="Microsoft.Plugin.Program.AddProgramSource"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

View File

@ -1,10 +1,11 @@
using System.Windows;
using System.Windows.Forms;
using Wox.Plugin.Program.Views.Models;
using Wox.Plugin.Program.Views;
using Microsoft.Plugin.Program.Views.Models;
using Microsoft.Plugin.Program.Views;
using System.Linq;
using Wox.Plugin;
namespace Wox.Plugin.Program
namespace Microsoft.Plugin.Program
{
/// <summary>
/// Interaction logic for AddProgramSource.xaml

View File

@ -2,9 +2,9 @@
using System.IO;
using System.Threading.Tasks;
using Wox.Infrastructure.Logger;
using Wox.Plugin.Program.Programs;
using Microsoft.Plugin.Program.Programs;
namespace Wox.Plugin.Program
namespace Microsoft.Plugin.Program
{
//internal static class FileChangeWatcher
//{

View File

Before

Width:  |  Height:  |  Size: 752 B

After

Width:  |  Height:  |  Size: 752 B

View File

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

View File

@ -3,7 +3,7 @@ using System.Globalization;
using System.Windows.Data;
using System.Windows.Markup;
namespace Wox.Plugin.Program
namespace Microsoft.Plugin.Program
{
public class LocationConverter : MarkupExtension, IValueConverter
{

View File

@ -8,7 +8,7 @@ using System.Runtime.CompilerServices;
using System.Security;
using Wox.Infrastructure;
namespace Wox.Plugin.Program.Logger
namespace Microsoft.Plugin.Program.Logger
{
/// <summary>
/// The Program plugin has seen many issues recorded in the Wox repo related to various loading of Windows programs.
@ -56,7 +56,7 @@ namespace Wox.Plugin.Program.Logger
var possibleResolution = "Not yet known";
var errorStatus = "UNKNOWN";
logger.Error("------------- BEGIN Wox.Plugin.Program exception -------------");
logger.Error("------------- BEGIN Microsoft.Plugin.Program exception -------------");
do
{
@ -86,7 +86,7 @@ namespace Wox.Plugin.Program.Logger
e = e.InnerException;
} while (e != null);
logger.Error("------------- END Wox.Plugin.Program exception -------------");
logger.Error("------------- END Microsoft.Plugin.Program exception -------------");
}
/// <summary>

View File

@ -9,17 +9,19 @@ using System.Timers;
using System.Windows.Controls;
using Wox.Infrastructure.Logger;
using Wox.Infrastructure.Storage;
using Wox.Plugin.Program.Programs;
using Wox.Plugin.Program.Views;
using Wox.Plugin;
using Microsoft.Plugin.Program.Views;
using Stopwatch = Wox.Infrastructure.Stopwatch;
namespace Wox.Plugin.Program
namespace Microsoft.Plugin.Program
{
public class Main : ISettingProvider, IPlugin, IPluginI18n, IContextMenu, ISavable, IReloadable
{
private static readonly object IndexLock = new object();
internal static Win32[] _win32s { get; set; }
internal static UWP.Application[] _uwps { get; set; }
internal static Programs.Win32[] _win32s { get; set; }
internal static Programs.UWP.Application[] _uwps { get; set; }
internal static Settings _settings { get; set; }
FileSystemWatcher _watcher = null;
@ -29,8 +31,8 @@ namespace Wox.Plugin.Program
private static PluginInitContext _context;
private static BinaryStorage<Win32[]> _win32Storage;
private static BinaryStorage<UWP.Application[]> _uwpStorage;
private static BinaryStorage<Programs.Win32[]> _win32Storage;
private static BinaryStorage<Programs.UWP.Application[]> _uwpStorage;
private readonly PluginJsonStorage<Settings> _settingsStorage;
public Main()
@ -38,26 +40,26 @@ namespace Wox.Plugin.Program
_settingsStorage = new PluginJsonStorage<Settings>();
_settings = _settingsStorage.Load();
Stopwatch.Normal("|Wox.Plugin.Program.Main|Preload programs cost", () =>
Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Preload programs cost", () =>
{
_win32Storage = new BinaryStorage<Win32[]>("Win32");
_win32s = _win32Storage.TryLoad(new Win32[] { });
_uwpStorage = new BinaryStorage<UWP.Application[]>("UWP");
_uwps = _uwpStorage.TryLoad(new UWP.Application[] { });
_win32Storage = new BinaryStorage<Programs.Win32[]>("Win32");
_win32s = _win32Storage.TryLoad(new Programs.Win32[] { });
_uwpStorage = new BinaryStorage<Programs.UWP.Application[]>("UWP");
_uwps = _uwpStorage.TryLoad(new Programs.UWP.Application[] { });
});
Log.Info($"|Wox.Plugin.Program.Main|Number of preload win32 programs <{_win32s.Length}>");
Log.Info($"|Wox.Plugin.Program.Main|Number of preload uwps <{_uwps.Length}>");
Log.Info($"|Microsoft.Plugin.Program.Main|Number of preload win32 programs <{_win32s.Length}>");
Log.Info($"|Microsoft.Plugin.Program.Main|Number of preload uwps <{_uwps.Length}>");
var a = Task.Run(() =>
{
if (IsStartupIndexProgramsRequired || !_win32s.Any())
Stopwatch.Normal("|Wox.Plugin.Program.Main|Win32Program index cost", IndexWin32Programs);
Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Win32Program index cost", IndexWin32Programs);
});
var b = Task.Run(() =>
{
if (IsStartupIndexProgramsRequired || !_uwps.Any())
Stopwatch.Normal("|Wox.Plugin.Program.Main|Win32Program index cost", IndexUWPPrograms);
Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Win32Program index cost", IndexUWPPrograms);
});
Task.WaitAll(a, b);
@ -77,8 +79,8 @@ namespace Wox.Plugin.Program
public List<Result> Query(Query query)
{
Win32[] win32;
UWP.Application[] uwps;
Programs.Win32[] win32;
Programs.UWP.Application[] uwps;
lock (IndexLock)
{
@ -106,7 +108,7 @@ namespace Wox.Plugin.Program
public static void IndexWin32Programs()
{
var win32S = Win32.All(_settings);
var win32S = Programs.Win32.All(_settings);
lock (IndexLock)
{
_win32s = win32S;
@ -118,7 +120,7 @@ namespace Wox.Plugin.Program
var windows10 = new Version(10, 0);
var support = Environment.OSVersion.Version.Major >= windows10.Major;
var applications = support ? UWP.All() : new UWP.Application[] { };
var applications = support ? Programs.UWP.All() : new Programs.UWP.Application[] { };
lock (IndexLock)
{
_uwps = applications;
@ -153,7 +155,7 @@ namespace Wox.Plugin.Program
public List<ContextMenuResult> LoadContextMenus(Result selectedResult)
{
var menuOptions = new List<ContextMenuResult>();
var program = selectedResult.ContextData as IProgram;
var program = selectedResult.ContextData as Programs.IProgram;
if (program != null)
{
menuOptions = program.ContextMenus(_context.API);
@ -217,7 +219,7 @@ namespace Wox.Plugin.Program
//When a watched directory changes then reset the timer.
private void OnChanged(object source, FileSystemEventArgs e)
{
Log.Debug($"|Wox.Plugin.Program.Main|Directory Changed: {e.FullPath} {e.ChangeType} - Resetting timer.");
Log.Debug($"|Microsoft.Plugin.Program.Main|Directory Changed: {e.FullPath} {e.ChangeType} - Resetting timer.");
_timer.Stop();
_timer.Start();
}
@ -226,9 +228,9 @@ namespace Wox.Plugin.Program
{
Task.Run(() =>
{
Log.Debug($"|Wox.Plugin.Program.Main| ReIndexing UWP Programs");
Log.Debug($"|Microsoft.Plugin.Program.Main| ReIndexing UWP Programs");
IndexUWPPrograms();
Log.Debug($"|Wox.Plugin.Program.Main| Done ReIndexing");
Log.Debug($"|Microsoft.Plugin.Program.Main| Done ReIndexing");
});
}
}

View File

@ -4,8 +4,8 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<ProjectGuid>{FDB3555B-58EF-4AE6-B5F1-904719637AB4}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Wox.Plugin.Program</RootNamespace>
<AssemblyName>Wox.Plugin.Program</AssemblyName>
<RootNamespace>Microsoft.Plugin.Program</RootNamespace>
<AssemblyName>Microsoft.Plugin.Program</AssemblyName>
<UseWpf>true</UseWpf>
<UseWindowsForms>true</UseWindowsForms>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@ -15,7 +15,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Program\</OutputPath>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Program\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
@ -27,7 +27,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Program\</OutputPath>
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Program\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>

View File

@ -1,4 +1,4 @@
<Window x:Class="Wox.Plugin.Program.ProgramSuffixes"
<Window x:Class="Microsoft.Plugin.Program.ProgramSuffixes"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

View File

@ -1,6 +1,7 @@
using System.Windows;
using Wox.Plugin;
namespace Wox.Plugin.Program
namespace Microsoft.Plugin.Program
{
/// <summary>
/// ProgramSuffixes.xaml 的交互逻辑

View File

@ -1,6 +1,7 @@
using System.Collections.Generic;
using Wox.Plugin;
namespace Wox.Plugin.Program.Programs
namespace Microsoft.Plugin.Program.Programs
{
public interface IProgram
{

View File

@ -13,14 +13,15 @@ using Windows.Management.Deployment;
using AppxPackaing;
using Shell;
using Wox.Infrastructure;
using Wox.Plugin.Program.Logger;
using Microsoft.Plugin.Program.Logger;
using IStream = AppxPackaing.IStream;
using Rect = System.Windows.Rect;
using Windows.UI.Xaml.Media.Imaging;
using Windows.UI.Xaml.Media;
using System.Windows.Controls;
using Wox.Plugin;
namespace Wox.Plugin.Program.Programs
namespace Microsoft.Plugin.Program.Programs
{
[Serializable]
public class UWP

View File

@ -10,9 +10,10 @@ using System.Threading.Tasks;
using Microsoft.Win32;
using Shell;
using Wox.Infrastructure;
using Wox.Plugin.Program.Logger;
using Microsoft.Plugin.Program.Logger;
using Wox.Plugin;
namespace Wox.Plugin.Program.Programs
namespace Microsoft.Plugin.Program.Programs
{
[Serializable]
public class Win32 : IProgram

View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.IO;
namespace Wox.Plugin.Program
namespace Microsoft.Plugin.Program
{
public class Settings
{

View File

@ -3,7 +3,7 @@ using System.Globalization;
using System.Windows.Data;
using System.Windows.Markup;
namespace Wox.Plugin.Program
namespace Microsoft.Plugin.Program
{
public class SuffixesConvert : MarkupExtension, IValueConverter
{

View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Wox.Plugin.Program.Views.Models;
using Microsoft.Plugin.Program.Views.Models;
namespace Wox.Plugin.Program.Views.Commands
namespace Microsoft.Plugin.Program.Views.Commands
{
internal static class ProgramSettingDisplay
{

View File

@ -1,5 +1,5 @@

namespace Wox.Plugin.Program.Views.Models
namespace Microsoft.Plugin.Program.Views.Models
{
public class ProgramSource : Settings.ProgramSource { }
}

View File

@ -1,9 +1,9 @@
<UserControl x:Class="Wox.Plugin.Program.Views.ProgramSetting"
<UserControl x:Class="Microsoft.Plugin.Program.Views.ProgramSetting"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:program="clr-namespace:Wox.Plugin.Program"
xmlns:program="clr-namespace:Microsoft.Plugin.Program"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="600">
<Grid Margin="10">

View File

@ -5,13 +5,14 @@ using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using Wox.Plugin.Program.Views.Models;
using Wox.Plugin.Program.Views.Commands;
using Wox.Plugin.Program.Programs;
using Microsoft.Plugin.Program.Views.Models;
using Microsoft.Plugin.Program.Views.Commands;
using Microsoft.Plugin.Program.Programs;
using System.ComponentModel;
using System.Windows.Data;
using Wox.Plugin;
namespace Wox.Plugin.Program.Views
namespace Microsoft.Plugin.Program.Views
{
/// <summary>
/// Interaction logic for ProgramSetting.xaml
@ -27,7 +28,7 @@ namespace Wox.Plugin.Program.Views
// this as temporary holder for displaying all loaded programs sources.
internal static List<ProgramSource> ProgramSettingDisplayList { get; set; }
public ProgramSetting(PluginInitContext context, Settings settings, Win32[] win32s, UWP.Application[] uwps)
public ProgramSetting(PluginInitContext context, Settings settings, Programs.Win32[] win32s, UWP.Application[] uwps)
{
this.context = context;
InitializeComponent();

View File

@ -7,6 +7,6 @@
"Version":"1.0.0",
"Language":"csharp",
"Website":"http://www.wox.one/plugin",
"ExecuteFileName":"Wox.Plugin.Program.dll",
"ExecuteFileName":"Microsoft.Plugin.Program.dll",
"IcoPath":"Images\\program.png"
}

View File

Before

Width:  |  Height:  |  Size: 752 B

After

Width:  |  Height:  |  Size: 752 B

View File

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

View File

@ -14,11 +14,12 @@ using Wox.Infrastructure.Hotkey;
using Wox.Infrastructure.Logger;
using Wox.Infrastructure.Storage;
using Wox.Plugin.SharedCommands;
using Wox.Plugin;
using Application = System.Windows.Application;
using Control = System.Windows.Controls.Control;
using Keys = System.Windows.Forms.Keys;
namespace Wox.Plugin.Shell
namespace Microsoft.Plugin.Shell
{
public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, ISavable
{
@ -96,7 +97,7 @@ namespace Wox.Plugin.Shell
}
catch (Exception e)
{
Log.Exception($"|Wox.Plugin.Shell.Main.Query|Exception when query for <{query}>", e);
Log.Exception($"|Microsoft.Plugin.Shell.Main.Query|Exception when query for <{query}>", e);
}
return results;
}
@ -315,7 +316,7 @@ namespace Wox.Plugin.Shell
private void OnWinRPressed()
{
_context.API.ChangeQuery($"{_context.CurrentPluginMetadata.ActionKeywords[0]}{Plugin.Query.TermSeperater}");
_context.API.ChangeQuery($"{_context.CurrentPluginMetadata.ActionKeywords[0]}{Wox.Plugin.Query.TermSeperater}");
Application.Current.MainWindow.Visibility = Visibility.Visible;
}

View File

@ -4,8 +4,8 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<ProjectGuid>{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Wox.Plugin.Shell</RootNamespace>
<AssemblyName>Wox.Plugin.Shell</AssemblyName>
<RootNamespace>Microsoft.Plugin.Shell</RootNamespace>
<AssemblyName>Microsoft.Plugin.Shell</AssemblyName>
<UseWindowsForms>true</UseWindowsForms>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@ -14,7 +14,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Shell\</OutputPath>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Shell\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
@ -26,7 +26,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Shell\</OutputPath>
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Shell\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>

View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace Wox.Plugin.Shell
namespace Microsoft.Plugin.Shell
{
public class Settings
{

View File

@ -1,4 +1,4 @@
<UserControl x:Class="Wox.Plugin.Shell.CMDSetting"
<UserControl x:Class="Microsoft.Plugin.Shell.CMDSetting"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

View File

@ -1,7 +1,7 @@
using System.Windows;
using System.Windows.Controls;
namespace Wox.Plugin.Shell
namespace Microsoft.Plugin.Shell
{
public partial class CMDSetting : UserControl
{

View File

@ -7,6 +7,6 @@
"Version":"1.0.0",
"Language":"csharp",
"Website":"http://www.wox.one/plugin",
"ExecuteFileName":"Wox.Plugin.Shell.dll",
"ExecuteFileName":"Microsoft.Plugin.Shell.dll",
"IcoPath":"Images\\shell.png"
}

View File

@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
namespace Wox.Plugin.WindowWalker.Components
namespace Microsoft.Plugin.WindowWalker.Components
{
/// <summary>
/// Class housing fuzzy matching methods

View File

@ -6,7 +6,7 @@ using System;
using System.Runtime.InteropServices;
using System.Text;
namespace Wox.Plugin.WindowWalker.Components
namespace Microsoft.Plugin.WindowWalker.Components
{
/// <summary>
/// Interop calls with helper layers

View File

@ -4,7 +4,7 @@
using System;
namespace Wox.Plugin.WindowWalker.Components
namespace Microsoft.Plugin.WindowWalker.Components
{
/// <summary>
/// Class containg methods to control the live preview

View File

@ -7,7 +7,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Wox.Plugin.WindowWalker.Components
namespace Microsoft.Plugin.WindowWalker.Components
{
/// <summary>
/// Class that represents the state of the desktops windows

View File

@ -7,7 +7,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Wox.Plugin.WindowWalker.Components
namespace Microsoft.Plugin.WindowWalker.Components
{
/// <summary>
/// Responsible for searching and finding matches for the strings provided.

View File

@ -4,7 +4,7 @@
using System.Collections.Generic;
namespace Wox.Plugin.WindowWalker.Components
namespace Microsoft.Plugin.WindowWalker.Components
{
/// <summary>
/// Contains search result windows with each window including the reason why the result was included

View File

@ -2,7 +2,7 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information. Code forked from Betsegaw Tadele's https://github.com/betsegaw/windowwalker/
namespace Wox.Plugin.WindowWalker.Components
namespace Microsoft.Plugin.WindowWalker.Components
{
/// <summary>
/// A class to represent a search string

View File

@ -14,7 +14,7 @@ using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Media.Imaging;
namespace Wox.Plugin.WindowWalker.Components
namespace Microsoft.Plugin.WindowWalker.Components
{
/// <summary>
/// Represents a specific open window

View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Wox.Plugin.WindowWalker.Components
namespace Microsoft.Plugin.WindowWalker.Components
{
class WindowResult:Window
{

View File

@ -1,8 +1,9 @@
using System.Collections.Generic;
using System.Linq;
using Wox.Plugin.WindowWalker.Components;
using Microsoft.Plugin.WindowWalker.Components;
using Wox.Plugin;
namespace Wox.Plugin.WindowWalker
namespace Microsoft.Plugin.WindowWalker
{
public class Main : IPlugin, IPluginI18n
{

View File

@ -4,8 +4,8 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<ProjectGuid>{74F1B9ED-F59C-4FE7-B473-7B453E30837E}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Wox.Plugin.WindowWalker</RootNamespace>
<AssemblyName>Wox.Plugin.WindowWalker</AssemblyName>
<RootNamespace>Microsoft.Plugin.WindowWalker</RootNamespace>
<AssemblyName>Microsoft.Plugin.WindowWalker</AssemblyName>
<useWPF>true</useWPF>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@ -14,7 +14,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.WindowWalker\</OutputPath>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
@ -26,7 +26,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.WindowWalker\</OutputPath>
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.WindowWalker\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>

View File

@ -7,6 +7,6 @@
"Version":"1.0.0",
"Language":"csharp",
"Website":"http://www.windowwalker.com/",
"ExecuteFileName":"Wox.Plugin.WindowWalker.dll",
"ExecuteFileName":"Microsoft.Plugin.WindowWalker.dll",
"IcoPath":"Images\\windowwalker.png"
}