Fix package hintpaths in the project file. Remove <Deterministic>true</Deterministic> flag from the project file.

Author: levitation

AsyncToSyncCodeRoundtripSynchroniserMonitorNet.csproj

@@ -11,7 +11,6 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -46,7 +45,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AsyncEnumerable, Version=4.0.2.0, Culture=neutral, PublicKeyToken=0426b068161bd1d1, processorArchitecture=MSIL">
-      <HintPath>..\..\FolderSync\FolderSyncNet\packages\AsyncEnumerator.4.0.2\lib\net45\AsyncEnumerable.dll</HintPath>
+      <HintPath>packages\AsyncEnumerator.4.0.2\lib\net45\AsyncEnumerable.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Extensions.Configuration.1.1.2\lib\netstandard1.1\Microsoft.Extensions.Configuration.dll</HintPath>
@@ -76,16 +75,16 @@
       <HintPath>packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="MyOddWeb.DirectoryWatcher, Version=0.1.9.0, Culture=neutral, PublicKeyToken=b044eb2621106c1f, processorArchitecture=MSIL">
-      <HintPath>..\..\FolderSync\FolderSyncNet\packages\MyOddWeb.DirectoryWatcher.0.1.9\lib\net452\MyOddWeb.DirectoryWatcher.dll</HintPath>
+      <HintPath>packages\MyOddWeb.DirectoryWatcher.0.1.9\lib\net452\MyOddWeb.DirectoryWatcher.dll</HintPath>
     </Reference>
     <Reference Include="MyOddWeb.DirectoryWatcher.Interfaces, Version=0.1.9.0, Culture=neutral, PublicKeyToken=b044eb2621106c1f, processorArchitecture=MSIL">
-      <HintPath>..\..\FolderSync\FolderSyncNet\packages\MyOddWeb.DirectoryWatcher.0.1.9\lib\net452\MyOddWeb.DirectoryWatcher.Interfaces.dll</HintPath>
+      <HintPath>packages\MyOddWeb.DirectoryWatcher.0.1.9\lib\net452\MyOddWeb.DirectoryWatcher.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Nito.AspNetBackgroundTasks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\FolderSync\FolderSyncNet\packages\Nito.AspNetBackgroundTasks.1.0.0\lib\net45\Nito.AspNetBackgroundTasks.dll</HintPath>
+      <HintPath>packages\Nito.AspNetBackgroundTasks.1.0.0\lib\net45\Nito.AspNetBackgroundTasks.dll</HintPath>
     </Reference>
     <Reference Include="Nito.AsyncEx.Coordination, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\Nito.AsyncEx.Coordination.5.0.0\lib\netstandard1.3\Nito.AsyncEx.Coordination.dll</HintPath>
@@ -100,7 +99,7 @@
       <HintPath>packages\Nito.Disposables.2.0.0\lib\netstandard1.0\Nito.Disposables.dll</HintPath>
     </Reference>
     <Reference Include="NReco.Text.AhoCorasickDoubleArrayTrie, Version=1.0.2.0, Culture=neutral, PublicKeyToken=70ca172a68680917, processorArchitecture=MSIL">
-      <HintPath>..\..\FolderSync\FolderSyncNet\packages\NReco.Text.AhoCorasickDoubleArrayTrie.1.0.2\lib\net40\NReco.Text.AhoCorasickDoubleArrayTrie.dll</HintPath>
+      <HintPath>packages\NReco.Text.AhoCorasickDoubleArrayTrie.1.0.2\lib\net40\NReco.Text.AhoCorasickDoubleArrayTrie.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -140,7 +139,7 @@
       <HintPath>packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\FolderSync\FolderSyncNet\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
@@ -158,7 +157,7 @@
       <HintPath>packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net46\System.Security.Cryptography.X509Certificates.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\FolderSync\FolderSyncNet\packages\System.Threading.Tasks.Extensions.4.5.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>packages\System.Threading.Tasks.Extensions.4.5.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.IO.Compression.FileSystem" />

FileExtensions.cs

@@ -5,7 +5,6 @@
 //
 
 #define ASYNC
-#define MS_IO_REDIST
 using System;
 #if NETSTANDARD
 using System.Buffers;
@@ -57,7 +56,7 @@ private static StreamReader AsyncStreamReader(string path, Encoding encoding)
 
 
             retryCount = Math.Max(0, retryCount);
-            for (int i = -1; i < retryCount; i++)   //roland
+            for (int tryIndex = -1; tryIndex < retryCount; tryIndex++)   //roland
             {
                 try    //roland
                 {
@@ -72,7 +71,7 @@ ex is IOException
                 {
                     //retry after delay
 
-                    if (i + 1 < retryCount)     //do not sleep after last try
+                    if (tryIndex + 1 < retryCount)     //do not sleep after last try
                     {
 #if !NOASYNC
                         await Task.Delay(1000, cancellationToken);     //TODO: config file?
@@ -118,11 +117,7 @@ private static async Task<string> InternalReadAllTextAsync(string path, Encoding
                 StringBuilder sb = new StringBuilder();
                 while (true)
                 {
-#if MS_IO_REDIST
                     int read = await sr.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false);
-#else
-                    int read = await sr.ReadAsync(new Memory<char>(buffer), cancellationToken).ConfigureAwait(false);
-#endif
                     if (read == 0)
                     {
                         return sb.ToString();
@@ -226,21 +221,17 @@ private static async Task InternalWriteAllTextAsync(StreamWriter sw, string cont
                 buffer = new char[DefaultBufferSize];
 #endif
                 int count = contents.Length;
-                int index = 0;
-                while (index < count)
+                int sourceOffset = 0;
+                while (sourceOffset < count)
                 {
-                    int batchSize = Math.Min(DefaultBufferSize, count - index);
-                    contents.CopyTo(index, buffer, 0, batchSize);
-#if MS_IO_REDIST
-                    await sw.WriteAsync(buffer, 0, batchSize).ConfigureAwait(false);
-#else
-                    await sw.WriteAsync(new ReadOnlyMemory<char>(buffer, 0, batchSize), cancellationToken).ConfigureAwait(false);
-#endif
-                    index += batchSize;
+                    int batchSize = Math.Min(DefaultBufferSize, count - sourceOffset);
+                    contents.CopyTo(sourceOffset, buffer, 0, batchSize);
+                    await sw.WriteAsync(buffer, 0, batchSize);
+                    sourceOffset += batchSize;
                 }
 
                 cancellationToken.ThrowIfCancellationRequested();
-                await sw.FlushAsync().ConfigureAwait(false);
+                await sw.FlushAsync();
             }
             finally
             {

Program.cs

@@ -484,9 +484,12 @@ private static async Task WriteException(Exception ex_in)
 
             message.AppendLine("");
 
-            await FileExtensions.AppendAllTextAsync("UnhandledExceptions.log", message.ToString(), Global.CancellationToken.Token);
-
 
+            using (await ConsoleWatch.Lock.LockAsync(Global.CancellationToken.Token))
+            {
+                await FileExtensions.AppendAllTextAsync("UnhandledExceptions.log", message.ToString(), Global.CancellationToken.Token);
+            }
+            
 
             //Console.WriteLine(ex.Message);
             message.Clear();     //TODO: refactor to shared function
@@ -501,16 +504,15 @@ private static async Task WriteException(Exception ex_in)
 
 
             var time = DateTime.Now;
-            var msg = $"[{time:yyyy.MM.dd HH:mm:ss.ffff}]:{message}";
+            var msg = $"[{time:yyyy.MM.dd HH:mm:ss.ffff}] : {message}";
             await AddMessage(ConsoleColor.Red, msg, time, showAlert: true);
         }
 
         private static async Task AddMessage(ConsoleColor color, string message, DateTime time, bool showAlert = false)
         {
             //await Task.Run(() => 
             {
-                //NB! using synchronous lock here since the MessageBox.Show and Console.WriteLine are synchronous
-                lock (ConsoleWatch.Lock)
+                using (await ConsoleWatch.Lock.LockAsync(Global.CancellationToken.Token))
                 {
                     try
                     {
@@ -616,7 +618,7 @@ internal class ConsoleWatch
         /// <summary>
         /// We need a static lock so it is shared by all.
         /// </summary>
-        internal static readonly object Lock = new object();
+        internal static readonly AsyncLock Lock = new AsyncLock();
 
         internal static DateTime PrevAlertTime;
         internal static string PrevAlertMessage;
@@ -703,8 +705,11 @@ public static async Task WriteException(Exception ex_in, Context context)
 
             message.AppendLine("");
 
-            await FileExtensions.AppendAllTextAsync("UnhandledExceptions.log", message.ToString(), context.Token);
 
+            using (await ConsoleWatch.Lock.LockAsync(context.Token))
+            {
+                await FileExtensions.AppendAllTextAsync("UnhandledExceptions.log", message.ToString(), context.Token);
+            }
 
 
             //Console.WriteLine(ex.Message);
@@ -1289,8 +1294,7 @@ public static async Task AddMessage(ConsoleColor color, string message, Context
         {
             //await Task.Run(() =>
             {
-                //NB! using synchronous lock here since the MessageBox.Show and Console.WriteLine are synchronous
-                lock (Lock)
+                using (await ConsoleWatch.Lock.LockAsync(context.Token))
                 {
                     try
                     {