Skip to content

Commit

Permalink
- Plugin system is now fully functional
Browse files Browse the repository at this point in the history
- Migrated most of the projects to NuGet and referenced them instead of having local project dependencies
- Added the Logger configuration panel to Settings (will be moved under the General tab later)
- Several smaller UI improvement (Collection Selection, Settings, etc.)
- Started documenting the project
- Refactoring & many minor other additions & fixes
  • Loading branch information
alexis- committed Mar 10, 2020
1 parent 2968079 commit 51146a4
Show file tree
Hide file tree
Showing 106 changed files with 3,846 additions and 868 deletions.
58 changes: 33 additions & 25 deletions SuperMemoAssistant.sln
Original file line number Diff line number Diff line change
Expand Up @@ -375,30 +375,28 @@ Global
{AA97C5AA-CA1A-4988-AE2E-E5A292B63C12}.Release|x64.Build.0 = Release|Any CPU
{AA97C5AA-CA1A-4988-AE2E-E5A292B63C12}.Release|x86.ActiveCfg = Release|Any CPU
{AA97C5AA-CA1A-4988-AE2E-E5A292B63C12}.Release|x86.Build.0 = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Coverage|x64.ActiveCfg = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Coverage|x64.Build.0 = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Coverage|x86.ActiveCfg = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Coverage|x86.Build.0 = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug|x64.ActiveCfg = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug|x64.Build.0 = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug|x86.ActiveCfg = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug|x86.Build.0 = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug-InProd|x64.ActiveCfg = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug-InProd|x64.Build.0 = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug-InProd|x86.ActiveCfg = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug-InProd|x86.Build.0 = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackDebug-InProd|x64.ActiveCfg = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackDebug-InProd|x64.Build.0 = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackDebug-InProd|x86.ActiveCfg = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackDebug-InProd|x86.Build.0 = Debug|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackRelease|x64.ActiveCfg = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackRelease|x64.Build.0 = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackRelease|x86.ActiveCfg = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackRelease|x86.Build.0 = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Release|x64.ActiveCfg = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Release|x64.Build.0 = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Release|x86.ActiveCfg = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Release|x86.Build.0 = Release|Any CPU
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Coverage|x64.ActiveCfg = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Coverage|x64.Build.0 = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Coverage|x86.ActiveCfg = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Coverage|x86.Build.0 = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug|x64.ActiveCfg = Debug|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug|x86.ActiveCfg = Debug|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug|x86.Build.0 = Debug|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug-InProd|x64.ActiveCfg = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug-InProd|x64.Build.0 = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug-InProd|x86.ActiveCfg = Debug|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Debug-InProd|x86.Build.0 = Debug|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackDebug-InProd|x64.ActiveCfg = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackDebug-InProd|x64.Build.0 = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackDebug-InProd|x86.ActiveCfg = Debug|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackDebug-InProd|x86.Build.0 = Debug|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackRelease|x64.ActiveCfg = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackRelease|x64.Build.0 = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackRelease|x86.ActiveCfg = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.NuPackRelease|x86.Build.0 = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Release|x64.ActiveCfg = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Release|x86.ActiveCfg = Release|x86
{F8BB6993-B610-40AD-995A-AA5A28FBBBFE}.Release|x86.Build.0 = Release|x86
{390A9FF0-4B34-4869-AF15-7EF7960D5D56}.Coverage|x64.ActiveCfg = Debug|Any CPU
{390A9FF0-4B34-4869-AF15-7EF7960D5D56}.Coverage|x64.Build.0 = Debug|Any CPU
{390A9FF0-4B34-4869-AF15-7EF7960D5D56}.Coverage|x86.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -466,7 +464,6 @@ Global
{F8BB6993-25DF-4173-BB3D-ACEE15C5A2B9}.NuPackRelease|x64.ActiveCfg = Release|Any CPU
{F8BB6993-25DF-4173-BB3D-ACEE15C5A2B9}.NuPackRelease|x64.Build.0 = Release|Any CPU
{F8BB6993-25DF-4173-BB3D-ACEE15C5A2B9}.NuPackRelease|x86.ActiveCfg = Release|Any CPU
{F8BB6993-25DF-4173-BB3D-ACEE15C5A2B9}.NuPackRelease|x86.Build.0 = Release|Any CPU
{F8BB6993-25DF-4173-BB3D-ACEE15C5A2B9}.Release|x64.ActiveCfg = Release|Any CPU
{F8BB6993-25DF-4173-BB3D-ACEE15C5A2B9}.Release|x64.Build.0 = Release|Any CPU
{F8BB6993-25DF-4173-BB3D-ACEE15C5A2B9}.Release|x86.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -683,4 +680,15 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {AF31D6F5-6E93-461B-8C5F-348439D19C6D}
EndGlobalSection
GlobalSection(AutomaticVersions) = postSolution
UpdateAssemblyVersion = True
UpdateAssemblyFileVersion = True
UpdateAssemblyInfoVersion = True
AssemblyVersionSettings = IncrementOnDemand.IncrementOnDemand.IncrementOnDemand.IncrementWithResetOnIncrease
AssemblyFileVersionSettings = IncrementOnDemand.IncrementOnDemand.IncrementOnDemand.IncrementWithResetOnIncrease
AssemblyInfoVersionSettings = IncrementOnDemand.IncrementOnDemand.IncrementOnDemand.None
UpdatePackageVersion = False
AssemblyInfoVersionType = SettingsVersion
InheritWinAppVersionFrom = None
EndGlobalSection
EndGlobal
9 changes: 7 additions & 2 deletions SuperMemoAssistant.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ Modified By: Alexis</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb_AaBb" /&gt;&lt;ExtraRule Prefix="RE_" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Property/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="RE_" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb_AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb"&gt;&lt;ExtraRule Prefix="RE_" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="I" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="I" Suffix="Ex" Style="AaBb" /&gt;&lt;ExtraRule Prefix="" Suffix="Ex" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
Expand Down Expand Up @@ -752,12 +752,17 @@ public static $name$ Instance { get; } = new $name$();</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Addrs/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Anonymized/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Anotar/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Behaviours/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Cloze/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=hkcu/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=homonymous/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Hotkey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=marshalled/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mems/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Metadatas/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mshtml/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Plugin_0027s/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Prerelease/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=quotify/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=quotify/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Unfocusable/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion libs/PluginManager
Submodule PluginManager updated 55 files
+7 −1 PluginManager.sln.DotSettings
+69 −9 src/PluginManager.Core/Contracts/IPluginInstance.cs
+31 −3 src/PluginManager.Core/Contracts/IPluginRepositoryService.cs
+67 −0 src/PluginManager.Core/Extensions/DirectoryPath.cs
+0 −1 src/PluginManager.Core/Extensions/IEnumerableEx.cs
+17 −5 src/PluginManager.Core/Extensions/NuGetPackageEx.cs
+9 −0 src/PluginManager.Core/Extensions/StringEx.cs
+8 −1 src/PluginManager.Core/Logger/ILogAdapter.cs
+4 −1 src/PluginManager.Core/Logger/LoggerFactory.cs
+8 −1 src/PluginManager.Core/Logger/PluginManagerLogger.cs
+65 −17 src/PluginManager.Core/Models/PluginInstanceBase.cs
+18 −1 src/PluginManager.Core/Models/PluginStatus.cs
+17 −1 src/PluginManager.Core/PackageManager/Models/LocalDevPluginPackage.cs
+50 −27 src/PluginManager.Core/PackageManager/Models/LocalPluginPackage.cs
+38 −3 src/PluginManager.Core/PackageManager/Models/OnlinePluginPackage.cs
+91 −3 src/PluginManager.Core/PackageManager/Models/PluginPackage.cs
+77 −6 src/PluginManager.Core/PackageManager/NuGet/NuGetPackage.cs
+150 −15 src/PluginManager.Core/PackageManager/NuGet/Project/NuGetDeleteOnRestartManager.cs
+100 −15 src/PluginManager.Core/PackageManager/NuGet/Project/NuGetInstalledPluginRepository.cs
+171 −40 src/PluginManager.Core/PackageManager/NuGet/Project/NuGetPluginProject.cs
+71 −29 src/PluginManager.Core/PackageManager/NuGet/Project/NuGetPluginSolution.cs
+2 −1 src/PluginManager.Core/PackageManager/NuGet/Project/NuGetProjectContext.cs
+254 −45 src/PluginManager.Core/PackageManager/PluginPackageManager.cs
+16 −5 src/PluginManager.Core/PluginManager.Core.csproj
+4 −5 src/PluginManager.Core/PluginManager.Core.nuspec
+53 −5 src/PluginManager.Core/PluginManagerBase.Abstracts.cs
+1 −1 src/PluginManager.Core/PluginManagerBase.Helpers.cs
+314 −28 src/PluginManager.Core/PluginManagerBase.Packages.cs
+88 −14 src/PluginManager.Core/PluginManagerBase.Process.cs
+30 −65 src/PluginManager.Core/PluginManagerBase.Service.cs
+119 −38 src/PluginManager.Core/PluginManagerBase.cs
+2 −2 src/PluginManager.Core/Properties/AssemblyInfo.cs
+262 −0 src/PluginManager.Core/Services/DefaultPluginRepositoryService.cs
+0 −134 src/PluginManager.Core/Services/PluginRepositoryService.cs
+27 −0 src/PluginManager.Core/Sys/Converters/DirectoryPathConverter.cs
+234 −0 src/PluginManager.Core/Sys/RestartManager/RestartManager.NativeMembers.cs
+151 −0 src/PluginManager.Core/Sys/RestartManager/RestartManager.NativeMethods.cs
+90 −0 src/PluginManager.Core/Sys/RestartManager/RestartManager.cs
+3 −2 src/PluginManager.Core/packages.config
+32 −0 src/PluginManager.Interop/Contracts/IPluginBase.cs
+8 −18 src/PluginManager.Interop/Contracts/IPluginManager.cs
+128 −0 src/PluginManager.Interop/PluginHost/PluginAssemblyResolver.cs
+14 −21 src/PluginManager.Interop/PluginHost/PluginHostBase.Assembly.cs
+4 −30 src/PluginManager.Interop/PluginHost/PluginHostBase.cs
+8 −1 src/PluginManager.Interop/PluginManager.Interop.csproj
+2 −0 src/PluginManager.Interop/PluginManager.Interop.nuspec
+2 −2 src/PluginManager.Interop/Properties/AssemblyInfo.cs
+1 −0 src/PluginManager.Interop/packages.config
+3 −1 src/PluginManager.PluginHost/App.xaml.cs
+174 −9 src/PluginManager.PluginHost/PluginLoader.cs
+7 −2 src/PluginManager.PluginHost/PluginManager.PluginHost.csproj
+2 −2 src/PluginManager.PluginHost/Properties/AssemblyInfo.cs
+1 −0 src/PluginManager.PluginHost/packages.config
+6 −0 src/PluginManager.Shared.MgrHost/PluginHost/PluginHostParameters.cs
+14 −8 src/PluginManager.Shared/PluginHost/PluginHost.Const.cs
1 change: 1 addition & 0 deletions nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<add key="PluginManager" value="libs/PluginManager/Releases" />
<add key="MSBuild.Tools" value="libs/MSBuild.Tools/" />
<add key="SuperMemoAssistant.Installer" value="libs/Squirrel.Windows/" />
<add key="SuperMemoAssistant.Packages" value="releases/nupkg/" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
</configuration>
14 changes: 13 additions & 1 deletion src/AppHosts/SuperMemoAssistant/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,19 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Sentry" publicKeyToken="fba2ec45388e2af0" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FontAwesome5" publicKeyToken="9cfaf01297a008f8" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Sentry.Protocol" publicKeyToken="fba2ec45388e2af0" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Sentry.Serilog" publicKeyToken="fba2ec45388e2af0" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
2 changes: 2 additions & 0 deletions src/AppHosts/SuperMemoAssistant/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />

<ResourceDictionary Source="UI/SMATaskbarIcon.xaml" />

<ResourceDictionary Source="pack://application:,,,/SuperMemoAssistant.Core;component/SMA/UI/DataTemplates/PluginInstanceDataTemplate.xaml" />
</ResourceDictionary.MergedDictionaries>

<Style TargetType="{x:Type ListBoxItem}">
Expand Down
1 change: 1 addition & 0 deletions src/AppHosts/SuperMemoAssistant/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
using SuperMemoAssistant.Models;
using SuperMemoAssistant.Services.UI.Extensions;
using SuperMemoAssistant.Setup;
using SuperMemoAssistant.SMA.UI.DataTemplates;
using SuperMemoAssistant.SMA.Utils;
using SuperMemoAssistant.UI;

Expand Down
Binary file modified src/AppHosts/SuperMemoAssistant/PluginHost.exe
Binary file not shown.
6 changes: 3 additions & 3 deletions src/AppHosts/SuperMemoAssistant/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.2.67")]
[assembly: AssemblyFileVersion("2.0.2.67")]
[assembly: AssemblyVersion("2.0.3.192")]
[assembly: AssemblyFileVersion("2.0.3.192")]

[assembly: AssemblyInformationalVersion("2.0.2")]
[assembly: AssemblyInformationalVersion("2.0.3")]
Loading

0 comments on commit 51146a4

Please sign in to comment.