Fixed SingleBoostr for newest version of Steam. Updated HourBoostr pa…

…ckages.
Ni1kko · Jan 1, 2018 · f769d2a · f769d2a
1 parent 673648e
commit f769d2a
Show file tree

Hide file tree

Showing 294 changed files with 86,446 additions and 75,359 deletions.
diff --git a/HourBoostr/.vs/HourBoostr/v14/.suo b/HourBoostr/.vs/HourBoostr/v14/.suo
diff --git a/HourBoostr/.vs/HourBoostr/v15/.suo b/HourBoostr/.vs/HourBoostr/v15/.suo
diff --git a/HourBoostr/.vs/HourBoostr/v15/Server/sqlite3/db.lock b/HourBoostr/.vs/HourBoostr/v15/Server/sqlite3/db.lock
diff --git a/HourBoostr/.vs/HourBoostr/v15/Server/sqlite3/storage.ide b/HourBoostr/.vs/HourBoostr/v15/Server/sqlite3/storage.ide
diff --git a/HourBoostr/HourBoostr/App.config b/HourBoostr/HourBoostr/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.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/HourBoostr/HourBoostr/Bot.cs b/HourBoostr/HourBoostr/Bot.cs
@@ -200,7 +200,6 @@ public Bot(Config.AccountSettings info)
             Connect();
         }
 
-
         /// <summary>
         /// Connect to Steam
         /// </summary>
@@ -275,13 +274,6 @@ private void BackgroundWorkerOnRunWorkerCompleted(object sender, RunWorkerComple
         /// <param name="callback">SteamClient.ConnectedCallback</param>
         private void OnConnected(SteamClient.ConnectedCallback callback)
         {
-            if (callback.Result != EResult.OK)
-            {
-                mLog.Write(Log.LogLevel.Warn, $"OnConnected error: {callback.Result}");
-                mIsRunning = false;
-                return;
-            }
-
             /*Set sentry hash*/
             byte[] sentryHash = null;
             if (File.Exists(mSteam.sentryPath))

diff --git a/HourBoostr/HourBoostr/Config.cs b/HourBoostr/HourBoostr/Config.cs
@@ -17,6 +17,12 @@ public class Settings
             public bool CheckForUpdates { get; set; } = true;
 
 
+            /// <summary>
+            /// If we should hide application to tray
+            /// </summary>
+            public bool HideToTray { get; set; } = true;
+
+
             /// <summary>
             /// List of accounts
             /// </summary>

diff --git a/HourBoostr/HourBoostr/HourBoostr.csproj b/HourBoostr/HourBoostr/HourBoostr.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HourBoostr</RootNamespace>
     <AssemblyName>HourBoostr</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -22,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,24 +33,34 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Win32.Registry, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Win32.Registry.4.4.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
-      <HintPath>..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SteamKit2, Version=1.8.2.0, Culture=neutral, PublicKeyToken=ed3ce47ed5aad940, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamKit2.1.8.2\lib\net45\SteamKit2.dll</HintPath>
+    <Reference Include="protobuf-net, Version=2.1.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.2.1.0\lib\net451\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="SteamKit2, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamKit2.2.0.0\lib\netstandard2.0\SteamKit2.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Security.AccessControl, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Principal.Windows, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -84,10 +96,10 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="icon.ico" />
+    <None Include="packages.config" />
     <None Include="Resources\icon.ico" />
     <None Include="media\icon.ico" />
     <None Include="media\icon.png" />

diff --git a/HourBoostr/HourBoostr/InMemoryServerListProvider.cs b/HourBoostr/HourBoostr/InMemoryServerListProvider.cs
@@ -38,6 +38,16 @@ public Task UpdateServerListAsync(IEnumerable<IPEndPoint> endPoints)
             return Task.Delay(0);
         }
 
+        Task<IEnumerable<ServerRecord>> IServerListProvider.FetchServerListAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task UpdateServerListAsync(IEnumerable<ServerRecord> endpoints)
+        {
+            throw new NotImplementedException();
+        }
+
         internal event EventHandler ServerListUpdated;
     }
 }
diff --git a/HourBoostr/HourBoostr/Properties/AssemblyInfo.cs b/HourBoostr/HourBoostr/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("3.1.0")]
-[assembly: AssemblyFileVersion("3.1.0")]
+[assembly: AssemblyVersion("3.2.1")]
+[assembly: AssemblyFileVersion("3.2.1")]
diff --git a/HourBoostr/HourBoostr/Session.cs b/HourBoostr/HourBoostr/Session.cs
@@ -58,8 +58,6 @@ public Session(Config.Settings settings)
         private void MBwg_DoWork(object sender, DoWorkEventArgs e)
         {
             /*Go through account and log them into steam*/
-            //SteamDirectory.Initialize().ConfigureAwait(true);
-            InitializeCMs(Program.mGlobalDB.CellID, Program.mGlobalDB.ServerListProvider);
             foreach (var account in mSettings.Accounts)
             {
                 if (account.IgnoreAccount)
@@ -94,31 +92,18 @@ private void MBwg_DoWork(object sender, DoWorkEventArgs e)
             /*Start status thread*/
             mThreadStatus = new Thread(ThreadStatus);
             mThreadStatus.Start();
-        }
-
-
-        /// <summary>
-        /// Borrowed this part from
-        /// https://github.com/JustArchi/ArchiSteamFarm
-        /// </summary>
-        /// <param name="cellId">steam cellid</param>
-        /// <param name="serverList">list of cm servers</param>
-        private void InitializeCMs(uint cellId, IServerListProvider serverList)
-        {
-            CMClient.Servers.CellID = cellId;
-            CMClient.Servers.ServerListProvider = serverList;
-            Console.WriteLine("Initializing SteamDirectory ...");
 
-            try
+            if (mSettings.HideToTray)
             {
-                SteamDirectory.Initialize(cellId).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"Error configuring CM. Connecting might take longer than usual. {ex.Message}");
+
             }
         }
 
+        private void HideAppToTray()
+        {
+
+        }
+
 
         /// <summary>
         /// Returns the DateTime of when the application was built

diff --git a/HourBoostr/HourBoostr/SteamWeb.cs b/HourBoostr/HourBoostr/SteamWeb.cs
@@ -95,7 +95,7 @@ public bool Authenticate(string myUniqueId, SteamClient client, string myLoginKe
 
                 // rsa encrypt it with the public key for the universe we're on
                 byte[] cryptedSessionKey = null;
-                using (RSACrypto rsa = new RSACrypto(KeyDictionary.GetPublicKey(client.ConnectedUniverse)))
+                using (RSACrypto rsa = new RSACrypto(KeyDictionary.GetPublicKey(client.Universe)))
                 {
                     cryptedSessionKey = rsa.Encrypt(sessionKey);
                 }

diff --git a/HourBoostr/HourBoostr/packages.config b/HourBoostr/HourBoostr/packages.config
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net471" />
   <package id="Newtonsoft.Json" version="10.0.1" targetFramework="net452" />
-  <package id="protobuf-net" version="2.0.0.668" targetFramework="net452" />
-  <package id="SteamKit2" version="1.8.2" targetFramework="net452" />
+  <package id="protobuf-net" version="2.1.0" targetFramework="net471" />
+  <package id="SteamKit2" version="2.0.0" targetFramework="net471" />
+  <package id="System.Security.AccessControl" version="4.4.0" targetFramework="net471" />
+  <package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net471" />
 </packages>
diff --git a/HourBoostr/Settings/.vs/Settings/v14/.suo b/HourBoostr/Settings/.vs/Settings/v14/.suo
diff --git a/HourBoostr/Settings/.vs/Settings/v15/.suo b/HourBoostr/Settings/.vs/Settings/v15/.suo
diff --git a/HourBoostr/Settings/.vs/Settings/v15/Server/sqlite3/db.lock b/HourBoostr/Settings/.vs/Settings/v15/Server/sqlite3/db.lock
diff --git a/HourBoostr/Settings/.vs/Settings/v15/Server/sqlite3/storage.ide b/HourBoostr/Settings/.vs/Settings/v15/Server/sqlite3/storage.ide
diff --git a/HourBoostr/Settings/Settings.sln b/HourBoostr/Settings/Settings.sln
@@ -1,20 +1,26 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Settings", "Settings\Settings.csproj", "{26846449-44E9-4D8C-91BF-F6789207FC80}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{26846449-44E9-4D8C-91BF-F6789207FC80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{26846449-44E9-4D8C-91BF-F6789207FC80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26846449-44E9-4D8C-91BF-F6789207FC80}.Debug|x86.ActiveCfg = Debug|x86
+		{26846449-44E9-4D8C-91BF-F6789207FC80}.Debug|x86.Build.0 = Debug|x86
 		{26846449-44E9-4D8C-91BF-F6789207FC80}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26846449-44E9-4D8C-91BF-F6789207FC80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26846449-44E9-4D8C-91BF-F6789207FC80}.Release|x86.ActiveCfg = Release|x86
+		{26846449-44E9-4D8C-91BF-F6789207FC80}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/HourBoostr/Settings/Settings/Config.cs b/HourBoostr/Settings/Settings/Config.cs
@@ -19,6 +19,12 @@ public class Settings
             public bool CheckForUpdates { get; set; } = true;
 
 
+            /// <summary>
+            /// If we should hide application to tray
+            /// </summary>
+            public bool HideToTray { get; set; } = true;
+
+
             /// <summary>
             /// List of accounts
             /// </summary>

diff --git a/HourBoostr/Settings/Settings/Properties/AssemblyInfo.cs b/HourBoostr/Settings/Settings/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("3.1.0")]
-[assembly: AssemblyFileVersion("3.1.0")]
+[assembly: AssemblyVersion("3.2.1")]
+[assembly: AssemblyFileVersion("3.2.1")]
diff --git a/HourBoostr/Settings/Settings/Settings.csproj b/HourBoostr/Settings/Settings/Settings.csproj
@@ -36,6 +36,26 @@
   <PropertyGroup>
     <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>