Extraction finished

5 years ago · 58c58fccdf
parent 95fc16eddc e9e5476e67
commit 58c58fccdf
12 changed files with 92 additions and 55 deletions
--- a/DepotDownloader.Core/AccountSettingsStore.cs
+++ b/DepotDownloader.Core/AccountSettingsStore.cs
@ -8,10 +8,10 @@ using System.Linq;
 using SteamKit2;
 using SteamKit2.Discovery;

-namespace DepotDownloader
+namespace DepotDownloader.Core
 {
    [ProtoContract]
-    class AccountSettingsStore
+    public class AccountSettingsStore
    {
        [ProtoMember(1, IsRequired=false)]
        public Dictionary<string, byte[]> SentryData { get; private set; }
--- a/DepotDownloader.Core/CDNClientPool.cs
+++ b/DepotDownloader.Core/CDNClientPool.cs
@ -7,12 +7,12 @@ using System.Net;
 using System.Threading;
 using System.Threading.Tasks;

-namespace DepotDownloader
+namespace DepotDownloader.Core
 {
    /// <summary>
    /// CDNClientPool provides a pool of connections to CDN endpoints, requesting CDN tokens as needed
    /// </summary>
-    class CDNClientPool
+    public class CDNClientPool
    {
        private const int ServerEndpointMinimumSize = 8;

--- a/DepotDownloader.Core/ContentDownloader.cs
+++ b/DepotDownloader.Core/ContentDownloader.cs
@ -1,4 +1,4 @@
-using SteamKit2;
+using SteamKit2;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@ -10,14 +10,14 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;

-namespace DepotDownloader
+namespace DepotDownloader.Core
 {
    public class ContentDownloaderException : System.Exception
    {
        public ContentDownloaderException( String value ) : base( value ) {}
    }

-    static class ContentDownloader
+    public static class ContentDownloader
    {
        public const uint INVALID_APP_ID = uint.MaxValue;
        public const uint INVALID_DEPOT_ID = uint.MaxValue;
--- a/DepotDownloader.Core/DepotConfigStore.cs
+++ b/DepotDownloader.Core/DepotConfigStore.cs
@ -4,7 +4,7 @@ using ProtoBuf;
 using System.IO;
 using System.IO.Compression;

-namespace DepotDownloader
+namespace DepotDownloader.Core
 {
    [ProtoContract]
    class DepotConfigStore
--- a/DepotDownloader.Core/DepotDownloader.Core.csproj
+++ b/DepotDownloader.Core/DepotDownloader.Core.csproj
@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <Company>SteamRE et al.</Company>
+    <Authors>SteamRE et al</Authors>
+    <Product>DepotDownloader</Product>
+    <Description>Steam depot downloader utilizing the SteamKit2 library. Core library built on .NET Standard 2.0</Description>
+    <RepositoryUrl>https://github.com/SteamRE/DepotDownloader</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <Version>2.4.0</Version>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="protobuf-net" Version="3.0.52" />
+    <PackageReference Include="SteamKit2" Version="2.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
+</Project>
--- a/DepotDownloader.Core/DownloadConfig.cs
+++ b/DepotDownloader.Core/DownloadConfig.cs
@ -1,33 +1,33 @@
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-namespace DepotDownloader
-{
-    class DownloadConfig
-    {
-        public int CellID { get; set; }
-        public bool DownloadAllPlatforms { get; set; }
-        public bool DownloadAllLanguages { get; set; }
-        public bool DownloadManifestOnly { get; set; }
-        public string InstallDirectory { get; set; }
-
-        public bool UsingFileList { get; set; }
-        public List<string> FilesToDownload { get; set; }
-        public List<Regex> FilesToDownloadRegex { get; set; }
-
-        public bool UsingExclusionList { get; set; }
-
-        public string BetaPassword { get; set; }
-
-        public bool VerifyAll { get; set; }
-
-        public int MaxServers { get; set; }
-        public int MaxDownloads { get; set; }
-
-        public string SuppliedPassword { get; set; }
-        public bool RememberPassword { get; set; }
-
-        // A Steam LoginID to allow multiple concurrent connections
-        public uint? LoginID {get; set; }
-    }
-}
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace DepotDownloader.Core
+{
+    public class DownloadConfig
+    {
+        public int CellID { get; set; }
+        public bool DownloadAllPlatforms { get; set; }
+        public bool DownloadAllLanguages { get; set; }
+        public bool DownloadManifestOnly { get; set; }
+        public string InstallDirectory { get; set; }
+
+        public bool UsingFileList { get; set; }
+        public List<string> FilesToDownload { get; set; }
+        public List<Regex> FilesToDownloadRegex { get; set; }
+
+        public bool UsingExclusionList { get; set; }
+
+        public string BetaPassword { get; set; }
+
+        public bool VerifyAll { get; set; }
+
+        public int MaxServers { get; set; }
+        public int MaxDownloads { get; set; }
+
+        public string SuppliedPassword { get; set; }
+        public bool RememberPassword { get; set; }
+
+        // A Steam LoginID to allow multiple concurrent connections
+        public uint? LoginID {get; set; }
+    }
+}
--- a/DepotDownloader.Core/ProtoManifest.cs
+++ b/DepotDownloader.Core/ProtoManifest.cs
@ -6,10 +6,10 @@ using System.IO.Compression;
 using ProtoBuf;
 using SteamKit2;

-namespace DepotDownloader
+namespace DepotDownloader.Core
 {
    [ProtoContract()]
-    class ProtoManifest
+    public class ProtoManifest
    {
        // Proto ctor
        private ProtoManifest()
--- a/DepotDownloader.Core/Steam3Session.cs
+++ b/DepotDownloader.Core/Steam3Session.cs
@ -1,4 +1,4 @@
-using SteamKit2;
+using SteamKit2;
 using SteamKit2.Internal;
 using System;
 using System.Collections.Concurrent;
@ -9,10 +9,10 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;

-namespace DepotDownloader
+namespace DepotDownloader.Core
 {

-    class Steam3Session
+    public class Steam3Session
    {
        public class Credentials
        {
@ -657,7 +657,7 @@ namespace DepotDownloader
            {
                if ( license.AccessToken > 0 )
                {
-                    PackageTokens.TryAdd( license.PackageID, license.AccessToken );
+                    PackageTokens.TryAdd(license.PackageID, license.AccessToken);
                }
            }
        }
--- a/DepotDownloader.Core/Util.cs
+++ b/DepotDownloader.Core/Util.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@ -7,9 +7,9 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;

-namespace DepotDownloader
+namespace DepotDownloader.Core
 {
-    static class Util
+    public static class Util
    {
        public static string GetSteamOS()
        {
--- a/DepotDownloader.sln
+++ b/DepotDownloader.sln
@ -1,9 +1,11 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30517.126
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DepotDownloader", "DepotDownloader\DepotDownloader.csproj", "{39159C47-ACD3-449F-96CA-4F30C8ED147A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DepotDownloader", "DepotDownloader\DepotDownloader.csproj", "{39159C47-ACD3-449F-96CA-4F30C8ED147A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DepotDownloader.Core", "DepotDownloader.Core\DepotDownloader.Core.csproj", "{8303B6A1-CE40-4C26-9376-DB08290645F7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -15,8 +17,15 @@ Global
 		{39159C47-ACD3-449F-96CA-4F30C8ED147A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39159C47-ACD3-449F-96CA-4F30C8ED147A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39159C47-ACD3-449F-96CA-4F30C8ED147A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8303B6A1-CE40-4C26-9376-DB08290645F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8303B6A1-CE40-4C26-9376-DB08290645F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8303B6A1-CE40-4C26-9376-DB08290645F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8303B6A1-CE40-4C26-9376-DB08290645F7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B9D19618-4471-4B6A-999B-3884575BE066}
+	EndGlobalSection
 EndGlobal
--- a/DepotDownloader/DepotDownloader.csproj
+++ b/DepotDownloader/DepotDownloader.csproj
@ -5,7 +5,6 @@
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="protobuf-net" Version="3.0.52" />
-    <PackageReference Include="SteamKit2" Version="2.3.0" />
+    <ProjectReference Include="..\DepotDownloader.Core\DepotDownloader.Core.csproj" />
  </ItemGroup>
 </Project>
--- a/DepotDownloader/Program.cs
+++ b/DepotDownloader/Program.cs
@ -6,6 +6,8 @@ using SteamKit2;
 using System.ComponentModel;
 using System.Threading.Tasks;
 using System.Runtime.InteropServices;
+using DepotDownloader.Core;
+
 namespace DepotDownloader
 {
    class Program