Skip to content

Commit 76e3006

Browse files
levitationlevitation
committed
Various minor updates.
1 parent df36622 commit 76e3006

File tree

4 files changed

+25
-18
lines changed

4 files changed

+25
-18
lines changed

‎AsyncToSyncCodeRoundtripSynchroniserMonitorNet.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
26-
<NoWarn>S125;S1125;S1135;S2589;S3881;S3358;CA1063;CCN0011;CCN0021;CCN0031;1701;1702;AsyncFixed01;MS002;IDE0018;AD0001</NoWarn>
26+
<NoWarn>SEC0122;S125;S1125;S1135;S2589;S3881;S3358;CA1063;CCN0011;CCN0021;CCN0031;1701;1702;AsyncFixed01;MS002;IDE0018;AD0001</NoWarn>
2727
<WarningsAsErrors>NU1605</WarningsAsErrors>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3030
<PlatformTarget>AnyCPU</PlatformTarget>
31-
<DebugType>pdbonly</DebugType>
31+
<DebugType>full</DebugType>
3232
<Optimize>true</Optimize>
3333
<OutputPath>bin\Release\</OutputPath>
3434
<DefineConstants>TRACE</DefineConstants>
3535
<ErrorReport>prompt</ErrorReport>
3636
<WarningLevel>4</WarningLevel>
37-
<NoWarn>S125;S1125;S1135;S2589;S3881;S3358;CA1063;CCN0011;CCN0021;CCN0031;1701;1702;AsyncFixed01;MS002;IDE0018;AD0001</NoWarn>
37+
<NoWarn>SEC0122;S125;S1125;S1135;S2589;S3881;S3358;CA1063;CCN0011;CCN0021;CCN0031;1701;1702;AsyncFixed01;MS002;IDE0018;AD0001</NoWarn>
3838
<WarningsAsErrors>NU1605</WarningsAsErrors>
39+
<DebugSymbols>true</DebugSymbols>
3940
</PropertyGroup>
4041
<PropertyGroup>
4142
<StartupObject>AsyncToSyncCodeRoundtripSynchroniserMonitor.Program</StartupObject>

‎AsyncToSyncConverter.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ static class AsyncToSyncConverter
5050

5151

5252
private static readonly Regex TaskDelayReplaceRegex = new Regex(@"Task[.]Delay", RegexOptions.Singleline | RegexOptions.Compiled);
53-
private static readonly string TaskDelayReplaceRegexReplacement = @"/*--Task.Delay--*/System.Threading.Thread.Sleep";
53+
private const string TaskDelayReplaceRegexReplacement = @"/*--Task.Delay--*/System.Threading.Thread.Sleep";
5454

5555

5656
private static readonly Regex TaskReplaceRegex = new Regex(@"(\s+)(async\s+)?Task<([^ (]+)>(\s+)", RegexOptions.Singleline | RegexOptions.Compiled);
57-
private static readonly string TaskReplaceRegexReplacement = @"$1/*--$2Task<--*/$3/*-->--*/$4";
57+
private const string TaskReplaceRegexReplacement = @"$1/*--$2Task<--*/$3/*-->--*/$4";
5858

5959

6060
private static readonly Regex AsyncLockReplaceRegex = new Regex(@"using([^(]*)[(]await(\s+[^(]+)[.]LockAsync[(][)][)]", RegexOptions.Singleline | RegexOptions.Compiled);
61-
private static readonly string AsyncLockReplaceRegexReplacement = @"/*--using--*/lock$1(/*--await--*/ $2/*--.Lock A s y n c()--*/)";
61+
private const string AsyncLockReplaceRegexReplacement = @"/*--using--*/lock$1(/*--await--*/ $2/*--.Lock A s y n c()--*/)";
6262

6363

6464
public static async Task AsyncFileUpdated(string fullName, Context context)

‎Program.cs‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ private static async Task MainTask()
185185
foreach (var fileSystemInfo in new DirectoryInfo(Global.SyncPath)
186186
.GetFileSystemInfos("*." + Global.WatchedCodeExtension, SearchOption.AllDirectories))
187187
{
188-
await consoleWatch.OnAddedAsync
188+
await ConsoleWatch.OnAddedAsync
189189
(
190190
new DummyFileSystemEvent(fileSystemInfo),
191191
new CancellationToken()
@@ -195,7 +195,7 @@ await consoleWatch.OnAddedAsync
195195
foreach (var fileSystemInfo in new DirectoryInfo(Global.SyncPath)
196196
.GetFileSystemInfos("*." + Global.WatchedResXExtension, SearchOption.AllDirectories))
197197
{
198-
await consoleWatch.OnAddedAsync
198+
await ConsoleWatch.OnAddedAsync
199199
(
200200
new DummyFileSystemEvent(fileSystemInfo),
201201
new CancellationToken()
@@ -207,7 +207,7 @@ await consoleWatch.OnAddedAsync
207207
foreach (var fileSystemInfo in new DirectoryInfo(Global.AsyncPath)
208208
.GetFileSystemInfos("*." + Global.WatchedCodeExtension, SearchOption.AllDirectories))
209209
{
210-
await consoleWatch.OnAddedAsync
210+
await ConsoleWatch.OnAddedAsync
211211
(
212212
new DummyFileSystemEvent(fileSystemInfo),
213213
new CancellationToken()
@@ -217,7 +217,7 @@ await consoleWatch.OnAddedAsync
217217
foreach (var fileSystemInfo in new DirectoryInfo(Global.AsyncPath)
218218
.GetFileSystemInfos("*." + Global.WatchedResXExtension, SearchOption.AllDirectories))
219219
{
220-
await consoleWatch.OnAddedAsync
220+
await ConsoleWatch.OnAddedAsync
221221
(
222222
new DummyFileSystemEvent(fileSystemInfo),
223223
new CancellationToken()
@@ -236,8 +236,14 @@ await consoleWatch.OnAddedAsync
236236
// listen for the Ctrl+C
237237
WaitForCtrlC();
238238

239+
Console.WriteLine("Stopping...");
240+
239241
// stop everything.
240242
watch.Stop();
243+
244+
Console.WriteLine("Exiting...");
245+
246+
GC.KeepAlive(consoleWatch);
241247
}
242248
}
243249
catch (Exception ex)
@@ -310,7 +316,7 @@ internal class ConsoleWatch
310316
/// We need a static lock so it is shared by all.
311317
/// </summary>
312318
private static readonly object Lock = new object();
313-
private static readonly AsyncLock AsyncLock = new AsyncLock(); //TODO: use this
319+
//private static readonly AsyncLock AsyncLock = new AsyncLock(); //TODO: use this
314320

315321
#pragma warning disable S2223 //Warning S2223 Change the visibility of 'DoingInitialSync' or make it 'const' or 'readonly'.
316322
public static bool DoingInitialSync = false;
@@ -545,7 +551,7 @@ private static bool IsWatchedFile(string fullName)
545551
} //private bool IsWatchedFile(string fullName, Context context)
546552

547553
#pragma warning disable AsyncFixer01
548-
private async Task OnRenamedAsync(IRenamedFileSystemEvent rfse, CancellationToken token)
554+
private static async Task OnRenamedAsync(IRenamedFileSystemEvent rfse, CancellationToken token)
549555
{
550556
var context = new Context(rfse, token);
551557

@@ -579,7 +585,7 @@ private async Task OnRenamedAsync(IRenamedFileSystemEvent rfse, CancellationToke
579585
}
580586
}
581587

582-
private async Task OnRemovedAsync(IFileSystemEvent fse, CancellationToken token)
588+
private static async Task OnRemovedAsync(IFileSystemEvent fse, CancellationToken token)
583589
{
584590
var context = new Context(fse, token);
585591

@@ -605,7 +611,7 @@ private async Task OnRemovedAsync(IFileSystemEvent fse, CancellationToken token)
605611
}
606612
}
607613

608-
public async Task OnAddedAsync(IFileSystemEvent fse, CancellationToken token)
614+
public static async Task OnAddedAsync(IFileSystemEvent fse, CancellationToken token)
609615
{
610616
var context = new Context(fse, token);
611617

@@ -631,7 +637,7 @@ public async Task OnAddedAsync(IFileSystemEvent fse, CancellationToken token)
631637
}
632638
}
633639

634-
private async Task OnTouchedAsync(IFileSystemEvent fse, CancellationToken token)
640+
private static async Task OnTouchedAsync(IFileSystemEvent fse, CancellationToken token)
635641
{
636642
var context = new Context(fse, token);
637643

‎SyncToAsyncConverter.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ static class SyncToAsyncConverter
2828

2929

3030
private static readonly Regex TaskDelayReplaceRegex = new Regex(@"/[*]--Task[.]Delay--[*]/\s*((System[.])?Threading[.])?Thread[.]Sleep", RegexOptions.Singleline | RegexOptions.Compiled);
31-
private static readonly string TaskDelayReplaceRegexReplacement = @"Task.Delay";
31+
private const string TaskDelayReplaceRegexReplacement = @"Task.Delay";
3232

3333

3434
private static readonly Regex TaskReplaceRegex = new Regex(@"(\s+)/[*]--(async\s+)?Task<--[*]/\s*([^/*(-]+)/[*]-->--[*]/(\s+)", RegexOptions.Singleline | RegexOptions.Compiled);
35-
private static readonly string TaskReplaceRegexReplacement = @"$1$2Task<$3>$4";
35+
private const string TaskReplaceRegexReplacement = @"$1$2Task<$3>$4";
3636

3737

3838
private static readonly Regex AsyncLockReplaceRegex = new Regex(@"/[*]--using--[*]/\s*lock(\s*)[(]/[*]--await--[*]/\s+([^/*()-]+)/[*]--[.]Lock\sA\ss\sy\sn\sc[(][)]--[*]/\s*[)]", RegexOptions.Singleline | RegexOptions.Compiled);
39-
private static readonly string AsyncLockReplaceRegexReplacement = @"using$1(await $2.LockAsync())";
39+
private const string AsyncLockReplaceRegexReplacement = @"using$1(await $2.LockAsync())";
4040

4141
static SyncToAsyncConverter()
4242
{

0 commit comments

Comments
 (0)