chore: Update dependencies and related code

qdot · May 15, 2021 · 3ddbf4f · 3ddbf4f
1 parent 58e2a4f
commit 3ddbf4f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/LaunchServerLib/VAMLaunchServer.cs b/LaunchServerLib/VAMLaunchServer.cs
@@ -70,8 +70,6 @@ public void UpdateThread()
             _running = true;
 
             Console.WriteLine("SERVER IS ON");
-            Console.WriteLine("Your Launch device is ready to go when your device shows a solid blue light.");
-            Console.WriteLine("Note: You can type the command \"lc\" to attempt to re-establish communication.");
 
             _timeOfLastLaunchUpdate = DateTime.Now;
 

diff --git a/VaMLaunchGUI/IntifaceControl.xaml.cs b/VaMLaunchGUI/IntifaceControl.xaml.cs
@@ -120,7 +120,7 @@ public async Task ConnectTask(string aAddress)
 
                 _client = client;
 
-                await Dispatcher.Invoke(async () =>
+                Dispatcher.Invoke(() =>
                 {
                     ConnectedHandler?.Invoke(this, new EventArgs());
                     _connectStatus.Text = $"Connected{(aAddress == null ? ", restart VaMSync to disconnect." : " to Remote Buttplug Server")}";

diff --git a/VaMLaunchGUI/LogControl.xaml.cs b/VaMLaunchGUI/LogControl.xaml.cs
@@ -88,7 +88,7 @@ public LogControl()
             //LogLevelComboBox.SelectionChanged += LogLevelSelectionChangedHandler;
             LogListBox.ItemsSource = _logs;
 
-            ButtplugFFILog.StartLogHandler(ButtplugLogLevel.Info, false);
+            ButtplugFFILog.SetLogOptions(ButtplugLogLevel.Info, false);
             Buttplug.ButtplugFFILog.LogMessage += (obj, msg) => _logs.Add(msg.Trim());
         }
 

diff --git a/VaMLaunchGUI/VaMLaunchGUI.csproj b/VaMLaunchGUI/VaMLaunchGUI.csproj
@@ -39,23 +39,23 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Buttplug, Version=1.0.15.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Buttplug.1.0.15\lib\netstandard2.0\Buttplug.dll</HintPath>
+    <Reference Include="Buttplug, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Buttplug.2.0.2\lib\net47\Buttplug.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Protobuf, Version=3.14.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.14.0\lib\net45\Google.Protobuf.dll</HintPath>
+    <Reference Include="Google.Protobuf, Version=3.17.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.Protobuf.3.17.0\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
     <Reference Include="MaterialDesignColors, Version=2.0.0.2422, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignColors.2.0.0\lib\net452\MaterialDesignColors.dll</HintPath>
     </Reference>
     <Reference Include="MaterialDesignThemes.Wpf, Version=4.0.0.2422, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignThemes.4.0.0\lib\net452\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.7\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
@@ -186,7 +186,9 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets'))" />
     <Error Condition="!Exists('..\packages\ButtplugRustFFI.1.0.13\build\ButtplugRustFFI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ButtplugRustFFI.1.0.13\build\ButtplugRustFFI.targets'))" />
+    <Error Condition="!Exists('..\packages\ButtplugRustFFI.2.0.2\build\ButtplugRustFFI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ButtplugRustFFI.2.0.2\build\ButtplugRustFFI.targets'))" />
   </Target>
   <Import Project="..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.4.0.0\build\MaterialDesignThemes.targets')" />
   <Import Project="..\packages\ButtplugRustFFI.1.0.13\build\ButtplugRustFFI.targets" Condition="Exists('..\packages\ButtplugRustFFI.1.0.13\build\ButtplugRustFFI.targets')" />
+  <Import Project="..\packages\ButtplugRustFFI.2.0.2\build\ButtplugRustFFI.targets" Condition="Exists('..\packages\ButtplugRustFFI.2.0.2\build\ButtplugRustFFI.targets')" />
 </Project>
diff --git a/VaMLaunchGUI/packages.config b/VaMLaunchGUI/packages.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Buttplug" version="1.0.15" targetFramework="net472" />
-  <package id="ButtplugRustFFI" version="1.0.13" targetFramework="net472" />
-  <package id="Google.Protobuf" version="3.14.0" targetFramework="net472" />
+  <package id="Buttplug" version="2.0.2" targetFramework="net472" />
+  <package id="ButtplugRustFFI" version="2.0.2" targetFramework="net472" />
+  <package id="Google.Protobuf" version="3.17.0" targetFramework="net472" />
   <package id="MaterialDesignColors" version="2.0.0" targetFramework="net472" />
   <package id="MaterialDesignThemes" version="4.0.0" targetFramework="net472" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
-  <package id="NLog" version="4.7.7" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
+  <package id="NLog" version="4.7.10" targetFramework="net472" />
   <package id="SharpDX" version="4.2.0" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Memory" version="4.5.4" targetFramework="net472" />