v7.3.24116.0

ITHit · Dec 14, 2023 · 4652635 · 4652635
1 parent c662f00
commit 4652635
Show file tree

Hide file tree

Showing 47 changed files with 1,035 additions and 119 deletions.
diff --git a/Common/Common.csproj b/Common/Common.csproj
@@ -10,7 +10,7 @@
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.2.23868.0" />
-    <PackageReference Include="ITHit.FileSystem" Version="7.2.23868.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.3.24116.0" />
+    <PackageReference Include="ITHit.FileSystem" Version="7.3.24116.0" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/Core/Common.Windows.Core.csproj b/Windows/Common/Core/Common.Windows.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows10.0.19041.0;net48</TargetFrameworks>
+    <TargetFrameworks>net7.0-windows10.0.19041.0;net48</TargetFrameworks>
     <Description>Contains functionality common for all Windows Virtual Drive samples.</Description>
     <Authors>IT Hit LTD.</Authors>
     <Product>IT Hit User File System</Product>
@@ -20,8 +20,8 @@
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.2.23868.0" />
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.2.23868.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.3.24116.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.3.24116.0" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj b/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows10.0.19041.0;net48</TargetFrameworks>
+    <TargetFrameworks>net7.0-windows10.0.19041.0;net48</TargetFrameworks>
     <Description>Contains functionality common for all Windows Virtual Drive samples.</Description>
     <Authors>IT Hit LTD.</Authors>
     <Product>IT Hit User File System</Product>
@@ -13,7 +13,7 @@
     <Compile Remove="IVirtualFolder.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.2.23868.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="7.3.24116.0" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
   </ItemGroup>

diff --git a/Windows/VirtualDrive/VirtualDrive.ShellExtension/VirtualDrive.ShellExtension.csproj b/Windows/VirtualDrive/VirtualDrive.ShellExtension/VirtualDrive.ShellExtension.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
     <EnableComHosting>True</EnableComHosting>
     <Platforms>x64</Platforms>
     <ApplicationIcon />
@@ -19,7 +19,7 @@
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.2.23868.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.3.24116.0" />
   </ItemGroup>
   <ItemGroup>
     <None Update="log4net.config">

diff --git a/Windows/VirtualDrive/VirtualDrive/VirtualDrive.csproj b/Windows/VirtualDrive/VirtualDrive/VirtualDrive.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
     <Authors>IT Hit LTD.</Authors>
     <Company>IT Hit LTD.</Company>
     <Product>Virtual Drive</Product>
@@ -40,7 +40,7 @@ This is an advanced project with ETags support, Microsoft Office documents editi
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.2.23868.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="7.3.24116.0" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
   </ItemGroup>

diff --git a/Windows/VirtualDrive/VirtualDrive/VirtualFile.cs b/Windows/VirtualDrive/VirtualDrive/VirtualFile.cs
@@ -90,11 +90,11 @@ public async Task ValidateDataAsync(long offset, long length, IValidateDataOpera
         }
 
         /// <inheritdoc/>
-        public async Task WriteAsync(IFileMetadata fileMetadata, Stream content = null, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
+        public async Task<IFileMetadata> WriteAsync(IFileSystemBasicInfo fileBasicInfo, Stream content = null, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
         {
             Logger.LogMessage($"{nameof(IFile)}.{nameof(WriteAsync)}()", UserFileSystemPath, default, operationContext);
 
-            if (!Mapping.TryGetRemoteStoragePathById(RemoteStorageItemId, out string remoteStoragePath)) return;
+            if (!Mapping.TryGetRemoteStoragePathById(RemoteStorageItemId, out string remoteStoragePath)) return null;
 
             // Send the ETag to the server as part of the update to ensure
             // the file in the remote storge is not modified since last read.
@@ -129,15 +129,36 @@ public async Task WriteAsync(IFileMetadata fileMetadata, Stream content = null,
             }
 
             // Update remote storage file metadata.
-            remoteStorageItem.Attributes = fileMetadata.Attributes & ~FileAttributes.ReadOnly;
-            remoteStorageItem.CreationTimeUtc = fileMetadata.CreationTime.UtcDateTime;
-            remoteStorageItem.LastWriteTimeUtc = fileMetadata.LastWriteTime.UtcDateTime;
-            remoteStorageItem.LastAccessTimeUtc = fileMetadata.LastAccessTime.UtcDateTime;
-            remoteStorageItem.Attributes = fileMetadata.Attributes;
+            if (fileBasicInfo.Attributes.HasValue)
+            {
+                remoteStorageItem.Attributes = fileBasicInfo.Attributes.Value & ~FileAttributes.ReadOnly;
+            }
+
+            if (fileBasicInfo.CreationTime.HasValue)
+            {
+                remoteStorageItem.CreationTimeUtc = fileBasicInfo.CreationTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.LastWriteTime.HasValue)
+            {
+                remoteStorageItem.LastWriteTimeUtc = fileBasicInfo.LastWriteTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.LastAccessTime.HasValue)
+            {
+                remoteStorageItem.LastAccessTimeUtc = fileBasicInfo.LastAccessTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.Attributes.HasValue)
+            {
+                remoteStorageItem.Attributes = fileBasicInfo.Attributes.Value;
+            }
 
             // Save ETag received from your remote storage in persistent placeholder properties.
             // string newEtag = ...
             // placeholder.SetETag(newEtag);
+
+            return null;
         }
     }
 }
diff --git a/Windows/VirtualDrive/VirtualDrive/VirtualFolder.cs b/Windows/VirtualDrive/VirtualDrive/VirtualFolder.cs
@@ -168,19 +168,40 @@ public async Task<IEnumerable<FileSystemItemMetadataExt>> EnumerateChildrenAsync
         }
 
         /// <inheritdoc/>
-        public async Task WriteAsync(IFolderMetadata folderMetadata, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
+        public async Task<IFolderMetadata> WriteAsync(IFileSystemBasicInfo fileBasicInfo, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
         {
             Logger.LogMessage($"{nameof(IFolder)}.{nameof(WriteAsync)}()", UserFileSystemPath, default, operationContext);
 
-            if (!Mapping.TryGetRemoteStoragePathById(RemoteStorageItemId, out string remoteStoragePath)) return;
+            if (!Mapping.TryGetRemoteStoragePathById(RemoteStorageItemId, out string remoteStoragePath)) return null;
             DirectoryInfo remoteStorageItem = new DirectoryInfo(remoteStoragePath);
 
             // Update remote storage folder metadata.
-            remoteStorageItem.Attributes = folderMetadata.Attributes & ~FileAttributes.ReadOnly;
-            remoteStorageItem.CreationTimeUtc = folderMetadata.CreationTime.UtcDateTime;
-            remoteStorageItem.LastWriteTimeUtc = folderMetadata.LastWriteTime.UtcDateTime;
-            remoteStorageItem.LastAccessTimeUtc = folderMetadata.LastAccessTime.UtcDateTime;
-            remoteStorageItem.Attributes = folderMetadata.Attributes;
+            if (fileBasicInfo.Attributes.HasValue)
+            {
+                remoteStorageItem.Attributes = fileBasicInfo.Attributes.Value & ~FileAttributes.ReadOnly;
+            }
+
+            if (fileBasicInfo.CreationTime.HasValue)
+            {
+                remoteStorageItem.CreationTimeUtc = fileBasicInfo.CreationTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.LastWriteTime.HasValue)
+            {
+                remoteStorageItem.LastWriteTimeUtc = fileBasicInfo.LastWriteTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.LastAccessTime.HasValue)
+            {
+                remoteStorageItem.LastAccessTimeUtc = fileBasicInfo.LastAccessTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.Attributes.HasValue)
+            {
+                remoteStorageItem.Attributes = fileBasicInfo.Attributes.Value;
+            }
+
+            return null;
         }
 
 

diff --git a/Windows/VirtualDrive/VirtualDrive/appsettings.json b/Windows/VirtualDrive/VirtualDrive/appsettings.json
@@ -23,7 +23,7 @@
 
   // Your virtual file system will be mounted under this path.
   // Make sure to delete the all plceholders created by previous version of the software under the sync root. 
-  "UserFileSystemRootPath": "%USERPROFILE%\\VirtualDriveV7\\",
+  "UserFileSystemRootPath": "%USERPROFILE%\\VirtualDriveV73\\",
 
 
   // Full synchronization interval in milliseconds.

diff --git a/Windows/VirtualFileSystem/RemoteStorageMonitor.cs b/Windows/VirtualFileSystem/RemoteStorageMonitor.cs
@@ -317,7 +317,7 @@ internal static bool IsModified(string userFileSystemPath, string remoteStorageP
             FileInfo fiUserFileSystem = new FileInfo(userFileSystemPath);
             FileInfo fiRemoteStorage = new FileInfo(remoteStoragePath);
 
-            // This check is to prevent circular calls. In you real app you wouuld not send notifications to the client that generated the event.
+            // This check is to prevent circular calls. In your real app you would not send notifications to the client that generated the event.
             if (fiUserFileSystem.LastWriteTimeUtc >= fiRemoteStorage.LastWriteTimeUtc)
             {
                 return false;
@@ -328,7 +328,7 @@ internal static bool IsModified(string userFileSystemPath, string remoteStorageP
                 if (fiUserFileSystem.Length == fiRemoteStorage.Length)
                 {
                     // Verify that the file is not offline,
-                    // therwise the file will be hydrated when the file stream is opened.
+                    // otherwise the file will be hydrated when the file stream is opened.
                     if (fiUserFileSystem.Attributes.HasFlag(System.IO.FileAttributes.Offline)
                         || fiUserFileSystem.Attributes.HasFlag(System.IO.FileAttributes.Offline))
                     {

diff --git a/Windows/VirtualFileSystem/VirtualFile.cs b/Windows/VirtualFileSystem/VirtualFile.cs
@@ -83,11 +83,11 @@ public async Task ValidateDataAsync(long offset, long length, IValidateDataOpera
         }
 
         /// <inheritdoc/>
-        public async Task WriteAsync(IFileMetadata fileMetadata, Stream content = null, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
+        public async Task<IFileMetadata> WriteAsync(IFileSystemBasicInfo fileBasicInfo, Stream content = null, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
         {
             Logger.LogMessage($"{nameof(IFile)}.{nameof(WriteAsync)}()", UserFileSystemPath, default, operationContext);
 
-            if (!Mapping.TryGetRemoteStoragePathById(RemoteStorageItemId, out string remoteStoragePath)) return;
+            if (!Mapping.TryGetRemoteStoragePathById(RemoteStorageItemId, out string remoteStoragePath)) return null;
 
             FileInfo remoteStorageItem = new FileInfo(remoteStoragePath);
 
@@ -102,11 +102,32 @@ public async Task WriteAsync(IFileMetadata fileMetadata, Stream content = null,
             }
 
             // Update remote storage file metadata.
-            remoteStorageItem.Attributes = fileMetadata.Attributes & ~FileAttributes.ReadOnly;
-            remoteStorageItem.CreationTimeUtc = fileMetadata.CreationTime.UtcDateTime;
-            remoteStorageItem.LastWriteTimeUtc = fileMetadata.LastWriteTime.UtcDateTime;
-            remoteStorageItem.LastAccessTimeUtc = fileMetadata.LastAccessTime.UtcDateTime;
-            remoteStorageItem.Attributes = fileMetadata.Attributes;
+            if (fileBasicInfo.Attributes.HasValue)
+            {
+                remoteStorageItem.Attributes = fileBasicInfo.Attributes.Value & ~FileAttributes.ReadOnly;
+            }
+
+            if (fileBasicInfo.CreationTime.HasValue)
+            {
+                remoteStorageItem.CreationTimeUtc = fileBasicInfo.CreationTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.LastWriteTime.HasValue)
+            {
+                remoteStorageItem.LastWriteTimeUtc = fileBasicInfo.LastWriteTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.LastAccessTime.HasValue)
+            {
+                remoteStorageItem.LastAccessTimeUtc = fileBasicInfo.LastAccessTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.Attributes.HasValue)
+            {
+                remoteStorageItem.Attributes = fileBasicInfo.Attributes.Value;
+            }
+
+            return null;
         }
     }
 }
diff --git a/Windows/VirtualFileSystem/VirtualFileSystem.csproj b/Windows/VirtualFileSystem/VirtualFileSystem.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0-windows10.0.19041.0;net48</TargetFrameworks>
+    <TargetFrameworks>net7.0-windows10.0.19041.0;net48</TargetFrameworks>
     <Authors>IT Hit LTD.</Authors>
     <Company>IT Hit LTD.</Company>
     <Product>Virtual File System</Product>

diff --git a/Windows/VirtualFileSystem/VirtualFolder.cs b/Windows/VirtualFileSystem/VirtualFolder.cs
@@ -141,19 +141,40 @@ public async Task GetChildrenAsync(string pattern, IOperationContext operationCo
         }
 
         /// <inheritdoc/>
-        public async Task WriteAsync(IFolderMetadata folderMetadata, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
+        public async Task<IFolderMetadata> WriteAsync(IFileSystemBasicInfo fileBasicInfo, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
         {
             Logger.LogMessage($"{nameof(IFolder)}.{nameof(WriteAsync)}()", UserFileSystemPath, default, operationContext);
 
-            if (!Mapping.TryGetRemoteStoragePathById(RemoteStorageItemId, out string remoteStoragePath)) return;
+            if (!Mapping.TryGetRemoteStoragePathById(RemoteStorageItemId, out string remoteStoragePath)) return null;
             DirectoryInfo remoteStorageItem = new DirectoryInfo(remoteStoragePath);
 
             // Update remote storage folder metadata.
-            remoteStorageItem.Attributes = folderMetadata.Attributes & ~FileAttributes.ReadOnly;
-            remoteStorageItem.CreationTimeUtc = folderMetadata.CreationTime.UtcDateTime;
-            remoteStorageItem.LastWriteTimeUtc = folderMetadata.LastWriteTime.UtcDateTime;
-            remoteStorageItem.LastAccessTimeUtc = folderMetadata.LastAccessTime.UtcDateTime;
-            remoteStorageItem.Attributes = folderMetadata.Attributes;
+            if (fileBasicInfo.Attributes.HasValue)
+            {
+                remoteStorageItem.Attributes = fileBasicInfo.Attributes.Value & ~FileAttributes.ReadOnly;
+            }
+
+            if (fileBasicInfo.CreationTime.HasValue)
+            {
+                remoteStorageItem.CreationTimeUtc = fileBasicInfo.CreationTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.LastWriteTime.HasValue)
+            {
+                remoteStorageItem.LastWriteTimeUtc = fileBasicInfo.LastWriteTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.LastAccessTime.HasValue)
+            {
+                remoteStorageItem.LastAccessTimeUtc = fileBasicInfo.LastAccessTime.Value.UtcDateTime;
+            }
+
+            if (fileBasicInfo.Attributes.HasValue)
+            {
+                remoteStorageItem.Attributes = fileBasicInfo.Attributes.Value;
+            }
+
+            return null;
         }
     }
 

diff --git a/Windows/VirtualFileSystem/appsettings.json b/Windows/VirtualFileSystem/appsettings.json
@@ -23,7 +23,7 @@
 
   // Your virtual file system will be mounted under this path.
   // Make sure to delete the all plceholders created by previous version of the software under the sync root. 
-  "UserFileSystemRootPath": "%USERPROFILE%\\VFSv7\\"
+  "UserFileSystemRootPath": "%USERPROFILE%\\VFSv73\\"
 
 
   // To test performance:

diff --git a/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/WebDAVDrive.ShellExtension.csproj b/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/WebDAVDrive.ShellExtension.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
     <EnableComHosting>True</EnableComHosting>
     <Platforms>x64</Platforms>
     <ApplicationIcon />
@@ -12,7 +12,7 @@
     <Copyright>IT HIT LTD.</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.2.23868.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="7.3.24116.0" />
   </ItemGroup>
   <ItemGroup>
     <None Update="log4net.config">

diff --git a/Windows/WebDAVDrive/WebDAVDrive.UI/WebDAVDrive.UI.csproj b/Windows/WebDAVDrive/WebDAVDrive.UI/WebDAVDrive.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>True</UseWindowsForms>
     <Copyright>IT Hit LTD.</Copyright>

diff --git a/Windows/WebDAVDrive/WebDAVDrive/VirtualFile.cs b/Windows/WebDAVDrive/WebDAVDrive/VirtualFile.cs
@@ -97,7 +97,7 @@ public async Task ValidateDataAsync(long offset, long length, IValidateDataOpera
         }
 
         /// <inheritdoc/>
-        public async Task WriteAsync(IFileMetadata fileMetadata, Stream content = null, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
+        public async Task<IFileMetadata> WriteAsync(IFileSystemBasicInfo fileBasicInfo, Stream content = null, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
         {
             Logger.LogMessage($"{nameof(IFile)}.{nameof(WriteAsync)}()", UserFileSystemPath, default, operationContext);
 
@@ -144,6 +144,8 @@ public async Task WriteAsync(IFileMetadata fileMetadata, Stream content = null,
                     inSyncResultContext.SetInSync = false;
                 }
             }
+
+            return null;
         }
     }
 }
diff --git a/Windows/WebDAVDrive/WebDAVDrive/VirtualFolder.cs b/Windows/WebDAVDrive/WebDAVDrive/VirtualFolder.cs
@@ -144,10 +144,11 @@ public async Task<IEnumerable<FileSystemItemMetadataExt>> EnumerateChildrenAsync
         }
 
         /// <inheritdoc/>
-        public async Task WriteAsync(IFolderMetadata folderMetadata, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
+        public async Task<IFolderMetadata> WriteAsync(IFileSystemBasicInfo fileBasicInfo, IOperationContext operationContext = null, IInSyncResultContext inSyncResultContext = null, CancellationToken cancellationToken = default)
         {
             // Typically we can not change any folder metadata on a WebDAV server, just logging the call.
             Logger.LogMessage($"{nameof(IFolder)}.{nameof(WriteAsync)}()", UserFileSystemPath, default, operationContext);
+            return null;
         }
 
         /// <inheritdoc/>