- Added: Only one setting instance open at a time supermemo/SuperMemo…

…Assistant#113
supermemo · Mar 17, 2020 · d8871f4 · d8871f4
1 parent 9383592
commit d8871f4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/DictionaryPlugin.cs b/DictionaryPlugin.cs
@@ -111,9 +111,7 @@ protected override void PluginInit()
     /// <inheritdoc />
     public override void ShowSettings()
     {
-      Application.Current.Dispatcher.Invoke(
-        () => new ConfigurationWindow(HotKeyManager.Instance, Config).ShowAndActivate()
-      );
+      ConfigurationWindow.ShowAndActivate(HotKeyManager.Instance, Config);
     }
 
     #endregion

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,7 +31,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.12")]
-[assembly: AssemblyFileVersion("2.0.3.12")]
+[assembly: AssemblyVersion("2.0.3.15")]
+[assembly: AssemblyFileVersion("2.0.3.15")]
 
 [assembly: AssemblyInformationalVersion("2.0.3")]
diff --git a/SuperMemoAssistant.Plugins.Dictionary.csproj b/SuperMemoAssistant.Plugins.Dictionary.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.1.6\build\MSBuild.Tools.props" Condition="Exists('..\..\..\packages\MSBuild.Tools.0.1.6\build\MSBuild.Tools.props')" />
+  <Import Project="..\..\..\packages\MSBuild.Tools.0.2.27\build\MSBuild.Tools.props" Condition="Exists('..\..\..\packages\MSBuild.Tools.0.2.27\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')" />
@@ -176,8 +176,8 @@
     <Reference Include="SuperMemoAssistant.Services.Sentry, Version=1.0.1.14, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\SuperMemoAssistant.Services.Sentry.1.0.1.14\lib\Net472\SuperMemoAssistant.Services.Sentry.dll</HintPath>
     </Reference>
-    <Reference Include="SuperMemoAssistant.Services.UI, Version=2.0.3.18, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SuperMemoAssistant.Services.UI.2.0.3.18\lib\net472\SuperMemoAssistant.Services.UI.dll</HintPath>
+    <Reference Include="SuperMemoAssistant.Services.UI, Version=2.0.3.20, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SuperMemoAssistant.Services.UI.2.0.3.20\lib\net472\SuperMemoAssistant.Services.UI.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -262,12 +262,12 @@
     <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.1.6\build\MSBuild.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSBuild.Tools.0.1.6\build\MSBuild.Tools.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\MSBuild.Tools.0.1.6\build\MSBuild.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSBuild.Tools.0.1.6\build\MSBuild.Tools.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\MSBuild.Tools.0.2.27\build\MSBuild.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSBuild.Tools.0.2.27\build\MSBuild.Tools.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\MSBuild.Tools.0.2.27\build\MSBuild.Tools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSBuild.Tools.0.2.27\build\MSBuild.Tools.targets'))" />
   </Target>
   <PropertyGroup>
     <PostBuildEvent>xcopy /h /i /c /k /e /r /y "$(TargetDir)*" "%25UserProfile%25\Documents\SuperMemoAssistant\Plugins\Development\$(ProjectName)"</PostBuildEvent>
   </PropertyGroup>
   <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.1.6\build\MSBuild.Tools.targets" Condition="Exists('..\..\..\packages\MSBuild.Tools.0.1.6\build\MSBuild.Tools.targets')" />
+  <Import Project="..\..\..\packages\MSBuild.Tools.0.2.27\build\MSBuild.Tools.targets" Condition="Exists('..\..\..\packages\MSBuild.Tools.0.2.27\build\MSBuild.Tools.targets')" />
 </Project>
diff --git a/SuperMemoAssistant.Plugins.Dictionary.nuspec b/SuperMemoAssistant.Plugins.Dictionary.nuspec
@@ -35,7 +35,7 @@
         <dependency id="SuperMemoAssistant.mshtml" version="7.0.3300.1" />
         <dependency id="SuperMemoAssistant.Plugins.Dictionary.Interop" version="2.0.3.12" />
         <dependency id="SuperMemoAssistant.Services.Sentry" version="1.0.1.14" />
-        <dependency id="SuperMemoAssistant.Services.UI" version="2.0.3.18" />
+        <dependency id="SuperMemoAssistant.Services.UI" version="2.0.3.20" />
       </group>
     </dependencies>
   </metadata>

diff --git a/packages.config b/packages.config
@@ -13,7 +13,7 @@
   <package id="MahApps.Metro" version="1.6.5" targetFramework="net472" />
   <package id="MaterialDesignColors" version="1.1.3" targetFramework="net472" />
   <package id="MaterialDesignThemes" version="2.5.0.1205" targetFramework="net472" />
-  <package id="MSBuild.Tools" version="0.1.6" targetFramework="net472" />
+  <package id="MSBuild.Tools" version="0.2.27" targetFramework="net472" />
   <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" />
@@ -43,7 +43,7 @@
   <package id="SuperMemoAssistant.mshtml" version="7.0.3300.1" targetFramework="net472" />
   <package id="SuperMemoAssistant.Plugins.Dictionary.Interop" version="2.0.3.12" targetFramework="net472" />
   <package id="SuperMemoAssistant.Services.Sentry" version="1.0.1.14" targetFramework="net472" />
-  <package id="SuperMemoAssistant.Services.UI" version="2.0.3.18" targetFramework="net472" />
+  <package id="SuperMemoAssistant.Services.UI" version="2.0.3.20" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.0" targetFramework="net472" />
   <package id="System.Collections.Immutable" version="1.7.0" targetFramework="net472" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />