Skip to content

Commit d029988

Browse files
ITHitBuildITHitBuild
committed
v6.1.20210.0
1 parent d84fb2a commit d029988

File tree

15 files changed

+31
-66
lines changed

15 files changed

+31
-66
lines changed

‎Common/Common.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Platforms>AnyCPU;x64</Platforms>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.19907.0-Beta" />
14-
<PackageReference Include="ITHit.FileSystem" Version="6.1.19907.0-Beta" />
13+
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.20210.0" />
14+
<PackageReference Include="ITHit.FileSystem" Version="6.1.20210.0" />
1515
</ItemGroup>
1616
</Project>

‎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.19907.0-Beta" />
24-
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.19907.0-Beta" />
23+
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.20210.0" />
24+
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.20210.0" />
2525
<ProjectReference Include="..\..\..\Common\Common.csproj" />
2626
</ItemGroup>
2727
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Compile Remove="IVirtualFolder.cs" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.19907.0-Beta" />
16+
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.1.20210.0" />
1717
<ProjectReference Include="..\..\..\Common\Common.csproj" />
1818
<ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
1919
</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.19907.0-Beta" />
22+
<PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.1.20210.0" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<None Update="log4net.config">

‎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.19907.0-Beta" />
43+
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.20210.0" />
4444
<ProjectReference Include="..\..\..\Common\Common.csproj" />
4545
<ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
4646
</ItemGroup>

‎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.19907.0-Beta" />
15+
<PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.1.20210.0" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<None Update="log4net.config">

‎Windows/WebDAVDrive/WebDAVDrive.UI/WebDAVDrive.UI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<PackageReference Include="log4net" Version="2.0.13" />
2020
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.774.44" />
21-
<PackageReference Include="ITHitWebDAVClient" Version="5.3.3668" />
21+
<PackageReference Include="ITHitWebDAVClient" Version="5.3.3908" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎Windows/WebDAVDrive/WebDAVDrive/WebDAVDrive.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
3939
</ItemGroup>
4040
<ItemGroup>
41-
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.19907.0-Beta" />
41+
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.1.20210.0" />
4242
<ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
4343
<ProjectReference Include="..\WebDAVDrive.UI\WebDAVDrive.UI.csproj" />
4444
</ItemGroup>

‎macOS/FileProviderExtension/FileProviderExtension.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<OutputType>Library</OutputType>
99
<RootNamespace>FileProviderExtension</RootNamespace>
1010
<AssemblyName>FileProviderExtension</AssemblyName>
11-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1211
<MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
13-
<ReleaseVersion>5.6.15918.0</ReleaseVersion>
12+
<ReleaseVersion>6.1.20210.0</ReleaseVersion>
1413
<UseXamMacFullFramework>true</UseXamMacFullFramework>
14+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1717
<DebugSymbols>true</DebugSymbols>
@@ -64,10 +64,10 @@
6464
<Reference Include="Xamarin.Mac" />
6565
<Reference Include="System.Drawing.Common.dll" />
6666
<Reference Include="ITHit.FileSystem">
67-
<HintPath>..\packages\ITHit.FileSystem.5.6.15918-Beta2\lib\netstandard2.0\ITHit.FileSystem.dll</HintPath>
67+
<HintPath>..\packages\ITHit.FileSystem.6.1.20210\lib\netstandard2.0\ITHit.FileSystem.dll</HintPath>
6868
</Reference>
6969
<Reference Include="ITHit.FileSystem.Mac">
70-
<HintPath>..\packages\ITHit.FileSystem.Mac.5.6.15918-Beta2\lib\net48\ITHit.FileSystem.Mac.dll</HintPath>
70+
<HintPath>..\packages\ITHit.FileSystem.Mac.6.1.20210\lib\net48\ITHit.FileSystem.Mac.dll</HintPath>
7171
</Reference>
7272
</ItemGroup>
7373
<ItemGroup>

‎macOS/FileProviderExtension/RemoteStorageMonitor.cs‎

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.IO;
33
using System.Threading.Tasks;
44
using FileProvider;
5+
using ITHit.FileSystem;
56

67
namespace FileProviderExtension
78
{
@@ -32,16 +33,13 @@ public class RemoteStorageMonitor
3233
/// </summary>
3334
private FileSystemWatcher watcher = new FileSystemWatcher();
3435

35-
/// <summary>
36-
/// File provider manager for signals an update to virtual system.
37-
/// </summary>
38-
private NSFileProviderManager fileProviderManager;
36+
private IEngine engine;
3937

40-
public RemoteStorageMonitor(string remoteStorageRootPath, NSFileProviderManager fileProviderManager)
38+
public RemoteStorageMonitor(string remoteStorageRootPath, IEngine engine)
4139
{
4240
this.remoteStorageRootPath = remoteStorageRootPath;
4341
this.logger = new ConsoleLogger(GetType().Name);
44-
this.fileProviderManager = fileProviderManager;
42+
this.engine = engine;
4543
}
4644

4745
/// <summary>
@@ -76,59 +74,28 @@ private void RenamedAsync(object sender, RenamedEventArgs e)
7674
{
7775
logger.LogMessage(e.ChangeType.ToString(), e.FullPath);
7876

79-
string userFileSystemParentPath = Path.GetDirectoryName(e.FullPath);
80-
logger.LogMessage(e.ChangeType.ToString(), Mapping.ReverseMapPath(userFileSystemParentPath));
81-
82-
fileProviderManager.SignalEnumerator(Mapping.ReverseMapPath(userFileSystemParentPath), error => {
83-
if (error != null)
84-
{
85-
logger.LogError(error.Description);
86-
}
87-
});
88-
77+
engine.ServerNotifications(Mapping.ReverseMapPath(e.OldFullPath)).MoveToAsync(e.FullPath);
8978
}
9079

9180
private void DeletedAsync(object sender, FileSystemEventArgs e)
9281
{
9382
logger.LogMessage(e.ChangeType.ToString(), e.FullPath);
94-
string userFileSystemParentPath = Path.GetDirectoryName(e.FullPath);
95-
logger.LogMessage(e.ChangeType.ToString(), Mapping.ReverseMapPath(userFileSystemParentPath));
96-
97-
fileProviderManager.SignalEnumerator(Mapping.ReverseMapPath(userFileSystemParentPath), error => {
98-
if (error != null)
99-
{
100-
logger.LogError(error.Description);
101-
}
102-
});
83+
84+
engine.ServerNotifications(Mapping.ReverseMapPath(e.FullPath)).DeleteAsync();
10385
}
10486

10587
private void CreatedAsync(object sender, FileSystemEventArgs e)
10688
{
10789
logger.LogMessage(e.ChangeType.ToString(), e.FullPath);
108-
string userFileSystemParentPath = Path.GetDirectoryName(e.FullPath);
109-
logger.LogMessage(e.ChangeType.ToString(), Mapping.ReverseMapPath(userFileSystemParentPath));
110-
111-
fileProviderManager.SignalEnumerator(Mapping.ReverseMapPath(userFileSystemParentPath), error => {
112-
if (error != null)
113-
{
114-
logger.LogError(error.Description);
115-
}
116-
});
117-
118-
90+
91+
engine.ServerNotifications(Mapping.ReverseMapPath(e.FullPath)).CreateAsync(null);
11992
}
12093

12194
private void ChangedAsync(object sender, FileSystemEventArgs e)
12295
{
12396
logger.LogMessage(e.ChangeType.ToString(), e.FullPath);
124-
string remoteStoragePath = e.FullPath;
125-
126-
//fileProviderManager.SignalEnumerator(Mapping.ReverseMapPath(remoteStoragePath), error => {
127-
// if (error != null)
128-
// {
129-
// logger.LogError(error.Description);
130-
// }
131-
//});
97+
98+
engine.ServerNotifications(Mapping.ReverseMapPath(e.FullPath)).UpdateAsync(null);
13299
}
133100

134101
private void Error(object sender, ErrorEventArgs e)

0 commit comments

Comments
 (0)