Update

ChrisPulman · ChrisPulman · commit fa10863c59dd · 2025-07-21T09:35:55.000+01:00
diff --git a/build/Build.cs b/build/Build.cs
@@ -6,7 +6,6 @@
 using Nuke.Common.Tools.DotNet;
 using Nuke.Common.Tools.MSBuild;
 using Nuke.Common.Utilities.Collections;
-using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
 
@@ -135,7 +134,7 @@ void BuildApp(MSBuildTargetPlatform platform)
             Serilog.Log.Information("Moving APK files to artifacts directory...");
             SourceDirectory
                 .GlobFiles("**/bin/**/*-Signed.apk")
-                .ForEach(file => MoveFileToDirectory(file, ArtifactsDirectory));
+                .ForEach(file => file.MoveToDirectory(ArtifactsDirectory));
             Serilog.Log.Information("Successfully moved APK files.");
         });
 
diff --git a/build/Configuration.cs b/build/Configuration.cs
@@ -9,8 +9,5 @@ public class Configuration : Enumeration
     public static Configuration Debug = new Configuration { Value = nameof(Debug) };
     public static Configuration Release = new Configuration { Value = nameof(Release) };
 
-    public static implicit operator string(Configuration configuration)
-    {
-        return configuration.Value;
-    }
+    public static implicit operator string(Configuration configuration) => configuration.Value;
 }
diff --git a/build/build.csproj b/build/build.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="9.0.4" />
+    <PackageReference Include="Nuke.Common" Version="8.1.4" />
     <PackageDownload Include="GitVersion.Tool" Version="[5.10.3]" />
   </ItemGroup>
 
diff --git a/src/Camelotia.Presentation.Avalonia/Services/AvaloniaFileManager.cs b/src/Camelotia.Presentation.Avalonia/Services/AvaloniaFileManager.cs
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using Avalonia.Controls;
 using Camelotia.Services.Interfaces;
 
@@ -25,7 +21,7 @@ public async Task<Stream> OpenWrite(string name)
     {
         var fileDialog = new OpenFileDialog { AllowMultiple = false };
         var files = await fileDialog.ShowAsync(_window).ConfigureAwait(false);
-        var path = files.First();
+        var path = files[0];
 
         var attributes = File.GetAttributes(path);
         var isFolder = attributes.HasFlag(FileAttributes.Directory);
@@ -35,4 +31,4 @@ public async Task<Stream> OpenWrite(string name)
         var name = Path.GetFileName(path);
         return (name, stream);
     }
-}
+}
diff --git a/src/Camelotia.Presentation.Avalonia/Services/AvaloniaYandexAuthenticator.cs b/src/Camelotia.Presentation.Avalonia/Services/AvaloniaYandexAuthenticator.cs
@@ -1,8 +1,6 @@
-﻿using System;
-using System.Diagnostics;
+﻿using System.Diagnostics;
 using System.Net;
 using System.Text;
-using System.Threading.Tasks;
 using Camelotia.Services.Interfaces;
 
 namespace Camelotia.Presentation.Avalonia.Services;
@@ -42,4 +40,4 @@ public async Task<string> ReceiveCode(Uri uri, Uri returnUrl)
         listener.Close();
         return code;
     }
-}
+}
diff --git a/src/Camelotia.Presentation.Xamarin.Android/Camelotia.Presentation.Xamarin.Droid.csproj b/src/Camelotia.Presentation.Xamarin.Android/Camelotia.Presentation.Xamarin.Droid.csproj
@@ -62,11 +62,6 @@
     <PackageReference Include="Xamarin.Android.Support.Compat" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Threading.Tasks.Extensions">
-      <HintPath>$(UserProfile)\.nuget\packages\system.threading.tasks.extensions\4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
     <Compile Include="Renderers\AccentButtonRenderer.cs" />
@@ -77,7 +72,6 @@
     <Compile Include="WebActivity.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Assets\AboutAssets.txt" />
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
@@ -126,4 +120,4 @@
   <Target Name="Pack">
   </Target>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
+</Project>
diff --git a/src/Camelotia.Presentation.Xamarin.Android/MainActivity.cs b/src/Camelotia.Presentation.Xamarin.Android/MainActivity.cs
@@ -11,6 +11,7 @@
 using Camelotia.Presentation.Xamarin.Droid.Services;
 using Camelotia.Services;
 using ReactiveUI;
+using ReactiveUI.XamForms;
 
 namespace Camelotia.Presentation.Xamarin.Droid
 {
diff --git a/src/Camelotia.Presentation.Xamarin.Android/Renderers/AccentButtonRenderer.cs b/src/Camelotia.Presentation.Xamarin.Android/Renderers/AccentButtonRenderer.cs
@@ -56,4 +56,4 @@ private void ApplyColors(VisualElement control)
             Control.SetTextColor(foreground);
         }
     }
-}
+}
diff --git a/src/Camelotia.Presentation.Xamarin.Android/Resources/Resource.designer.cs b/src/Camelotia.Presentation.Xamarin.Android/Resources/Resource.designer.cs
diff --git a/src/Camelotia.Presentation.Xamarin.Android/Resources/layout/Tabbar.axml b/src/Camelotia.Presentation.Xamarin.Android/Resources/layout/Tabbar.axml
@@ -5,7 +5,4 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/colorPrimary"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    app:tabIndicatorColor="@android:color/white"
-    app:tabGravity="fill"
-    app:tabMode="fixed" />
+    android:theme="@android:style/Theme.DeviceDefault.Light.DarkActionBar" />
diff --git a/src/Camelotia.Presentation/ViewModels/HostAuthViewModel.cs b/src/Camelotia.Presentation/ViewModels/HostAuthViewModel.cs
@@ -100,6 +100,7 @@ protected override void Dispose(bool disposing)
             _errorMessage?.Dispose();
             _hasErrorMessage?.Dispose();
             _isBusy?.Dispose();
+            Login?.Dispose();
         }
 
         base.Dispose(disposing);
diff --git a/src/Camelotia.Services/Camelotia.Services.csproj b/src/Camelotia.Services/Camelotia.Services.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="akavache" Version="10.2.41" />
-    <PackageReference Include="FluentFTP" Version="52.1.0" />
+    <PackageReference Include="FluentFTP" Version="37.0.3" />
     <PackageReference Include="Google.Apis.Drive.v3" Version="1.70.0.3834" />
     <PackageReference Include="Octokit" Version="14.0.0" />
     <PackageReference Include="ssh.net" Version="2025.0.0" />
diff --git a/src/Camelotia.Services/CloudFactory.cs b/src/Camelotia.Services/CloudFactory.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using Akavache;
 using Camelotia.Services.Configuration;
 using Camelotia.Services.Interfaces;
diff --git a/src/Camelotia.Services/Interfaces/IAuthenticator.cs b/src/Camelotia.Services/Interfaces/IAuthenticator.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Threading.Tasks;
-
-namespace Camelotia.Services.Interfaces;
+﻿namespace Camelotia.Services.Interfaces;
 
 public interface IAuthenticator
 {
diff --git a/src/Camelotia.Services/Interfaces/ICloud.cs b/src/Camelotia.Services/Interfaces/ICloud.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
 using Camelotia.Services.Models;
 
 namespace Camelotia.Services.Interfaces;
diff --git a/src/Camelotia.Services/Interfaces/ICloudFactory.cs b/src/Camelotia.Services/Interfaces/ICloudFactory.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Camelotia.Services.Models;
 
 namespace Camelotia.Services.Interfaces;
diff --git a/src/Camelotia.Services/Interfaces/IFileManager.cs b/src/Camelotia.Services/Interfaces/IFileManager.cs
@@ -1,6 +1,3 @@
-using System.IO;
-using System.Threading.Tasks;
-
 namespace Camelotia.Services.Interfaces;
 
 public interface IFileManager
diff --git a/src/Camelotia.Services/Models/CloudParameters.cs b/src/Camelotia.Services/Models/CloudParameters.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Camelotia.Services.Models;
 
 public class CloudParameters
diff --git a/src/Camelotia.Services/Models/FileModel.cs b/src/Camelotia.Services/Models/FileModel.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Camelotia.Services.Models;
 
 public class FileModel
diff --git a/src/Camelotia.Services/Models/FolderModel.cs b/src/Camelotia.Services/Models/FolderModel.cs
@@ -1,7 +1,4 @@
-﻿using System.Collections.Generic;
-using System.Linq;
-
-namespace Camelotia.Services.Models;
+﻿namespace Camelotia.Services.Models;
 
 public class FolderModel
 {
diff --git a/src/Camelotia.Services/Providers/GitHubCloud.cs b/src/Camelotia.Services/Providers/GitHubCloud.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
 using System.Reactive.Subjects;
-using System.Threading.Tasks;
 using Camelotia.Services.Configuration;
 using Camelotia.Services.Interfaces;
 using Camelotia.Services.Models;
diff --git a/src/Camelotia.Services/Providers/GoogleDriveCloud.cs b/src/Camelotia.Services/Providers/GoogleDriveCloud.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using System.Threading;
-using System.Threading.Tasks;
 using Akavache;
 using Camelotia.Services.Configuration;
 using Camelotia.Services.Interfaces;
diff --git a/src/Camelotia.Services/Providers/LocalCloud.cs b/src/Camelotia.Services/Providers/LocalCloud.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Reactive.Linq;
-using System.Threading.Tasks;
 using Camelotia.Services.Interfaces;
 using Camelotia.Services.Models;
 
diff --git a/src/Camelotia.Services/Providers/SftpCloud.cs b/src/Camelotia.Services/Providers/SftpCloud.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Reactive.Subjects;
-using System.Threading.Tasks;
 using Camelotia.Services.Interfaces;
 using Camelotia.Services.Models;
 using Renci.SshNet;
diff --git a/src/Camelotia.Services/Providers/YandexDiskCloud.cs b/src/Camelotia.Services/Providers/YandexDiskCloud.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Reactive.Subjects;
-using System.Threading.Tasks;
 using Camelotia.Services.Configuration;
 using Camelotia.Services.Interfaces;
 using Camelotia.Services.Models;
diff --git a/src/Camelotia.sln b/src/Camelotia.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36310.24 d17.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Camelotia.Services", "Camelotia.Services\Camelotia.Services.csproj", "{283B8F56-AB9F-4556-AB93-AAC54171841C}"
 EndProject
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Camelotia.Presentation.Aval
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Camelotia.Presentation.Uwp", "Camelotia.Presentation.Uwp\Camelotia.Presentation.Uwp.csproj", "{359DA275-5214-457A-887D-DDBD9763667B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Camelotia.Presentation.Xamarin.Droid", "Camelotia.Presentation.Xamarin.Android\Camelotia.Presentation.Xamarin.Droid.csproj", "{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Camelotia.Presentation.Xamarin", "Camelotia.Presentation.Xamarin\Camelotia.Presentation.Xamarin.csproj", "{F019715C-675A-463B-AF36-58585F6FA7DF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Camelotia.Presentation.Wpf", "Camelotia.Presentation.Wpf\Camelotia.Presentation.Wpf.csproj", "{E9EEEBF4-5F8D-480C-BD0A-9E5801189424}"
@@ -129,36 +127,6 @@ Global
 		{359DA275-5214-457A-887D-DDBD9763667B}.Release|x86.ActiveCfg = Release|x86
 		{359DA275-5214-457A-887D-DDBD9763667B}.Release|x86.Build.0 = Release|x86
 		{359DA275-5214-457A-887D-DDBD9763667B}.Release|x86.Deploy.0 = Release|x86
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|ARM64.Deploy.0 = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|x64.Build.0 = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|x86.Build.0 = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|ARM.Build.0 = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|ARM.Deploy.0 = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|ARM64.Build.0 = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|ARM64.Deploy.0 = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|x64.ActiveCfg = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|x64.Build.0 = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|x64.Deploy.0 = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|x86.ActiveCfg = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|x86.Build.0 = Release|Any CPU
-		{24CE3C36-16B9-426D-AA0C-5961ECF8D88C}.Release|x86.Deploy.0 = Release|Any CPU
 		{F019715C-675A-463B-AF36-58585F6FA7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F019715C-675A-463B-AF36-58585F6FA7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F019715C-675A-463B-AF36-58585F6FA7DF}.Debug|ARM.ActiveCfg = Debug|Any CPU

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,5 @@ public class Configuration : Enumeration`
`9`	`9`	`public static Configuration Debug = new Configuration { Value = nameof(Debug) };`
`10`	`10`	`public static Configuration Release = new Configuration { Value = nameof(Release) };`
`11`	`11`
`12`		`- public static implicit operator string(Configuration configuration)`
`13`		`- {`
`14`		`- return configuration.Value;`
`15`		`- }`
	`12`	`+ public static implicit operator string(Configuration configuration) => configuration.Value;`
`16`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`using Camelotia.Presentation.Xamarin.Droid.Services;`
`12`	`12`	`using Camelotia.Services;`
`13`	`13`	`using ReactiveUI;`
	`14`	`+using ReactiveUI.XamForms;`
`14`	`15`
`15`	`16`	`namespace Camelotia.Presentation.Xamarin.Droid`
`16`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,4 @@ private void ApplyColors(VisualElement control)`
`56`	`56`	`Control.SetTextColor(foreground);`
`57`	`57`	`}`
`58`	`58`	`}`
`59`		`-}`
	`59`	`+}`