Updated plugin to support the newest version of Playnite

xDAN7 · Dec 20, 2020 · 200049e · 200049e
1 parent 16bae41
commit 200049e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/media/extension.yaml b/media/extension.yaml
@@ -1,6 +1,7 @@
+Id: Fullscreen_DeSmuME
 Name: Fullscreen DeSmuME
 Author: Daniel M.
-Version: 1.0
+Version: 1.1
 Module: FullscreenDeSmuME.dll
 Type: GenericPlugin
 Icon: Resources\desmumeicon.png
diff --git a/source/FullscreenDeSmuME/FullscreenDeSmuME.csproj b/source/FullscreenDeSmuME/FullscreenDeSmuME.csproj
@@ -35,8 +35,8 @@
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Playnite.SDK, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PlayniteSDK.5.1.0\lib\net462\Playnite.SDK.dll</HintPath>
+    <Reference Include="Playnite.SDK, Version=5.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\PlayniteSDK.5.5.0\lib\net462\Playnite.SDK.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -61,14 +61,15 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Page Include="FullscreenDeSmuMESettingsView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/source/FullscreenDeSmuME/FullscreenDeSmuMEPlugin.cs b/source/FullscreenDeSmuME/FullscreenDeSmuMEPlugin.cs
@@ -18,7 +18,6 @@ public class FullscreenDeSmuMEPlugin : Plugin
         static extern bool SetForegroundWindow(IntPtr hWnd);
 
         private FullscreenDeSmuMESettings settings { get; }
-        private ILogger logger { get; } = LogManager.GetLogger();
 
         public override Guid Id { get; } = Guid.Parse("90557cf8-d588-43e3-a57f-c8df5fdbd12f");
 

diff --git a/source/FullscreenDeSmuME/FullscreenDeSmuMESettings.cs b/source/FullscreenDeSmuME/FullscreenDeSmuMESettings.cs
@@ -13,8 +13,9 @@ namespace FullscreenDeSmuME
 {
     public class FullscreenDeSmuMESettings : ISettings
     {
-        private static ILogger logger = LogManager.GetLogger();
+        [JsonIgnore]
         private FullscreenDeSmuMEPlugin plugin;
+        [JsonIgnore]
         private IPlayniteAPI api;
 
         public FullscreenDeSmuMESettings()
@@ -40,6 +41,7 @@ public FullscreenDeSmuMESettings(FullscreenDeSmuMEPlugin plugin, IPlayniteAPI ap
         public Emulator SelectedEmulator { get; set; }
         [JsonIgnore]
         public string TimeoutText { get; set; }
+
         public int Timeout { get; set; } = 1000;
         public Guid SelectedEmulatorGuid { get; set; }
 
@@ -63,7 +65,6 @@ public void EndEdit()
 
         public bool VerifySettings(out List<string> errors)
         {
-
             errors = new List<string>();
 
             try

diff --git a/source/FullscreenDeSmuME/app.config b/source/FullscreenDeSmuME/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/source/FullscreenDeSmuME/packages.config b/source/FullscreenDeSmuME/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="10.0.1" targetFramework="net462" />
-  <package id="PlayniteSDK" version="5.1.0" targetFramework="net462" />
+  <package id="PlayniteSDK" version="5.5.0" targetFramework="net462" />
 </packages>