From 725d29fa2cd4c495be04e2f8283bcee69a8bfe39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanko=20Krsti=C4=87?= Date: Mon, 10 Apr 2017 12:08:45 +0200 Subject: [PATCH] updated bins, ver bump, pre-release --- NiceHashMiner/Forms/Form_Main.cs | 2 +- NiceHashMiner/Miners/Grouping/MinerPaths.cs | 16 ++-- NiceHashMiner/Properties/AssemblyInfo.cs | 4 +- NiceHashMiner/Utils/BINS_CODEGEN.cs | 78 +++++++++++++------- NiceHashMiner/Utils/MinersDownloadManager.cs | 2 +- 5 files changed, 62 insertions(+), 40 deletions(-) diff --git a/NiceHashMiner/Forms/Form_Main.cs b/NiceHashMiner/Forms/Form_Main.cs index be8e6d5..67a04b5 100644 --- a/NiceHashMiner/Forms/Form_Main.cs +++ b/NiceHashMiner/Forms/Form_Main.cs @@ -51,7 +51,7 @@ public partial class Form_Main : Form, Form_Loading.IAfterInitializationCaller, int flowLayoutPanelVisibleCount = 0; int flowLayoutPanelRatesIndex = 0; - const string _betaAlphaPostfixString = ""; + const string _betaAlphaPostfixString = "-Pre-Release_01"; private bool _isDeviceDetectionInitialized = false; diff --git a/NiceHashMiner/Miners/Grouping/MinerPaths.cs b/NiceHashMiner/Miners/Grouping/MinerPaths.cs index 049ab4e..612c976 100644 --- a/NiceHashMiner/Miners/Grouping/MinerPaths.cs +++ b/NiceHashMiner/Miners/Grouping/MinerPaths.cs @@ -19,18 +19,18 @@ public static class Data { /// /// ccminers /// - public const string ccminer_decred = _bin + @"\ccminer_decred.exe"; - public const string ccminer_nanashi = _bin + @"\ccminer_nanashi.exe"; - public const string ccminer_neoscrypt = _bin + @"\ccminer_neoscrypt.exe"; - public const string ccminer_sp = _bin + @"\ccminer_sp.exe"; - public const string ccminer_tpruvot = _bin + @"\ccminer_tpruvot.exe"; - public const string ccminer_cryptonight = _bin + @"\ccminer_cryptonight.exe"; - public const string ccminer_x11gost = _bin + @"\ccminer_x11gost.exe"; + public const string ccminer_decred = _bin + @"\ccminer_decred\ccminer.exe"; + public const string ccminer_nanashi = _bin + @"\ccminer_nanashi\ccminer.exe"; + public const string ccminer_neoscrypt = _bin + @"\ccminer_neoscrypt\ccminer.exe"; + public const string ccminer_sp = _bin + @"\ccminer_sp\ccminer.exe"; + public const string ccminer_tpruvot = _bin + @"\ccminer_tpruvot\ccminer.exe"; + public const string ccminer_cryptonight = _bin + @"\ccminer_cryptonight\ccminer.exe"; + public const string ccminer_x11gost = _bin + @"\ccminer_x11gost\ccminer.exe"; /// /// ethminers /// - public const string ethminer = _bin + @"\ethminer.exe"; + public const string ethminer = _bin + @"\ethminer\ethminer.exe"; /// /// sgminers diff --git a/NiceHashMiner/Properties/AssemblyInfo.cs b/NiceHashMiner/Properties/AssemblyInfo.cs index cf018eb..8ae3b9b 100644 --- a/NiceHashMiner/Properties/AssemblyInfo.cs +++ b/NiceHashMiner/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.5.7")] -[assembly: AssemblyFileVersion("1.7.5.7")] +[assembly: AssemblyVersion("1.7.5.8")] +[assembly: AssemblyFileVersion("1.7.5.8")] diff --git a/NiceHashMiner/Utils/BINS_CODEGEN.cs b/NiceHashMiner/Utils/BINS_CODEGEN.cs index 3ab90b7..a8ae0b7 100644 --- a/NiceHashMiner/Utils/BINS_CODEGEN.cs +++ b/NiceHashMiner/Utils/BINS_CODEGEN.cs @@ -2,36 +2,54 @@ namespace NiceHashMiner.Utils { public static class Bins_Data { #region CODE_GEN STUFF // listFiles.py - public static string[] ALL_FILES_BINS = { @"\ccminer_cryptonight.exe", -@"\ccminer_decred.exe", -@"\ccminer_nanashi.exe", -@"\ccminer_neoscrypt.exe", -@"\ccminer_sp.exe", -@"\ccminer_tpruvot.exe", -@"\ccminer_x11gost.exe", -@"\cudart32_80.dll", -@"\cudart64_80.dll", -@"\ethminer.exe", -@"\libcrypto-1.0.0.dll", -@"\libcurl-4.dll", -@"\libcurl.dll", -@"\libgcc_s_seh-1.dll", -@"\libgmp-10.dll", -@"\libgmpxx-4.dll", -@"\libjansson-4.dll", -@"\libjson-c-2.dll", -@"\libmicrohttpd-dll.dll", -@"\libsigc-2.0-0.dll", -@"\libssl-1.0.0.dll", -@"\libstdc++-6.dll", -@"\libwinpthread-1.dll", -@"\libz-1.dll", -@"\msvcr120.dll", -@"\OpenCL.dll", + public static string[] ALL_FILES_BINS = { @"\vc_redist.x64.exe", -@"\zlib1.dll", +@"\ccminer_cryptonight\ccminer.exe", +@"\ccminer_cryptonight\cudart32_80.dll", +@"\ccminer_cryptonight\cudart64_80.dll", +@"\ccminer_cryptonight\msvcp120.dll", +@"\ccminer_cryptonight\msvcr120.dll", +@"\ccminer_decred\ccminer.exe", +@"\ccminer_decred\cudart32_80.dll", +@"\ccminer_decred\cudart64_80.dll", +@"\ccminer_decred\msvcp120.dll", +@"\ccminer_decred\msvcr120.dll", +@"\ccminer_nanashi\ccminer.exe", +@"\ccminer_nanashi\cudart32_80.dll", +@"\ccminer_nanashi\cudart64_80.dll", +@"\ccminer_nanashi\msvcp120.dll", +@"\ccminer_nanashi\msvcr120.dll", +@"\ccminer_neoscrypt\ccminer.exe", +@"\ccminer_neoscrypt\cudart32_80.dll", +@"\ccminer_neoscrypt\cudart64_80.dll", +@"\ccminer_neoscrypt\msvcp120.dll", +@"\ccminer_neoscrypt\msvcr120.dll", +@"\ccminer_sp\ccminer.exe", +@"\ccminer_sp\cudart32_80.dll", +@"\ccminer_sp\cudart64_80.dll", +@"\ccminer_sp\msvcp120.dll", +@"\ccminer_sp\msvcr120.dll", +@"\ccminer_tpruvot\ccminer.exe", +@"\ccminer_tpruvot\cudart32_80.dll", +@"\ccminer_tpruvot\cudart64_80.dll", +@"\ccminer_tpruvot\msvcp120.dll", +@"\ccminer_tpruvot\msvcr120.dll", +@"\ccminer_x11gost\ccminer.exe", +@"\ccminer_x11gost\cudart32_80.dll", +@"\ccminer_x11gost\cudart64_80.dll", +@"\ccminer_x11gost\msvcp120.dll", +@"\ccminer_x11gost\msvcr120.dll", +@"\ethminer\cudart64_80.dll", +@"\ethminer\ethminer.exe", +@"\ethminer\libcurl.dll", +@"\ethminer\libmicrohttpd-dll.dll", +@"\ethminer\msvcp120.dll", +@"\ethminer\msvcr120.dll", +@"\ethminer\OpenCL.dll", @"\excavator\cudart64_80.dll", @"\excavator\excavator.exe", +@"\excavator\msvcp120.dll", +@"\excavator\msvcr120.dll", @"\nheqminer_v0.4b\cpu_tromp_AVX.dll", @"\nheqminer_v0.4b\cpu_tromp_SSE2.dll", @"\nheqminer_v0.4b\cudart64_75.dll", @@ -44,7 +62,11 @@ public static class Bins_Data { @"\nheqminer_v0.4b\nheqminer.exe", @"\sgminer-5-6-0-general\sgminer.exe", @"\sgminer-gm\sgminer.exe", -@"\xmr-stak-cpu\xmr-stak-cpu.exe" +@"\xmr-stak-cpu\concrt140.dll", +@"\xmr-stak-cpu\msvcp140.dll", +@"\xmr-stak-cpu\vccorlib140.dll", +@"\xmr-stak-cpu\vcruntime140.dll", +@"\xmr-stak-cpu\xmr-stak-cpu.exe", }; #endregion //CODE_GEN STUFF // listFiles.py } diff --git a/NiceHashMiner/Utils/MinersDownloadManager.cs b/NiceHashMiner/Utils/MinersDownloadManager.cs index 3ea02a2..ad60ef1 100644 --- a/NiceHashMiner/Utils/MinersDownloadManager.cs +++ b/NiceHashMiner/Utils/MinersDownloadManager.cs @@ -15,7 +15,7 @@ namespace NiceHashMiner.Utils { public static class MinersDownloadManager { public static DownloadSetup StandardDlSetup = new DownloadSetup( - "https://github.com/nicehash/NiceHashMiner/releases/download/1.7.0.0-dev/bin_1_7_5_6.zip", + "https://github.com/nicehash/NiceHashMiner/releases/download/1.7.0.0-dev/bin_1_7_5_8.zip", "bins.zip", "bin");