Fody.Resourcer integration

RevoLand · Dec 27, 2017 · bf07b47 · bf07b47
1 parent 34cd6b7
commit bf07b47
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 13 deletions.
diff --git a/Binaries/Steam Library Manager.exe b/Binaries/Steam Library Manager.exe
diff --git a/Source/Steam Library Manager/App.xaml b/Source/Steam Library Manager/App.xaml
@@ -1,7 +1,9 @@
 <Application x:Class="Steam_Library_Manager.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             StartupUri="Forms/Main.xaml">
+             StartupUri="Forms/Main.xaml"
+             DispatcherUnhandledException="Application_DispatcherUnhandledException"
+             >
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

diff --git a/Source/Steam Library Manager/App.xaml.cs b/Source/Steam Library Manager/App.xaml.cs
@@ -23,6 +23,13 @@ protected override void OnStartup(StartupEventArgs e)
                 MessageBox.Show(ex.ToString());
             }
         }
+
+        private void Application_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
+        {
+            MessageBox.Show(e.Exception.ToString(), "Exception Caught", MessageBoxButton.OK, MessageBoxImage.Error);
+            Definitions.SLM.ravenClient.Capture(new SharpRaven.Data.SentryEvent(e.Exception));
+            e.Handled = true;
+        }
     }
 
 

diff --git a/Source/Steam Library Manager/FodyWeavers.xml b/Source/Steam Library Manager/FodyWeavers.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Weavers>
-  <Costura />
+    <Costura/>
+    <Resourcer/>
 </Weavers>
diff --git a/Source/Steam Library Manager/Forms/Main.xaml.cs b/Source/Steam Library Manager/Forms/Main.xaml.cs
@@ -283,7 +283,6 @@ private async void TaskManager_ContextMenu_Click(object sender, RoutedEventArgs
                             else
                             {
                                 Framework.TaskManager.RemoveTask(CurrentTask);
-                                TaskPanel.Items.Remove(CurrentTask);
                             }
                         }
                         break;

diff --git a/Source/Steam Library Manager/Steam Library Manager.csproj b/Source/Steam Library Manager/Steam Library Manager.csproj
@@ -82,8 +82,11 @@
       <HintPath>..\packages\MahApps.Metro.1.6.0-alpha0184\lib\net45\MahApps.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.1-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Resourcer, Version=0.0.0.0, Culture=neutral, PublicKeyToken=409b3227471b0f0d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Resourcer.Fody.1.6.1.0\lib\net452\Resourcer.dll</HintPath>
     </Reference>
     <Reference Include="SharpRaven, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpRaven.2.2.0\lib\net45\SharpRaven.dll</HintPath>
@@ -232,13 +235,13 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <Import Project="..\packages\Fody.2.0.0\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.0\build\dotnet\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.2.3.6\build\net452\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.3.6\build\net452\Fody.targets'))" />
   </Target>
   <Import Project="..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
+  <Import Project="..\packages\Fody.2.3.6\build\net452\Fody.targets" Condition="Exists('..\packages\Fody.2.3.6\build\net452\Fody.targets')" />
 </Project>
diff --git a/Source/Steam Library Manager/app.config b/Source/Steam Library Manager/app.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Steam_Library_Manager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+            <section name="Steam_Library_Manager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <userSettings>
@@ -75,4 +75,13 @@
             </setting>
         </Steam_Library_Manager.Properties.Settings>
     </userSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/Source/Steam Library Manager/packages.config b/Source/Steam Library Manager/packages.config
@@ -2,8 +2,9 @@
 <packages>
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
   <package id="Costura.Fody" version="1.6.2" targetFramework="net46" developmentDependency="true" />
-  <package id="Fody" version="2.0.0" targetFramework="net46" developmentDependency="true" />
+  <package id="Fody" version="2.3.6" targetFramework="net46" developmentDependency="true" />
   <package id="MahApps.Metro" version="1.6.0-alpha0184" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="11.0.1-beta1" targetFramework="net46" />
+  <package id="Resourcer.Fody" version="1.6.1.0" targetFramework="net46" developmentDependency="true" />
   <package id="SharpRaven" version="2.2.0" targetFramework="net46" />
 </packages>
-Original file line number
+Diff line change
@@ Expand Up @@
                                 else
                                 {
                                     Framework.TaskManager.RemoveTask(CurrentTask);
-                                    TaskPanel.Items.Remove(CurrentTask);
                                 }
                             }
                             break;
@@ Expand Down @@