Skip to content

Commit a0acba3

Browse files
hez2010hez2010
authored
Feature: LiteDB server and Files.Core removal (#14911)
1 parent bb8031c commit a0acba3

File tree

237 files changed

+781
-926
lines changed

Some content is hidden

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

237 files changed

+781
-926
lines changed

‎Files.sln‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.Shared", "src\Files.S
1414
EndProject
1515
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App.Storage", "src\Files.App.Storage\Files.App.Storage.csproj", "{B8051E11-5BF2-49F7-A7C8-E3820DBB8209}"
1616
EndProject
17-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.Core", "src\Files.Core\Files.Core.csproj", "{74704E22-9A09-4675-AE35-7896DE81EC4A}"
18-
EndProject
1917
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.Core.Storage", "src\Files.Core.Storage\Files.Core.Storage.csproj", "{53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}"
2018
EndProject
2119
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App.BackgroundTasks", "src\Files.App.BackgroundTasks\Files.App.BackgroundTasks.csproj", "{BB1DA0B0-4E5B-4336-961E-DF389482C094}"
@@ -116,36 +114,6 @@ Global
116114
{B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Store|x64.Build.0 = Store|x64
117115
{B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Store|x86.ActiveCfg = Store|x86
118116
{B8051E11-5BF2-49F7-A7C8-E3820DBB8209}.Store|x86.Build.0 = Store|x86
119-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Debug|arm64.ActiveCfg = Debug|arm64
120-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Debug|arm64.Build.0 = Debug|arm64
121-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Debug|x64.ActiveCfg = Debug|x64
122-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Debug|x64.Build.0 = Debug|x64
123-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Debug|x86.ActiveCfg = Debug|x86
124-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Debug|x86.Build.0 = Debug|x86
125-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Preview|arm64.ActiveCfg = Preview|arm64
126-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Preview|arm64.Build.0 = Preview|arm64
127-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Preview|x64.ActiveCfg = Preview|x64
128-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Preview|x64.Build.0 = Preview|x64
129-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Preview|x86.ActiveCfg = Preview|x86
130-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Preview|x86.Build.0 = Preview|x86
131-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Release|arm64.ActiveCfg = Release|arm64
132-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Release|arm64.Build.0 = Release|arm64
133-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Release|x64.ActiveCfg = Release|x64
134-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Release|x64.Build.0 = Release|x64
135-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Release|x86.ActiveCfg = Release|x86
136-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Release|x86.Build.0 = Release|x86
137-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Stable|arm64.ActiveCfg = Stable|arm64
138-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Stable|arm64.Build.0 = Stable|arm64
139-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Stable|x64.ActiveCfg = Stable|x64
140-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Stable|x64.Build.0 = Stable|x64
141-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Stable|x86.ActiveCfg = Stable|x86
142-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Stable|x86.Build.0 = Stable|x86
143-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Store|arm64.ActiveCfg = Store|arm64
144-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Store|arm64.Build.0 = Store|arm64
145-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Store|x64.ActiveCfg = Store|x64
146-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Store|x64.Build.0 = Store|x64
147-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Store|x86.ActiveCfg = Store|x86
148-
{74704E22-9A09-4675-AE35-7896DE81EC4A}.Store|x86.Build.0 = Store|x86
149117
{53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Debug|arm64.ActiveCfg = Debug|arm64
150118
{53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Debug|arm64.Build.0 = Debug|arm64
151119
{53371D77-7AC1-4975-9A2A-5E0EB0B37CE3}.Debug|x64.ActiveCfg = Debug|x64
@@ -452,7 +420,6 @@ Global
452420
{9F36C2AD-005D-4EA5-A1F1-6BC42773FC85} = {A74DCE98-A744-4D71-A2B1-7EE4FED0936B}
453421
{94F77692-D47C-48D8-A1A7-645192EF38A4} = {9F36C2AD-005D-4EA5-A1F1-6BC42773FC85}
454422
{B8051E11-5BF2-49F7-A7C8-E3820DBB8209} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
455-
{74704E22-9A09-4675-AE35-7896DE81EC4A} = {9F36C2AD-005D-4EA5-A1F1-6BC42773FC85}
456423
{53371D77-7AC1-4975-9A2A-5E0EB0B37CE3} = {9F36C2AD-005D-4EA5-A1F1-6BC42773FC85}
457424
{BB1DA0B0-4E5B-4336-961E-DF389482C094} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
458425
{4ED01D20-8529-4DEF-8C1B-4E31031AE7E0} = {481DE2EA-E6CE-4A9C-A220-3B543B95AAA1}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,15 @@
166166
<Path>Files.App.Server\Files.App.Server.exe</Path>
167167
<Instancing>singleInstance</Instancing>
168168
<ActivatableClass ActivatableClassId="Files.App.Server.AppInstanceMonitor" />
169+
<ActivatableClass ActivatableClassId="Files.App.Server.Database.FileTagsDatabase" />
170+
<ActivatableClass ActivatableClassId="Files.App.Server.Database.LayoutPreferencesDatabase" />
171+
<ActivatableClass ActivatableClassId="Files.App.Server.Database.LayoutPreferencesFilterPredicate" />
172+
<ActivatableClass ActivatableClassId="Files.App.Server.Database.LayoutPreferencesUpdateAction" />
173+
<ActivatableClass ActivatableClassId="Files.App.Server.Data.ColumnPreferences" />
174+
<ActivatableClass ActivatableClassId="Files.App.Server.Data.ColumnPreferencesItem" />
175+
<ActivatableClass ActivatableClassId="Files.App.Server.Data.TaggedFile" />
176+
<ActivatableClass ActivatableClassId="Files.App.Server.Data.LayoutPreferences" />
177+
<ActivatableClass ActivatableClassId="Files.App.Server.Data.LayoutPreferencesItem" />
169178
</OutOfProcessServer>
170179
</Extension>
171180
</Extensions>

‎src/Files.App.BackgroundTasks/Files.App.BackgroundTasks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
29+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
3030
</ItemGroup>
3131

3232
</Project>

‎src/Files.App.Launcher/Files.App.Launcher.vcxproj‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) 2024 Files Community. Licensed under the MIT License. See the LICENSE. -->
33
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4-
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" />
4+
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
55
<ItemGroup Label="ProjectConfigurations">
66
<ProjectConfiguration Include="Debug|arm64">
77
<Configuration>Debug</Configuration>
@@ -321,21 +321,23 @@
321321
<ClCompile Include="FilesLauncher.cpp" />
322322
<ClCompile Include="OpenInFolder.cpp" />
323323
<ClInclude Include="OpenInFolder.h" />
324+
</ItemGroup>
325+
<ItemGroup>
324326
<None Include="packages.config" />
325327
</ItemGroup>
326328
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
327329
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
328330
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
329331
<ImportGroup Label="ExtensionTargets">
330-
<Import Project="..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
331-
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
332+
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
333+
<Import Project="..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
332334
</ImportGroup>
333335
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
334336
<PropertyGroup>
335337
<ErrorText>This project references a NuGet package that is not on this computer. To download those packages, use Restore NuGet Packages. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
336338
</PropertyGroup>
337-
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
338-
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
339-
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
339+
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
340+
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
341+
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
340342
</Target>
341343
</Project>

‎src/Files.App.Launcher/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
4-
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231028.1" targetFramework="native" />
3+
<package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
4+
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.240122.1" targetFramework="native" />
55
</packages>

‎src/Files.App.Server/AppInstanceMonitor.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
using System.Diagnostics;
1+
// Copyright (c) 2024 Files Community
2+
// Licensed under the MIT License. See the LICENSE.
3+
4+
using System.Diagnostics;
25

36
namespace Files.App.Server;
47

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright (c) 2024 Files Community
2+
// Licensed under the MIT License. See the LICENSE.
3+
4+
namespace Files.App.Server.Data
5+
{
6+
public sealed class ColumnPreferences
7+
{
8+
public ColumnPreferencesItem GitStatusColumn { get; set; } = new();
9+
public ColumnPreferencesItem GitLastCommitDateColumn { get; set; } = new();
10+
public ColumnPreferencesItem GitLastCommitMessageColumn { get; set; } = new();
11+
public ColumnPreferencesItem GitCommitAuthorColumn { get; set; } = new();
12+
public ColumnPreferencesItem GitLastCommitShaColumn { get; set; } = new();
13+
public ColumnPreferencesItem TagColumn { get; set; } = new();
14+
public ColumnPreferencesItem NameColumn { get; set; } = new();
15+
public ColumnPreferencesItem StatusColumn { get; set; } = new();
16+
public ColumnPreferencesItem DateModifiedColumn { get; set; } = new();
17+
public ColumnPreferencesItem PathColumn { get; set; } = new();
18+
public ColumnPreferencesItem OriginalPathColumn { get; set; } = new();
19+
public ColumnPreferencesItem ItemTypeColumn { get; set; } = new();
20+
public ColumnPreferencesItem DateDeletedColumn { get; set; } = new();
21+
public ColumnPreferencesItem DateCreatedColumn { get; set; } = new();
22+
public ColumnPreferencesItem SizeColumn { get; set; } = new();
23+
}
24+
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Copyright (c) 2024 Files Community
2+
// Licensed under the MIT License. See the LICENSE.
3+
4+
namespace Files.App.Server.Data
5+
{
6+
public sealed class ColumnPreferencesItem
7+
{
8+
public double UserLengthPixels { get; set; }
9+
public double NormalMaxLength { get; set; } = 800;
10+
public bool UserCollapsed { get; set; }
11+
}
12+
}

src/Files.Core/Data/Enums/FolderLayoutModes.cs renamed to src/Files.App.Server/Data/Enums/FolderLayoutModes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2024 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
namespace Files.Core.Data.Enums
4+
namespace Files.App.Server.Data.Enums
55
{
66
public enum FolderLayoutModes
77
{

src/Files.Core/Data/Enums/GroupByDateUnit.cs renamed to src/Files.App.Server/Data/Enums/GroupByDateUnit.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright (c) 2024 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
namespace Files.Core.Data.Enums
4+
namespace Files.App.Server.Data.Enums
55
{
6-
public enum GroupByDateUnit : byte
6+
public enum GroupByDateUnit
77
{
88
/// <summary>
99
/// Group items by year.

0 commit comments

Comments
 (0)