Skip to content

Commit 604ac14

Browse files
ITHitBuildITHitBuild
committed
v6.0.16897.0-Beta
1 parent 5e612c2 commit 604ac14

File tree

14 files changed

+71
-38
lines changed

14 files changed

+71
-38
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.0.16872.0-Beta" />
13+
<PackageReference Include="ITHit.FileSystem" Version="6.0.16897.0-Beta" />
1414
</ItemGroup>
1515
</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.0.16872.0-Beta" />
24-
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.0.16872.0-Beta" />
23+
<PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.0.16897.0-Beta" />
24+
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.0.16897.0-Beta" />
2525
<ProjectReference Include="..\..\..\Common\Common.csproj" />
2626
</ItemGroup>
2727
</Project>

‎Windows/Common/Core/LogFormatter.cs‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ public bool DebugLoggingEnabled
5050
private const int sourcePathWidth = 60;
5151
private const int remoteStorageIdWidth = 20;
5252

53+
private const int indent = -30;
54+
5355
/// <summary>
5456
/// Creates instance of this class.
5557
/// </summary>
@@ -88,24 +90,24 @@ private string ConfigureLogger()
8890
public void PrintEnvironmentDescription()
8991
{
9092
// Log environment description.
91-
log.Info($"\n{"AppID:",-25} {appId}");
92-
log.Info($"\n{"Engine version:",-25} {typeof(IEngine).Assembly.GetName().Version}");
93-
log.Info($"\n{"OS version:",-25} {RuntimeInformation.OSDescription}");
94-
log.Info($"\n{".NET version:",-25} {RuntimeInformation.FrameworkDescription} {IntPtr.Size * 8}bit.");
95-
log.Info($"\n{"Package or app identity:",-25} {PackageRegistrar.IsRunningWithIdentity()}");
96-
log.Info($"\n{"Sparse package identity:",-25} {PackageRegistrar.IsRunningWithSparsePackageIdentity()}");
97-
log.Info($"\n{"Elevated mode:",-25} {new System.Security.Principal.WindowsPrincipal(System.Security.Principal.WindowsIdentity.GetCurrent()).IsInRole(System.Security.Principal.WindowsBuiltInRole.Administrator)}");
93+
log.Info($"\n{"AppID:",indent} {appId}");
94+
log.Info($"\n{"Engine version:",indent} {typeof(IEngine).Assembly.GetName().Version}");
95+
log.Info($"\n{"OS version:",indent} {RuntimeInformation.OSDescription}");
96+
log.Info($"\n{".NET version:",indent} {RuntimeInformation.FrameworkDescription} {IntPtr.Size * 8}bit.");
97+
log.Info($"\n{"Package or app identity:",indent} {PackageRegistrar.IsRunningWithIdentity()}");
98+
log.Info($"\n{"Sparse package identity:",indent} {PackageRegistrar.IsRunningWithSparsePackageIdentity()}");
99+
log.Info($"\n{"Elevated mode:",indent} {new System.Security.Principal.WindowsPrincipal(System.Security.Principal.WindowsIdentity.GetCurrent()).IsInRole(System.Security.Principal.WindowsBuiltInRole.Administrator)}");
98100

99101
string sparsePackagePath = PackageRegistrar.GetSparsePackagePath();
100102
if (File.Exists(sparsePackagePath))
101103
{
102-
log.Info($"\n{"Sparse package location:",-25} {sparsePackagePath}");
104+
log.Info($"\n{"Sparse package location:",indent} {sparsePackagePath}");
103105
var cert = System.Security.Cryptography.X509Certificates.X509Certificate.CreateFromSignedFile(sparsePackagePath);
104-
log.Info($"\n{"Sparse package cert:",-25} Subject: {cert.Subject}, Issued by: {cert.Issuer}");
106+
log.Info($"\n{"Sparse package cert:", indent} Subject: {cert.Subject}, Issued by: {cert.Issuer}");
105107
}
106108
else
107109
{
108-
log.Info($"\n{"Sparse package:",-25} Not found");
110+
log.Info($"\n{"Sparse package:", indent} Not found");
109111
}
110112
}
111113

@@ -126,11 +128,12 @@ public async Task PrintEngineStartInfoAsync(EngineWindows engine)
126128
public async Task PrintEngineDescriptionAsync(EngineWindows engine)
127129
{
128130
log.Info($"\n");
129-
log.Info($"\n{"File system root:",-25} {engine.Path}");
130-
log.Info($"\n{"Remote storage root:",-25} {remoteStorageRootPath}");
131-
log.Info($"\n{"AutoLock:",-25} {engine.AutoLock}");
132-
log.Info($"\n{"Outgoing sync, ms:",-25} {engine.SyncService.SyncIntervalMs}");
133-
131+
log.Info($"\n{"File system root:",indent} {engine.Path}");
132+
log.Info($"\n{"Remote storage root:",indent} {remoteStorageRootPath}");
133+
log.Info($"\n{"AutoLock:",indent} {engine.AutoLock}");
134+
log.Info($"\n{"Outgoing sync, ms:",indent} {engine.SyncService.SyncIntervalMs}");
135+
log.Info($"\n{"Shell extensions RPC enabled:",indent} {engine.ShellExtensionsComServerRpcEnabled}");
136+
log.Info($"\n{"Max Transfer concurrent requests:",indent} {engine.MaxTransferConcurrentRequests}");
134137

135138
// Log indexing state. Sync root must be indexed.
136139
await PrintIndexingStateAsync(engine.Path);
@@ -143,7 +146,7 @@ public async Task PrintEngineDescriptionAsync(EngineWindows engine)
143146
private async Task PrintIndexingStateAsync(string path)
144147
{
145148
StorageFolder userFileSystemRootFolder = await StorageFolder.GetFolderFromPathAsync(path);
146-
log.Info($"\n{"Indexed state:",-25} {await userFileSystemRootFolder.GetIndexedStateAsync()}");
149+
log.Info($"\n{"Indexed state:",indent} {await userFileSystemRootFolder.GetIndexedStateAsync()}");
147150
}
148151

149152
public void LogMessage(string message)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Platforms>AnyCPU;x64</Platforms>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.0.16872.0-Beta" />
12+
<PackageReference Include="ITHit.FileSystem.Windows" Version="6.0.16897.0-Beta" />
1313
<ProjectReference Include="..\..\..\Common\Common.csproj" />
1414
<ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
1515
</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.0.16872.0-Beta" />
22+
<PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.0.16897.0-Beta" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<None Update="log4net.config">

‎Windows/VirtualDrive/VirtualDrive/AppSettings.cs‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,14 @@ public class AppSettings : Settings
2727
public double SyncIntervalMs { get; set; }
2828

2929
/// <summary>
30-
/// Throttling max concurrent requests.
30+
/// Throttling max of create/update/read concurrent requests.
3131
/// </summary>
32-
public int? MaxConcurrentRequests { get; set; }
32+
public int? MaxTransferConcurrentRequests { get; set; }
33+
34+
/// <summary>
35+
/// Throttling max of listing/move/delete concurrent requests.
36+
/// </summary>
37+
public int? MaxOperationsConcurrentRequests { get; set; }
3338

3439
/// <summary>
3540
/// Absolute or relative path of external COM server executable.
@@ -137,9 +142,14 @@ public static AppSettings ReadSettings(this IConfiguration configuration)
137142
// Load product name from entry exe file.
138143
settings.ProductName = FileVersionInfo.GetVersionInfo(assemblyLocation).ProductName;
139144

140-
if (!settings.MaxConcurrentRequests.HasValue)
145+
if (!settings.MaxTransferConcurrentRequests.HasValue)
146+
{
147+
settings.MaxTransferConcurrentRequests = 6;
148+
}
149+
150+
if (!settings.MaxOperationsConcurrentRequests.HasValue)
141151
{
142-
settings.MaxConcurrentRequests = int.MaxValue;
152+
settings.MaxOperationsConcurrentRequests = int.MaxValue;
143153
}
144154

145155
return settings;

‎Windows/VirtualDrive/VirtualDrive/Program.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ private static async Task RunEngine()
151151

152152
Engine.SyncService.SyncIntervalMs = Settings.SyncIntervalMs;
153153
Engine.AutoLock = Settings.AutoLock;
154-
Engine.MaxConcurrentRequests = Settings.MaxConcurrentRequests.Value;
154+
Engine.MaxTransferConcurrentRequests = Settings.MaxTransferConcurrentRequests.Value;
155+
Engine.MaxOperationsConcurrentRequests = Settings.MaxOperationsConcurrentRequests.Value;
155156
Engine.ShellExtensionsComServerRpcEnabled = Settings.ShellExtensionsComServerRpcEnabled; // Enable RPC in case RPC shaell extension handlers, hosted in separate process.
156157

157158
// Set the remote storage item ID for the root item. It will be passed to the IEngine.GetFileSystemItemAsync()

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

‎Windows/VirtualDrive/VirtualDrive/appsettings.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@
3030
"SyncIntervalMs": 10000,
3131

3232

33-
// Maximum number of concurrent requests to remote storage. If null then int.Max value is used.
34-
"MaxConcurrentRequests": null,
33+
// Maximum number of create/update/read concurrent requests to remote storage. If null then 6 value is used.
34+
"MaxTransferConcurrentRequests": 6,
35+
36+
37+
// Maximum number of listing/delete/move concurrent requests to remote storage. If null then int.Max value is used.
38+
"MaxOperationsConcurrentRequests": null,
3539

3640

3741
// Automatically lock the file in the remote storage when a file handle is being opened for writing, unlock on close.

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

0 commit comments

Comments
 (0)