Skip to content

Commit 087c81b

Browse files
gave92gave92
committed
Merge branch 'main' of https://github.com/files-community/Files into terminal
2 parents 729f2dc + 008bdd2 commit 087c81b

File tree

277 files changed

+10135
-3077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+10135
-3077
lines changed

‎src/Files.App (Package)/Files.Package.wapproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<DisableXbfLineInfo>False</DisableXbfLineInfo>
1515
<GenerateTestArtifacts>True</GenerateTestArtifacts>
1616
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
17-
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hr-HR;hu-HU;id-ID;it-IT;ja-JP;ka;km-KH;ko-KR;ku-Arab;lt-LT;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sq-AL;sr-Cyrl;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
17+
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;be-BY;bg;ca;cs-CZ;da;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hr-HR;hu-HU;id-ID;it-IT;ja-JP;ka;km-KH;ko-KR;ku-Arab;lt-LT;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sq-AL;sr-Cyrl;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
1818
<UapAppxPackageBuildMode>StoreUpload</UapAppxPackageBuildMode>
1919
<HoursBetweenUpdateChecks>255</HoursBetweenUpdateChecks>
2020
<EntryPointProjectUniqueName>..\Files.App\Files.App.csproj</EntryPointProjectUniqueName>

‎src/Files.App (Package)/Package.appxmanifest‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Identity
1717
Name="FilesDev"
1818
Publisher="CN=Files"
19-
Version="3.4.0.0" />
19+
Version="3.4.1.0" />
2020

2121
<Properties>
2222
<DisplayName>Files - Dev</DisplayName>
@@ -33,6 +33,7 @@
3333
<Resource Language="en-US" />
3434
<Resource Language="af" />
3535
<Resource Language="ar" />
36+
<Resource Language="be-BY" />
3637
<Resource Language="bg" />
3738
<Resource Language="ca" />
3839
<Resource Language="cs-CZ" />
@@ -169,13 +170,6 @@
169170
<Path>Files.App.Server\Files.App.Server.exe</Path>
170171
<Instancing>singleInstance</Instancing>
171172
<ActivatableClass ActivatableClassId="Files.App.Server.AppInstanceMonitor" />
172-
<ActivatableClass ActivatableClassId="Files.App.Server.Database.FileTagsDatabase" />
173-
<ActivatableClass ActivatableClassId="Files.App.Server.Database.LayoutPreferencesDatabase" />
174-
<ActivatableClass ActivatableClassId="Files.App.Server.Data.ColumnPreferences" />
175-
<ActivatableClass ActivatableClassId="Files.App.Server.Data.ColumnPreferencesItem" />
176-
<ActivatableClass ActivatableClassId="Files.App.Server.Data.TaggedFile" />
177-
<ActivatableClass ActivatableClassId="Files.App.Server.Data.LayoutPreferences" />
178-
<ActivatableClass ActivatableClassId="Files.App.Server.Data.LayoutPreferencesItem" />
179173
</OutOfProcessServer>
180174
</Extension>
181175
</Extensions>

‎src/Files.App.Server/Data/ColumnPreferences.cs‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/Files.App.Server/Data/ColumnPreferencesItem.cs‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/Files.App.Server/Data/LayoutPreferences.cs‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/Files.App.Server/Data/LayoutPreferencesItem.cs‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/Files.App.Server/Files.App.Server.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>WinExe</OutputType>
55
<DefaultLanguage>en-US</DefaultLanguage>
66
<AppxBundleAutoResourcePackageQualifiers>Scale|DXFeatureLevel</AppxBundleAutoResourcePackageQualifiers>
7-
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;bg;ca;cs-CZ;da;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hr-HR;hu-HU;id-ID;it-IT;ja-JP;ka;km-KH;ko-KR;ku-Arab;lt-LT;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sq-AL;sr-Cyrl;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
7+
<AppxDefaultResourceQualifiers>Language=en-US;af;ar;be-BY;bg;ca;cs-CZ;da;de-DE;el;en-GB;es-ES;es-419;fa-IR;fi-FI;fil-PH;fr-FR;he-IL;hi-IN;hr-HR;hu-HU;id-ID;it-IT;ja-JP;ka;km-KH;ko-KR;ku-Arab;lt-LT;lv-LV;nb-NO;nl-NL;or-IN;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sq-AL;sr-Cyrl;sv-SE;ta;th-TH;tr-TR;uk-UA;vi;zh-Hans;zh-Hant</AppxDefaultResourceQualifiers>
88
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
99
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
1010
<ImplicitUsings>enable</ImplicitUsings>
@@ -39,7 +39,6 @@
3939
<ItemGroup>
4040
<Manifest Include="app.manifest" />
4141
<TrimmerRootAssembly Include="Files.App.Server" />
42-
<PackageReference Include="LiteDB" Version="5.0.19" />
4342
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
4443
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.647-beta" PrivateAssets="all" />
4544
</ItemGroup>

‎src/Files.App.Storage/GlobalUsings.cs‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Copyright (c) 2024 Files Community
2+
// Licensed under the MIT License. See the LICENSE.
3+
4+
// System
5+
global using global::System;
6+
global using global::System.Collections;
7+
global using global::System.Collections.Generic;
8+
global using global::System.Collections.ObjectModel;
9+
global using global::System.Linq;
10+
global using global::System.Threading;
11+
global using global::System.Threading.Tasks;
12+
global using global::System.ComponentModel;
13+
global using global::System.Diagnostics;
14+
global using global::System.Text.Json;
15+
global using global::System.Text.Json.Serialization;
16+
global using SystemIO = global::System.IO;
17+
18+
// Files.Core.Storage
19+
20+
global using global::Files.Core.Storage;
21+
global using global::Files.Core.Storage.Contracts;
22+
global using global::Files.Core.Storage.DirectStorage;
23+
global using global::Files.Core.Storage.Enums;
24+
global using global::Files.Core.Storage.EventArguments;
25+
global using global::Files.Core.Storage.ExtendableStorage;
26+
global using global::Files.Core.Storage.Extensions;
27+
global using global::Files.Core.Storage.LocatableStorage;
28+
global using global::Files.Core.Storage.ModifiableStorage;
29+
global using global::Files.Core.Storage.MutableStorage;
30+
global using global::Files.Core.Storage.NestedStorage;
31+
global using global::Files.Core.Storage.StorageEnumeration;

‎src/Files.App.Storage/NativeStorage/NativeFolderWatcher.cs‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎src/Files.App.Storage/FtpStorage/FtpHelpers.cs‎ renamed to ‎src/Files.App.Storage/Storables/FtpStorage/FtpHelpers.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33

44
using Files.Shared.Extensions;
55
using FluentFTP;
6-
using System;
7-
using System.Threading;
8-
using System.Threading.Tasks;
96

107
namespace Files.App.Storage.FtpStorage
118
{

0 commit comments

Comments
 (0)