Merge pull request #1964 from nicehash/alpha3-net45

Alpha3 net45
nicehash · Feb 3, 2020 · df929ea · df929ea · jogriffith90 · Feb 3, 2020
2 parents bcc3178 + 6ef3754
commit df929ea
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/src/Miners/Ethlargement/EthlargementPlugin.cs b/src/Miners/Ethlargement/EthlargementPlugin.cs
@@ -132,10 +132,18 @@ public virtual string EthlargementBinPath()
             return binPath;
         }
 
+        public virtual string EthlargementCwdPath()
+        {
+            var pluginRoot = Path.Combine(Paths.MinerPluginsPath(), PluginUUID);
+            var pluginRootBins = Path.Combine(pluginRoot, "bins", $"{Version.Major}.{Version.Minor}");
+            return pluginRootBins;
+        }
+
 
         #region Ethlargement Process
 
         private static string _ethlargementBinPath = "";
+        private static string _ethlargementCwdPath = "";
 
         private static Process _ethlargementProcess = null;
 
@@ -167,16 +175,8 @@ private async static void ExitEvent(object sender, EventArgs e)
         private static void StartEthlargementProcess()
         {
             if (IsEthlargementProcessRunning() == true) return;
-
-            _ethlargementProcess = new Process
-            {
-                StartInfo =
-                {
-                    FileName = _ethlargementBinPath,
-                    //CreateNoWindow = false
-                },
-                EnableRaisingEvents = true
-            };
+
+            _ethlargementProcess = MinerToolkit.CreateMiningProcess(_ethlargementBinPath, _ethlargementCwdPath, "", null);
             _ethlargementProcess.Exited += ExitEvent;
 
             try
@@ -241,6 +241,7 @@ public virtual void InitInternals()
         {
             // set ethlargement path
             _ethlargementBinPath = EthlargementBinPath();
+            _ethlargementCwdPath = EthlargementCwdPath();
 
             var pluginRoot = Path.Combine(Paths.MinerPluginsPath(), PluginUUID);
 

diff --git a/src/NiceHashMiner/NiceHashMiner.csproj b/src/NiceHashMiner/NiceHashMiner.csproj
@@ -44,7 +44,7 @@
     <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>
     </Reference>
-    <Reference Include="PresentationFramework.Aero2" />
+    <Reference Include="PresentationFramework.Aero" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />

diff --git a/src/NiceHashMiner/Properties/AssemblyInfo.cs b/src/NiceHashMiner/Properties/AssemblyInfo.cs
@@ -65,5 +65,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.0.0.3")]
-[assembly: AssemblyFileVersion("3.0.0.3")]
+[assembly: AssemblyVersion("3.0.0.4")]
+[assembly: AssemblyFileVersion("3.0.0.4")]
diff --git a/src/NiceHashMiner/Resources/Xaml/Controls/ComboBoxes.xaml b/src/NiceHashMiner/Resources/Xaml/Controls/ComboBoxes.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2">
+                    xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Brushes.xaml" />
         <ResourceDictionary Source="../Fonts/Fonts.xaml" />

diff --git a/src/NiceHashMiner/_DESIGN_DEVELOP/Components/Components.xaml b/src/NiceHashMiner/_DESIGN_DEVELOP/Components/Components.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:NiceHashMiner._DESIGN_DEVELOP.Components"
-             xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2" x:Class="NiceHashMiner._DESIGN_DEVELOP.Components.Components"
+             xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero" x:Class="NiceHashMiner._DESIGN_DEVELOP.Components.Components"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>

diff --git a/src/NiceHashMinerLauncher/Properties/AssemblyInfo.cs b/src/NiceHashMinerLauncher/Properties/AssemblyInfo.cs
@@ -65,5 +65,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.0.0.3")]
-[assembly: AssemblyFileVersion("3.0.0.3")]
+[assembly: AssemblyVersion("3.0.0.4")]
+[assembly: AssemblyFileVersion("3.0.0.4")]