From 887ab2073e8f57cb41f41322b1a0c02bc59a8112 Mon Sep 17 00:00:00 2001 From: Stanko Date: Mon, 3 Feb 2020 15:21:00 +0100 Subject: [PATCH 1/3] change PresentationFramework.Aero2 to PresentationFramework.Aero (Win7 support) --- src/NiceHashMiner/NiceHashMiner.csproj | 2 +- src/NiceHashMiner/Resources/Xaml/Controls/ComboBoxes.xaml | 2 +- src/NiceHashMiner/_DESIGN_DEVELOP/Components/Components.xaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NiceHashMiner/NiceHashMiner.csproj b/src/NiceHashMiner/NiceHashMiner.csproj index b3ac145b4..3306fc815 100644 --- a/src/NiceHashMiner/NiceHashMiner.csproj +++ b/src/NiceHashMiner/NiceHashMiner.csproj @@ -44,7 +44,7 @@ ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - + diff --git a/src/NiceHashMiner/Resources/Xaml/Controls/ComboBoxes.xaml b/src/NiceHashMiner/Resources/Xaml/Controls/ComboBoxes.xaml index 7bab487c7..7bfdc591b 100644 --- a/src/NiceHashMiner/Resources/Xaml/Controls/ComboBoxes.xaml +++ b/src/NiceHashMiner/Resources/Xaml/Controls/ComboBoxes.xaml @@ -1,6 +1,6 @@  + xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"> diff --git a/src/NiceHashMiner/_DESIGN_DEVELOP/Components/Components.xaml b/src/NiceHashMiner/_DESIGN_DEVELOP/Components/Components.xaml index 83a104ddb..8b6ae1731 100644 --- 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"> From 72b663ea0d9fa871df683d87288fa4b5f47621d4 Mon Sep 17 00:00:00 2001 From: Stanko Date: Mon, 3 Feb 2020 15:22:22 +0100 Subject: [PATCH 2/3] version bump --- src/NiceHashMiner/Properties/AssemblyInfo.cs | 4 ++-- src/NiceHashMinerLauncher/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/NiceHashMiner/Properties/AssemblyInfo.cs b/src/NiceHashMiner/Properties/AssemblyInfo.cs index 3838e01fd..6bffd6734 100644 --- 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/NiceHashMinerLauncher/Properties/AssemblyInfo.cs b/src/NiceHashMinerLauncher/Properties/AssemblyInfo.cs index 3838e01fd..6bffd6734 100644 --- 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")] From 6ef3754deb18d0151e3e7d8175c168a28c903165 Mon Sep 17 00:00:00 2001 From: Stanko Date: Mon, 3 Feb 2020 15:35:58 +0100 Subject: [PATCH 3/3] ethlargement use miner toolkit (fix hide mining window) --- src/Miners/Ethlargement/EthlargementPlugin.cs | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Miners/Ethlargement/EthlargementPlugin.cs b/src/Miners/Ethlargement/EthlargementPlugin.cs index 18c75f9ec..9d118a85f 100644 --- 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);