Move core to external libs, Starting terminal crossplatform client

.vs/VSWorkspaceState.json

@@ -1,8 +0,0 @@
-{
-  "ExpandedNodes": [
-    "",
-    "\\OpenSaveCloudClient"
-  ],
-  "SelectedNode": "\\OpenSaveCloudClient\\OpenSaveCloudClient.csproj",
-  "PreviewInSolutionExplorer": false
-}

OpenSaveCloudCli/OpenSaveCloudCli.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OpenSaveCloudCore\OpenSaveCloudCore.csproj" />
+  </ItemGroup>
+
+</Project>

OpenSaveCloudCli/Program.cs

@@ -0,0 +1,36 @@
+using OpenSaveCloudCore.Core;
+using System.Reflection;
+
+namespace OpenSaveCloudCli
+{
+    internal static class Program
+    {
+        static int Main(string[] args)
+        {
+            if (args.Contains("-v") || args.Contains("--version"))
+            {
+                Version();
+            }
+            return 0;
+        }
+
+        static void Version()
+        {
+            Assembly a = Assembly.GetExecutingAssembly();
+            Version? v = a.GetName().Version;
+            string clientInfo = "C# [Core .NET {0}/{1}]";
+            Version dotNetVersion = Environment.Version;
+            string? clrArch = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE");
+            clientInfo = string.Format(clientInfo, dotNetVersion, clrArch);
+
+            Console.WriteLine("Open Save Cloud - Terminal Client (Cross Platform)");
+            if (v != null)
+            {
+                Console.WriteLine("v{0}", v.ToString());
+            }
+            Console.WriteLine("Running on .Net {0}", clientInfo);
+
+            // TODO get server version
+        }
+    }
+}

OpenSaveCloudClient.sln

@@ -4,6 +4,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.2.32505.173
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSaveCloudClient", "OpenSaveCloudClient\OpenSaveCloudClient.csproj", "{5BD9E525-B234-4AE2-9780-86E959592258}"
+	ProjectSection(ProjectDependencies) = postProject
+		{496FCF95-DA39-4699-BDF9-8824FFE58F16} = {496FCF95-DA39-4699-BDF9-8824FFE58F16}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSaveCloudCore", "OpenSaveCloudCore\OpenSaveCloudCore.csproj", "{496FCF95-DA39-4699-BDF9-8824FFE58F16}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSaveCloudCli", "OpenSaveCloudCli\OpenSaveCloudCli.csproj", "{3D3DD97A-9140-458D-BB94-3505F362A305}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +28,22 @@ Global
 		{5BD9E525-B234-4AE2-9780-86E959592258}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5BD9E525-B234-4AE2-9780-86E959592258}.Release|x64.ActiveCfg = Release|x64
 		{5BD9E525-B234-4AE2-9780-86E959592258}.Release|x64.Build.0 = Release|x64
+		{496FCF95-DA39-4699-BDF9-8824FFE58F16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{496FCF95-DA39-4699-BDF9-8824FFE58F16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{496FCF95-DA39-4699-BDF9-8824FFE58F16}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{496FCF95-DA39-4699-BDF9-8824FFE58F16}.Debug|x64.Build.0 = Debug|Any CPU
+		{496FCF95-DA39-4699-BDF9-8824FFE58F16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{496FCF95-DA39-4699-BDF9-8824FFE58F16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{496FCF95-DA39-4699-BDF9-8824FFE58F16}.Release|x64.ActiveCfg = Release|Any CPU
+		{496FCF95-DA39-4699-BDF9-8824FFE58F16}.Release|x64.Build.0 = Release|Any CPU
+		{3D3DD97A-9140-458D-BB94-3505F362A305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D3DD97A-9140-458D-BB94-3505F362A305}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D3DD97A-9140-458D-BB94-3505F362A305}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3D3DD97A-9140-458D-BB94-3505F362A305}.Debug|x64.Build.0 = Debug|Any CPU
+		{3D3DD97A-9140-458D-BB94-3505F362A305}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D3DD97A-9140-458D-BB94-3505F362A305}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D3DD97A-9140-458D-BB94-3505F362A305}.Release|x64.ActiveCfg = Release|Any CPU
+		{3D3DD97A-9140-458D-BB94-3505F362A305}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

OpenSaveCloudClient/AboutBox.cs

@@ -1,5 +1,5 @@
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
-using OpenSaveCloudClient.Models.Remote;
+using OpenSaveCloudCore.Models.Remote;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

OpenSaveCloudClient/AddGameForm.cs

@@ -1,5 +1,5 @@
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

OpenSaveCloudClient/AddUser.cs

@@ -1,5 +1,5 @@
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
-using OpenSaveCloudClient.Models.Remote;
+using OpenSaveCloudCore.Models.Remote;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

OpenSaveCloudClient/DetailForm.cs

@@ -1,5 +1,5 @@
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

OpenSaveCloudClient/DownloadGameForm.cs

@@ -1,6 +1,6 @@
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
-using OpenSaveCloudClient.Models.Remote;
+using OpenSaveCloudCore.Models.Remote;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

OpenSaveCloudClient/GameLibraryForm.cs

@@ -1,6 +1,6 @@
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
-using OpenSaveCloudClient.Models.Remote;
+using OpenSaveCloudCore.Models.Remote;
 
 namespace OpenSaveCloudClient
 {

OpenSaveCloudClient/LoginForm.cs

@@ -1,4 +1,4 @@
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

OpenSaveCloudClient/LogsForm.cs

@@ -7,8 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
 
 namespace OpenSaveCloudClient
 {

OpenSaveCloudClient/OpenSaveCloudClient.csproj

@@ -14,7 +14,7 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>D:\keyPair.snk</AssemblyOriginatorKeyFile>
     <AnalysisLevel>6.0-all</AnalysisLevel>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PasswordGenerator" Version="2.1.0" />
+    <ProjectReference Include="..\OpenSaveCloudCore\OpenSaveCloudCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>

OpenSaveCloudClient/SettingsForm.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
 
 namespace OpenSaveCloudClient
 {

OpenSaveCloudClient/TasksForm.cs

@@ -1,5 +1,5 @@
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

OpenSaveCloudClient/UserForm.cs

@@ -1,5 +1,5 @@
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
-using OpenSaveCloudClient.Models.Remote;
+using OpenSaveCloudCore.Models.Remote;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

OpenSaveCloudClient/UserManagementForm.cs

@@ -1,5 +1,5 @@
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
-using OpenSaveCloudClient.Models.Remote;
+using OpenSaveCloudCore.Models.Remote;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

OpenSaveCloudClient/WaitingForm.cs

@@ -1,5 +1,5 @@
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

OpenSaveCloudCore/Core/HashTool.cs

@@ -5,7 +5,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Core
+namespace OpenSaveCloudCore.Core
 {
     internal class HashTool
     {

OpenSaveCloudCore/Core/LogManager.cs

@@ -1,11 +1,11 @@
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Core
+namespace OpenSaveCloudCore.Core
 {
     public class LogManager
     {

OpenSaveCloudCore/Core/PasswordTool.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Core
+namespace OpenSaveCloudCore.Core
 {
     public class PasswordTool
     {

OpenSaveCloudCore/Core/SaveManager.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
 
-namespace OpenSaveCloudClient.Core
+namespace OpenSaveCloudCore.Core
 {
     public class SaveManager
     {

OpenSaveCloudCore/Core/ServerConnector.cs

@@ -4,12 +4,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Text.Json;
-using OpenSaveCloudClient.Models.Remote;
+using OpenSaveCloudCore.Models.Remote;
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
 using System.Net.Http.Headers;
 using System.IO.Compression;
 
-namespace OpenSaveCloudClient.Core
+namespace OpenSaveCloudCore.Core
 {
     /// <summary>
     /// This class is a connector to the remote Open Save Cloud server, it contains all the function that are mapped to the server endpoint

OpenSaveCloudCore/Core/TaskManager.cs

@@ -1,11 +1,11 @@
-using OpenSaveCloudClient.Models;
+using OpenSaveCloudCore.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Core
+namespace OpenSaveCloudCore.Core
 {
     public class TaskManager
     {

OpenSaveCloudCore/Models/AsyncTaskInformation.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models
+namespace OpenSaveCloudCore.Models
 {
     public class AsyncTaskInformation
     {

OpenSaveCloudCore/Models/AsyncTaskStatus.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models
+namespace OpenSaveCloudCore.Models
 {
     public enum AsyncTaskStatus
     {

OpenSaveCloudCore/Models/Configuration.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Text.Json;
 
-namespace OpenSaveCloudClient.Models
+namespace OpenSaveCloudCore.Models
 {
     public class UserConfiguration
     {

OpenSaveCloudCore/Models/GameSave.cs

@@ -6,10 +6,10 @@ using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using System.IO.Compression;
 using System.Security.Cryptography;
-using OpenSaveCloudClient.Core;
+using OpenSaveCloudCore.Core;
 using System.Globalization;
 
-namespace OpenSaveCloudClient.Models
+namespace OpenSaveCloudCore.Models
 {
     public class GameSave
     {

OpenSaveCloudCore/Models/Log.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models
+namespace OpenSaveCloudCore.Models
 {
     public enum LogSeverity
     {

OpenSaveCloudCore/Models/Remote/AccessToken.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class AccessToken
     {

OpenSaveCloudCore/Models/Remote/Credential.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class Credential
     {

OpenSaveCloudCore/Models/Remote/Game.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class Game
     {

OpenSaveCloudCore/Models/Remote/GameUploadToken.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class GameUploadToken
     {

OpenSaveCloudCore/Models/Remote/HttpError.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class HttpError
     {

OpenSaveCloudCore/Models/Remote/LockError.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class LockError
     {

OpenSaveCloudCore/Models/Remote/NewGameInfo.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class NewGameInfo
     {

OpenSaveCloudCore/Models/Remote/NewPassword.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class NewPassword
     {

OpenSaveCloudCore/Models/Remote/Registration.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class Registration
     {

OpenSaveCloudCore/Models/Remote/ServerInformation.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class ServerInformation
     {

OpenSaveCloudCore/Models/Remote/TokenValidation.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class TokenValidation
     {

OpenSaveCloudCore/Models/Remote/UpdateUsername.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class UpdateUsername
     {

OpenSaveCloudCore/Models/Remote/UploadGameInfo.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class UploadGameInfo
     {

OpenSaveCloudCore/Models/Remote/User.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace OpenSaveCloudClient.Models.Remote
+namespace OpenSaveCloudCore.Models.Remote
 {
     public class User
     {

OpenSaveCloudCore/OpenSaveCloudCore.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Version>1.0.0</Version>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="PasswordGenerator" Version="2.1.0" />
+  </ItemGroup>
+
+</Project>