Merge pull request #1963 from nicehash/alpha3-net45

Alpha3 net45
nicehash · Feb 3, 2020 · bcc3178 · bcc3178
2 parents 90cb1ad + 5a13aeb
commit bcc3178
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 28 deletions.
diff --git a/src/NiceHashMiner/App.xaml b/src/NiceHashMiner/App.xaml
@@ -4,7 +4,8 @@
              xmlns:local="clr-namespace:NiceHashMiner"
              xmlns:views="clr-namespace:NiceHashMiner.Views"
              xmlns:converters="clr-namespace:NiceHashMiner.Converters"
-             Startup="App_OnStartup">
+             Startup="App_OnStartup"
+             DispatcherUnhandledException="App_DispatcherUnhandledException">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

diff --git a/src/NiceHashMiner/App.xaml.cs b/src/NiceHashMiner/App.xaml.cs
@@ -202,5 +202,16 @@ private void App_OnStartup(object sender, StartupEventArgs e)
             //// Set shutdown mode back to default
             //ShutdownMode = ShutdownMode.OnLastWindowClose;
         }
+
+        private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
+        {
+            Exception ex = e.Exception;
+            Exception ex_inner = ex.InnerException;
+            string msg = ex.Message + "\n\n" + ex.StackTrace + "\n\n" +
+                "Inner Exception:\n" + ex_inner.Message + "\n\n" + ex_inner.StackTrace;
+            MessageBox.Show(msg, "Application Halted!", MessageBoxButton.OK);
+            e.Handled = true;
+            Application.Current.Shutdown();
+        }
     }
 }
diff --git a/src/NiceHashMiner/NiceHashMiner.csproj b/src/NiceHashMiner/NiceHashMiner.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>NiceHashMiner</RootNamespace>
     <AssemblyName>NiceHashMiner</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -39,7 +39,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net451\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
+      <HintPath>..\..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net45\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
@@ -49,7 +49,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />

diff --git a/src/NiceHashMiner/Properties/Settings.Designer.cs b/src/NiceHashMiner/Properties/Settings.Designer.cs
diff --git a/src/NiceHashMiner/Views/MainWindow.xaml b/src/NiceHashMiner/Views/MainWindow.xaml
@@ -67,6 +67,7 @@
             </TabItem>
         </TabControl>
 
+
         <!-- Instantiation of taskbar icon for minimize to tray -->
         <!-- Since this isn't visible setting the grid spot doesn't matter, but it stops XAML complaining -->
         <tb:TaskbarIcon Grid.Row="0"

diff --git a/src/NiceHashMiner/app.config b/src/NiceHashMiner/app.config
@@ -8,4 +8,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
diff --git a/src/NiceHashMiner/packages.config b/src/NiceHashMiner/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net472" requireReinstallation="true" />
-  <package id="log4net" version="2.0.8" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" requireReinstallation="true" />
+  <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net45" />
+  <package id="log4net" version="2.0.8" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net45" />
 </packages>
diff --git a/src/NiceHashMinerLauncher/NiceHashMinerLauncher.csproj b/src/NiceHashMinerLauncher/NiceHashMinerLauncher.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>NiceHashMiner</RootNamespace>
     <AssemblyName>NiceHashMiner</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>

diff --git a/src/NiceHashMinerLauncher/Properties/Settings.Designer.cs b/src/NiceHashMinerLauncher/Properties/Settings.Designer.cs
diff --git a/src/NiceHashMinerLauncher/app.config b/src/NiceHashMinerLauncher/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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" />
+        <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>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/src/NiceHashMinerLauncher/packages.config b/src/NiceHashMinerLauncher/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.8" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" requireReinstallation="true" />
-</packages>
+  <package id="log4net" version="2.0.8" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net45" requireReinstallation="true" />
+</packages>
diff --git a/src/Tools/AddWindowsDefenderExclusion/AddWindowsDefenderExclusion.csproj b/src/Tools/AddWindowsDefenderExclusion/AddWindowsDefenderExclusion.csproj
@@ -8,10 +8,11 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>AddWindowsDefenderExclusion</RootNamespace>
     <AssemblyName>AddWindowsDefenderExclusion</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/src/Tools/AddWindowsDefenderExclusion/App.config b/src/Tools/AddWindowsDefenderExclusion/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/src/Tools/AmdComputeModeSwitcher/AmdComputeModeSwitcher.csproj b/src/Tools/AmdComputeModeSwitcher/AmdComputeModeSwitcher.csproj
@@ -8,10 +8,11 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>AmdComputeModeSwitcher</RootNamespace>
     <AssemblyName>AmdComputeModeSwitcher</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/src/Tools/AmdComputeModeSwitcher/App.config b/src/Tools/AmdComputeModeSwitcher/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
-</configuration>
+</configuration>