- Fixed: Updated plugin does not refresh in the UI (still happens in …

…the Browse tab)

- Fixed: Occasional error when updating a Plugin
- Misc: Reorganized Template plugin

ChangeLogs

@@ -1,7 +1,7 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT UNLESS YOU KNOW WHAT YOU ARE DOING.
 # CHANGE LOG
 
-[Next version (0496c9f6a7e164b44b665f94495da2b376bf68bc)]
+[Next version (3d4d54688e1b3390524525d1f443b88d6e470ea4)]
 - Added: SuperMemo 18.04 compatibility #138
 - Added: automated ChangeLog and NuPkg Release notes #52
 - Added: Splash screen (also overrides SuperMemo's) #100
@@ -21,9 +21,14 @@
 - Added CfgBase with reset on cancel
 - Added automatic version configuration
 - Added more documentation
-- Updated: ChangeLogs
+- Updated: ChangeLogs is now an embedded resource
+- Updated: NuSpec dependencies version
 - Updated: Packages
+- Updated: ChangeLogs
+- Fixed: Change Log window now displays correctly
+- Fixed: Wrong offsets for Hook and Concept in NativeDataCfg.json
 - Fixed: Collection Selection > Options, and other option windows can now be canceled and revert changes #117
+- Misc: Cleaned up SMAInstaller from legacy Change Log code
 - Several other minor updates
 
 

src/AppHosts/SuperMemoAssistant/Installer/SuperMemoAssistant.nuspec

@@ -31,14 +31,22 @@
 - Added CfgBase with reset on cancel
 - Added automatic version configuration
 - Added more documentation
-- Updated: ChangeLogs
+- Updated: ChangeLogs is now an embedded resource
+- Updated: NuSpec dependencies version
 - Updated: Packages
+- Updated: ChangeLogs
+- Fixed: Change Log window now displays correctly
+- Fixed: Wrong offsets for Hook and Concept in NativeDataCfg.json
 - Fixed: Collection Selection > Options, and other option windows can now be canceled and revert changes #117
+- Misc: Cleaned up SMAInstaller from legacy Change Log code
 - Several other minor updates
 </releaseNotes>
   </metadata>
   <files>
     <file src="*.*" target="lib\net45\" exclude="*.pdb;*.nupkg;*.vshost.*" />
     <file src="SuperMemoAssistant*.pdb" target="lib\net45\" />
+    <file src="PluginManager*.pdb" target="lib\net45\" />
+    <file src="Process.NET*.pdb" target="lib\net45\" />
+    <file src="Squirrel*.pdb" target="lib\net45\" />
   </files>
 </package>

src/AppHosts/SuperMemoAssistant/Properties/AssemblyInfo.cs

@@ -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.3.432")]
-[assembly: AssemblyFileVersion("2.0.3.432")]
+[assembly: AssemblyVersion("2.0.3.450")]
+[assembly: AssemblyFileVersion("2.0.3.450")]
 
 [assembly: AssemblyInformationalVersion("2.0.3")]

src/AppHosts/SuperMemoAssistant/SuperMemoAssistant.csproj

@@ -299,15 +299,17 @@
       <Version>2.1.0</Version>
     </PackageReference>
     <PackageReference Include="MSBuild.Tools">
-      <Version>0.2.38</Version>
+      <Version>0.2.40</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.CommandLine">
       <Version>5.4.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="PluginManager.Core">
-      <Version>0.2.1.104</Version>
+      <Version>0.2.1.110</Version>
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody">
       <Version>3.2.6</Version>

src/Core/SuperMemoAssistant.Core/Properties/AssemblyInfo.cs

@@ -65,7 +65,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.3.283")]
-[assembly: AssemblyFileVersion("2.0.3.283")]
+[assembly: AssemblyVersion("2.0.3.297")]
+[assembly: AssemblyFileVersion("2.0.3.297")]
 
 [assembly: AssemblyInformationalVersion("2.0.3")]

src/Core/SuperMemoAssistant.Core/SMA/UI/ViewModels/PluginManagerViewModel.cs

@@ -405,6 +405,8 @@ private async Task PluginUpdate(LocalPluginPackage<PluginMetadata> plugin)
                                                            CancellationTokenSource.Token)
                                         .ConfigureAwait(true)) == false)
             return;
+
+        await PluginMgr.StartPlugin(PluginInstances.FirstOrDefault(pi => pi.Package == plugin)).ConfigureAwait(true);
       }
       catch (InvalidOperationException ex1) when (ex1.InnerException is NuGetProtocolException)
       {

src/Core/SuperMemoAssistant.Core/SuperMemoAssistant.Core.csproj

@@ -382,6 +382,11 @@
     <PackageReference Include="FlaUI.UIA3">
       <Version>2.0.0-rc1</Version>
     </PackageReference>
+    <PackageReference Include="Fody">
+      <Version>6.1.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="FontAwesome5">
       <Version>2.0.4</Version>
     </PackageReference>
@@ -403,7 +408,7 @@
       <Version>3.3.2</Version>
     </PackageReference>
     <PackageReference Include="PluginManager.Core">
-      <Version>0.2.1.104</Version>
+      <Version>0.2.1.110</Version>
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody">
       <Version>3.2.6</Version>

src/Core/SuperMemoAssistant.Hooks.Common/Properties/AssemblyInfo.cs

@@ -63,7 +63,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.3.41")]
-[assembly: AssemblyFileVersion("2.0.3.41")]
+[assembly: AssemblyVersion("2.0.3.49")]
+[assembly: AssemblyFileVersion("2.0.3.49")]
 
 [assembly: AssemblyInformationalVersion("2.0.3")]

src/Core/SuperMemoAssistant.Hooks.InjectLib/Properties/AssemblyInfo.cs

@@ -63,7 +63,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.3.45")]
-[assembly: AssemblyFileVersion("2.0.3.45")]
+[assembly: AssemblyVersion("2.0.3.53")]
+[assembly: AssemblyFileVersion("2.0.3.53")]
 
 [assembly: AssemblyInformationalVersion("2.0.3")]

src/Core/SuperMemoAssistant.Interop/Extensions/FileDialogEx.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Win32;
+using SuperMemoAssistant.Services;
+
+namespace SuperMemoAssistant.Extensions
+{
+  /// <summary>
+  /// Extension methods for <see cref="FileDialog" />
+  /// </summary>
+  public static class FileDialogEx
+  {
+    /// <summary>
+    /// Shows the dialog with <paramref name="ownerHwnd"/> as the owner
+    /// </summary>
+    /// <param name="dlg">The dialog to show</param>
+    /// <param name="ownerHwnd">The owner window</param>
+    /// <returns>Dialog result</returns>
+    public static bool RunDialog(this FileDialog dlg, IntPtr ownerHwnd)
+    {
+      return (bool)dlg.GetType()
+                      .GetMethod("RunDialog", BindingFlags.NonPublic | BindingFlags.Instance)
+                      .Invoke(dlg, new object[] { ownerHwnd });
+    }
+
+    /// <summary>
+    /// Shows the dialog with SuperMemo Element window as the owner
+    /// </summary>
+    /// <param name="dlg">The dialog to show</param>
+    /// <returns>Dialog result</returns>
+    public static bool RunDialogInSuperMemo(this FileDialog dlg)
+    {
+      return dlg.RunDialog(Svc.SM.UI.ElementWdw.Handle);
+    }
+  }
+}

src/Core/SuperMemoAssistant.Interop/SuperMemoAssistant.Interop.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="MSBuildToolsReadSuo">
-  <Import Project="..\..\..\packages\MSBuild.Tools.0.2.38\build\MSBuild.Tools.props" Condition="Exists('..\..\..\packages\MSBuild.Tools.0.2.38\build\MSBuild.Tools.props')" />
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\MSBuild.Tools.0.2.40\build\MSBuild.Tools.props" Condition="Exists('..\..\..\packages\MSBuild.Tools.0.2.40\build\MSBuild.Tools.props')" />
   <Import Project="..\..\..\packages\PropertyChanged.Fody.3.2.6\build\PropertyChanged.Fody.props" Condition="Exists('..\..\..\packages\PropertyChanged.Fody.3.2.6\build\PropertyChanged.Fody.props')" />
   <Import Project="..\..\..\packages\Anotar.Serilog.Fody.5.1.0\build\Anotar.Serilog.Fody.props" Condition="Exists('..\..\..\packages\Anotar.Serilog.Fody.5.1.0\build\Anotar.Serilog.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -160,6 +160,7 @@
     <Compile Include="Extensions\DependencyObjectEx.cs" />
     <Compile Include="Extensions\ElemCreationResultEx.cs" />
     <Compile Include="Extensions\EnumEx.cs" />
+    <Compile Include="Extensions\FileDialogEx.cs" />
     <Compile Include="Extensions\GroupCollectionEx.cs" />
     <Compile Include="Extensions\IControlHtmlEx.cs" />
     <Compile Include="Extensions\ImageEx.cs" />
@@ -395,9 +396,9 @@
     <Error Condition="!Exists('..\..\..\packages\Anotar.Serilog.Fody.5.1.0\build\Anotar.Serilog.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Anotar.Serilog.Fody.5.1.0\build\Anotar.Serilog.Fody.props'))" />
     <Error Condition="!Exists('..\..\..\packages\PropertyChanged.Fody.3.2.6\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\PropertyChanged.Fody.3.2.6\build\PropertyChanged.Fody.props'))" />
     <Error Condition="!Exists('..\..\..\packages\Fody.6.1.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Fody.6.1.1\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\MSBuild.Tools.0.2.38\build\MSBuild.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSBuild.Tools.0.2.38\build\MSBuild.Tools.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\MSBuild.Tools.0.2.38\build\MSBuild.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSBuild.Tools.0.2.38\build\MSBuild.Tools.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\MSBuild.Tools.0.2.40\build\MSBuild.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSBuild.Tools.0.2.40\build\MSBuild.Tools.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\MSBuild.Tools.0.2.40\build\MSBuild.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSBuild.Tools.0.2.40\build\MSBuild.Tools.targets'))" />
   </Target>
   <Import Project="..\..\..\packages\Fody.6.1.1\build\Fody.targets" Condition="Exists('..\..\..\packages\Fody.6.1.1\build\Fody.targets')" />
-  <Import Project="..\..\..\packages\MSBuild.Tools.0.2.38\build\MSBuild.Tools.targets" Condition="Exists('..\..\..\packages\MSBuild.Tools.0.2.38\build\MSBuild.Tools.targets')" />
+  <Import Project="..\..\..\packages\MSBuild.Tools.0.2.40\build\MSBuild.Tools.targets" Condition="Exists('..\..\..\packages\MSBuild.Tools.0.2.40\build\MSBuild.Tools.targets')" />
 </Project>

src/Core/SuperMemoAssistant.Interop/packages.config

@@ -3,7 +3,7 @@
   <package id="Anotar.Serilog.Fody" version="5.1.0" targetFramework="net472" />
   <package id="Extensions.System.IO" version="0.1.0.3" targetFramework="net472" />
   <package id="Fody" version="6.1.1" targetFramework="net472" developmentDependency="true" />
-  <package id="MSBuild.Tools" version="0.2.38" targetFramework="net472" />
+  <package id="MSBuild.Tools" version="0.2.40" targetFramework="net472" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
   <package id="Nito.AsyncEx" version="5.0.0" targetFramework="net472" />
   <package id="Nito.AsyncEx.Context" version="5.0.0" targetFramework="net472" />