Skip to content

Commit ec25f54

Browse files
ITHitBuildITHitBuild
committed
v6.1.18982.0-Beta
1 parent 1a01e67 commit ec25f54

20 files changed

+376
-127
lines changed

‎Common/Common.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<Platforms>AnyCPU;x64</Platforms>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="ITHit.FileSystem" Version="6.1.18304.0-Beta" />
13+
<PackageReference Include="ITHit.FileSystem" Version="6.1.18982.0-Beta" />
1414
</ItemGroup>
1515
</Project>

‎Common/FileSystemItemMetadataExt.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ namespace ITHit.FileSystem.Samples.Common
88
{
99
/// <summary>
1010
/// Represents a basic information about the file or the folder in the user file system.
11-
/// In addition to properties provided by <see cref="IFileSystemItem"/> this class contains Etag property.
11+
/// In addition to properties provided by <see cref="IFileSystemItem"/> this class contains
12+
/// <see cref="ETag"/> and <see cref="Lock"/> properties.
1213
/// </summary>
1314
public class FileSystemItemMetadataExt : IFileSystemItemMetadata
1415
{
@@ -34,12 +35,13 @@ public class FileSystemItemMetadataExt : IFileSystemItemMetadata
3435
public DateTimeOffset ChangeTime { get; set; }
3536

3637
/// <summary>
37-
/// Lock info.
38+
/// ETag.
39+
/// </summary>
40+
public string ETag { get; set; }
41+
42+
/// <summary>
43+
/// Lock info or null if the item is not locked.
3844
/// </summary>
39-
/// <remarks>
40-
/// If the item is locked, this property contains info about the lock.
41-
/// It is set to null otherwise.
42-
/// </remarks>
4345
public ServerLockInfo Lock { get; set; }
4446

4547
/// <summary>

‎Windows/Common/Core/Common.Windows.Core.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
2121
</ItemGroup>
2222
<ItemGroup>
23-
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.18304.0-Beta" />
24-
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.18304.0-Beta" />
23+
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.18982.0-Beta" />
24+
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.18982.0-Beta" />
2525
<ProjectReference Include="..\..\..\Common\Common.csproj" />
2626
</ItemGroup>
2727
</Project>

‎Windows/Common/Core/ISyncService.cs‎

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

‎Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
<Platforms>AnyCPU;x64</Platforms>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.18304.0-Beta" />
12+
<Compile Remove="IncomingFullSync.cs" />
13+
<Compile Remove="IVirtualFolder.cs" />
14+
</ItemGroup>
15+
<ItemGroup>
16+
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.18982.0-Beta" />
1317
<ProjectReference Include="..\..\..\Common\Common.csproj" />
1418
<ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
1519
</ItemGroup>

‎Windows/VirtualDrive/VirtualDrive.ShellExtension/VirtualDrive.ShellExtension.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
2020
</ItemGroup>
2121
<ItemGroup>
22-
<PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.1.18304.0-Beta" />
22+
<PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.1.18982.0-Beta" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<None Update="log4net.config">

‎Windows/VirtualDrive/VirtualDrive/RemoteStorageMonitor.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using ITHit.FileSystem.Windows;
77
using ITHit.FileSystem.Samples.Common.Windows;
88
using System.Threading.Tasks;
9+
using System.Threading;
910

1011
namespace VirtualDrive
1112
{
@@ -78,7 +79,7 @@ internal RemoteStorageMonitor(string remoteStorageRootPath, Engine engine, ILogg
7879
/// <summary>
7980
/// Starts monitoring changes on the server.
8081
/// </summary>
81-
public async Task StartAsync()
82+
public async Task StartAsync(CancellationToken cancellationToken = default)
8283
{
8384
watcher.EnableRaisingEvents = true;
8485
Logger.LogMessage($"Started", watcher.Path);
@@ -165,6 +166,8 @@ private async void ChangedAsync(object sender, FileSystemEventArgs e)
165166
{
166167
// Because of the on-demand population the file or folder placeholder may not exist in the user file system.
167168
// In this case the IServerNotifications.UpdateAsync() call is ignored.
169+
170+
PlaceholderItem.UpdateUI(userFileSystemPath);
168171
Logger.LogMessage("Updated successfully", userFileSystemPath);
169172
}
170173
}

‎Windows/VirtualDrive/VirtualDrive/VirtualDrive.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ This is an advanced project with ETags support, Microsoft Office documents editi
4040
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
4141
</ItemGroup>
4242
<ItemGroup>
43-
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.18304.0-Beta" />
43+
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.18982.0-Beta" />
4444
<ProjectReference Include="..\..\..\Common\Common.csproj" />
4545
<ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
4646
</ItemGroup>

‎Windows/VirtualFileSystem/RemoteStorageMonitor.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using ITHit.FileSystem.Windows;
77
using ITHit.FileSystem.Samples.Common.Windows;
88
using System.Threading.Tasks;
9+
using System.Threading;
910

1011
namespace VirtualFileSystem
1112
{
@@ -78,7 +79,7 @@ internal RemoteStorageMonitor(string remoteStorageRootPath, Engine engine, ILogg
7879
/// <summary>
7980
/// Starts monitoring changes on the server.
8081
/// </summary>
81-
public async Task StartAsync()
82+
public async Task StartAsync(CancellationToken cancellationToken = default)
8283
{
8384
watcher.EnableRaisingEvents = true;
8485
Logger.LogMessage($"Started", watcher.Path);
@@ -165,6 +166,8 @@ private async void ChangedAsync(object sender, FileSystemEventArgs e)
165166
{
166167
// Because of the on-demand population the file or folder placeholder may not exist in the user file system.
167168
// In this case the IServerNotifications.UpdateAsync() call is ignored.
169+
170+
PlaceholderItem.UpdateUI(userFileSystemPath);
168171
Logger.LogMessage("Updated successfully", userFileSystemPath);
169172
}
170173
}

‎Windows/WebDAVDrive/WebDAVDrive.ShellExtension/WebDAVDrive.ShellExtension.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Copyright>IT HIT LTD.</Copyright>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.1.18304.0-Beta" />
15+
<PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.1.18982.0-Beta" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<None Update="log4net.config">

0 commit comments

Comments
 (0)