From ab7e2cb879213935846875a9e1f8989bb9899433 Mon Sep 17 00:00:00 2001
From: Timothy Baldridge <tbaldridge@gmail.com>
Date: Wed, 17 Mar 2021 21:36:37 -0600
Subject: [PATCH] Remove .net Framework libs bit of code cleanup

---
 Compression.BSA.Test/BSATests.cs              | 2 +-
 Wabbajack.Launcher/MainWindowVM.cs            | 2 +-
 Wabbajack.Lib/Wabbajack.Lib.csproj            | 4 ++--
 Wabbajack.Server/Controllers/AuthoredFiles.cs | 9 +--------
 Wabbajack.Test/Wabbajack.Test.csproj          | 4 ++--
 Wabbajack/Wabbajack.csproj                    | 6 +++---
 6 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Compression.BSA.Test/BSATests.cs b/Compression.BSA.Test/BSATests.cs
index 54c1a56e..6534906e 100644
--- a/Compression.BSA.Test/BSATests.cs
+++ b/Compression.BSA.Test/BSATests.cs
@@ -156,7 +156,7 @@ namespace Compression.BSA.Test
                         {
                             Assert.Equal(await GetData(pair.ai), await GetData(pair.bi));
                         }
-                        catch (Exception e)
+                        catch (Exception)
                         {
                             
                         }
diff --git a/Wabbajack.Launcher/MainWindowVM.cs b/Wabbajack.Launcher/MainWindowVM.cs
index 1b5ce24c..e8fd1eb8 100644
--- a/Wabbajack.Launcher/MainWindowVM.cs
+++ b/Wabbajack.Launcher/MainWindowVM.cs
@@ -162,7 +162,7 @@ namespace Wabbajack.Launcher
                 };
                 Process.Start(info);
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 if (_errors.Count == 0)
                 {
diff --git a/Wabbajack.Lib/Wabbajack.Lib.csproj b/Wabbajack.Lib/Wabbajack.Lib.csproj
index db700ee8..65c1db9d 100644
--- a/Wabbajack.Lib/Wabbajack.Lib.csproj
+++ b/Wabbajack.Lib/Wabbajack.Lib.csproj
@@ -7,10 +7,10 @@
       <Nullable>enable</Nullable>
     </PropertyGroup>
     <ItemGroup>
-      <PackageReference Include="CefSharp.Common">
+      <PackageReference Include="CefSharp.Common.NETCore">
         <Version>88.2.90</Version>
       </PackageReference>
-      <PackageReference Include="CefSharp.OffScreen">
+      <PackageReference Include="CefSharp.OffScreen.NETCore">
         <Version>88.2.90</Version>
       </PackageReference>
       <PackageReference Include="F23.StringSimilarity">
diff --git a/Wabbajack.Server/Controllers/AuthoredFiles.cs b/Wabbajack.Server/Controllers/AuthoredFiles.cs
index 96babbd9..e1faac95 100644
--- a/Wabbajack.Server/Controllers/AuthoredFiles.cs
+++ b/Wabbajack.Server/Controllers/AuthoredFiles.cs
@@ -130,14 +130,7 @@ namespace Wabbajack.BuildServer.Controllers
         private async Task UploadAsync(Stream stream, string path)
         {
             using var client = await GetBunnyCdnFtpClient();
-            try
-            {
-                await client.UploadAsync(stream, path);
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
+            await client.UploadAsync(stream, path);
         }
 
         [HttpDelete]
diff --git a/Wabbajack.Test/Wabbajack.Test.csproj b/Wabbajack.Test/Wabbajack.Test.csproj
index dfc7f370..1be50d6d 100644
--- a/Wabbajack.Test/Wabbajack.Test.csproj
+++ b/Wabbajack.Test/Wabbajack.Test.csproj
@@ -28,8 +28,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CefSharp.Common" Version="88.2.90" />
-    <PackageReference Include="CefSharp.OffScreen" Version="88.2.90" />
+    <PackageReference Include="CefSharp.Common.NETCore" Version="88.2.90" />
+    <PackageReference Include="CefSharp.OffScreen.NETCore" Version="88.2.90" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
       <PackageReference Include="xunit" Version="2.4.1" />
       <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index 8a16ef49..ea177b2b 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -55,7 +55,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CefSharp.Wpf" Version="88.2.90" />
+    <PackageReference Include="CefSharp.Wpf.NETCore" Version="88.2.90" />
     <PackageReference Include="DynamicData" Version="7.1.1" />
     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.2" />
     <PackageReference Include="Fody" Version="6.4.0">
@@ -69,13 +69,13 @@
     </PackageReference>
     <PackageReference Include="MahApps.Metro" Version="2.4.4" />
     <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
+    <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
     <PackageReference Include="PInvoke.Gdi32" Version="0.7.104" />
     <PackageReference Include="PInvoke.User32" Version="0.7.104" />
     <PackageReference Include="ReactiveUI" Version="13.2.2" />
     <PackageReference Include="ReactiveUI.Fody" Version="13.2.2" />
     <PackageReference Include="ReactiveUI.WPF" Version="13.2.2" />
     <PackageReference Include="SharpDX.DXGI" Version="4.2.0" />
-    <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
     <PackageReference Include="WPFThemes.DarkBlend" Version="1.0.8" />
   </ItemGroup>