Skip to content

Commit 092560e

Browse files
committed
Merge branch 'main' of https://github.com/files-community/Files into terminal
2 parents 532c70b + 516ceb2 commit 092560e

24 files changed

+783
-219
lines changed

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

Lines changed: 1 addition & 2 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.3.3.0" />
19+
Version="3.3.5.0" />
2020

2121
<Properties>
2222
<DisplayName>Files - Dev</DisplayName>
@@ -168,7 +168,6 @@
168168
<ActivatableClass ActivatableClassId="Files.App.Server.AppInstanceMonitor" />
169169
<ActivatableClass ActivatableClassId="Files.App.Server.Database.FileTagsDatabase" />
170170
<ActivatableClass ActivatableClassId="Files.App.Server.Database.LayoutPreferencesDatabase" />
171-
<ActivatableClass ActivatableClassId="Files.App.Server.Database.LayoutPreferencesUpdateAction" />
172171
<ActivatableClass ActivatableClassId="Files.App.Server.Data.ColumnPreferences" />
173172
<ActivatableClass ActivatableClassId="Files.App.Server.Data.ColumnPreferencesItem" />
174173
<ActivatableClass ActivatableClassId="Files.App.Server.Data.TaggedFile" />

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

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

4-
using LiteDB;
4+
using Files.Shared;
55

66
namespace Files.App.Server.Data
77
{
8+
[RegistrySerializable]
89
public sealed class LayoutPreferences
910
{
10-
[BsonId]
11-
public int Id { get; set; }
1211
public ulong? Frn { get; set; }
1312
public string FilePath { get; set; } = string.Empty;
1413

src/Files.App.Server/Data/TaggedFile.cs

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

4-
using LiteDB;
4+
using Files.Shared;
55

66
namespace Files.App.Server.Data
77
{
8+
[RegistrySerializable]
89
public sealed class TaggedFile
910
{
10-
[BsonId] public int Id { get; set; }
1111
public ulong? Frn { get; set; }
1212
public string FilePath { get; set; } = string.Empty;
1313
public string[] Tags { get; set; } = [];

0 commit comments

Comments
 (0)