Merge pull request #239 from ptr727/develop

ptr727 · web-flow · commit 1f07a09483b3 · 2025-05-24T10:54:36.000-07:00
Develop
diff --git a/.editorconfig b/.editorconfig
@@ -15,7 +15,7 @@ root = true
 
 # Defaults
 [*]
-charset = utf-8-bom
+charset = utf-8
 end_of_line = crlf
 indent_size = 4
 indent_style = space
diff --git a/Sandbox/Program.cs b/Sandbox/Program.cs
@@ -1,4 +1,4 @@
-﻿using System.Diagnostics;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using InsaneGenius.Utilities;
diff --git a/Utilities/CommandLineEx.cs b/Utilities/CommandLineEx.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 
 namespace InsaneGenius.Utilities;
 
diff --git a/Utilities/ConsoleEx.cs b/Utilities/ConsoleEx.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Globalization;
 using System.Threading;
 
diff --git a/Utilities/Download.cs b/Utilities/Download.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.IO;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -15,8 +15,11 @@ public static bool GetContentInfo(Uri uri, out long size, out DateTime modifiedT
         try
         {
             // Send GET to URL
-            using HttpResponseMessage httpResponse = GetHttpClient().GetAsync(uri).Result;
-            _ = httpResponse.EnsureSuccessStatusCode();
+            using HttpResponseMessage httpResponse = GetHttpClient()
+                .GetAsync(uri)
+                .GetAwaiter()
+                .GetResult()
+                .EnsureSuccessStatusCode();
 
             // Get response
             size = (long)httpResponse.Content.Headers.ContentLength;
@@ -36,7 +39,7 @@ public static bool DownloadFile(Uri uri, string fileName)
         try
         {
             // Get HTTP stream
-            Stream httpStream = GetHttpClient().GetStreamAsync(uri).Result;
+            Stream httpStream = GetHttpClient().GetStreamAsync(uri).GetAwaiter().GetResult();
 
             // Get file stream
             using FileStream fileStream = File.OpenWrite(fileName);
@@ -58,7 +61,7 @@ public static bool DownloadString(Uri uri, out string value)
         value = null;
         try
         {
-            value = GetHttpClient().GetStringAsync(uri).Result;
+            value = GetHttpClient().GetStringAsync(uri).GetAwaiter().GetResult();
         }
         catch (Exception e)
             when (LogOptions.Logger.LogAndHandle(e, MethodBase.GetCurrentMethod()?.Name))
diff --git a/Utilities/Extensions.cs b/Utilities/Extensions.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using Serilog;
 
 namespace InsaneGenius.Utilities;
diff --git a/Utilities/FileEx.cs b/Utilities/FileEx.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Utilities/FileExOptions.cs b/Utilities/FileExOptions.cs
@@ -1,4 +1,4 @@
-﻿using System.Threading;
+using System.Threading;
 
 namespace InsaneGenius.Utilities;
 
diff --git a/Utilities/Format.cs b/Utilities/Format.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 
 namespace InsaneGenius.Utilities;
 
diff --git a/Utilities/Iso6392.cs b/Utilities/Iso6392.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
diff --git a/Utilities/Iso6393.cs b/Utilities/Iso6393.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
diff --git a/Utilities/LogOptions.cs b/Utilities/LogOptions.cs
@@ -1,4 +1,4 @@
-﻿// TODO: Problematic when used in different environments
+// TODO: Problematic when used in different environments
 // using Microsoft.Extensions.Logging;
 
 using Serilog;
diff --git a/Utilities/ProcessEx.cs b/Utilities/ProcessEx.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
@@ -9,7 +9,7 @@ namespace InsaneGenius.Utilities;
 public class ProcessEx : Process
 {
     public int ExecuteEx(string executable, string parameters) =>
-        ExecuteExAsync(executable, parameters).Result;
+        ExecuteExAsync(executable, parameters).GetAwaiter().GetResult();
 
     public async Task<int> ExecuteExAsync(string executable, string parameters)
     {
diff --git a/Utilities/Rfc5646.cs b/Utilities/Rfc5646.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
diff --git a/Utilities/StringCompression.cs b/Utilities/StringCompression.cs
@@ -1,4 +1,4 @@
-﻿using System.IO;
+using System.IO;
 using System.IO.Compression;
 using System.Text;
 
diff --git a/Utilities/StringHistory.cs b/Utilities/StringHistory.cs
@@ -1,4 +1,4 @@
-﻿using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text;
 
 namespace InsaneGenius.Utilities;
diff --git a/UtilitiesTests/CommandLineTests.cs b/UtilitiesTests/CommandLineTests.cs
@@ -1,4 +1,4 @@
-﻿using Xunit;
+using Xunit;
 
 namespace InsaneGenius.Utilities.Tests;
 
diff --git a/UtilitiesTests/ConsoleTests.cs b/UtilitiesTests/ConsoleTests.cs
@@ -1,4 +1,4 @@
-﻿using Xunit;
+using Xunit;
 
 namespace InsaneGenius.Utilities.Tests;
 
diff --git a/UtilitiesTests/DownloadTests.cs b/UtilitiesTests/DownloadTests.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using Xunit;
 
 namespace InsaneGenius.Utilities.Tests;
diff --git a/UtilitiesTests/FileTests.cs b/UtilitiesTests/FileTests.cs
@@ -1,4 +1,4 @@
-﻿using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using Xunit;
 
 namespace InsaneGenius.Utilities.Tests;
diff --git a/UtilitiesTests/FormatTests.cs b/UtilitiesTests/FormatTests.cs
@@ -1,4 +1,4 @@
-﻿using Xunit;
+using Xunit;
 
 namespace InsaneGenius.Utilities.Tests;
 
diff --git a/UtilitiesTests/Iso6392Tests.cs b/UtilitiesTests/Iso6392Tests.cs
@@ -1,4 +1,4 @@
-﻿using System.IO;
+using System.IO;
 using System.Reflection;
 using Xunit;
 
diff --git a/UtilitiesTests/Iso6393Tests.cs b/UtilitiesTests/Iso6393Tests.cs
@@ -1,4 +1,4 @@
-﻿using System.IO;
+using System.IO;
 using System.Reflection;
 using Xunit;
 
diff --git a/UtilitiesTests/Rfc5646Tests.cs b/UtilitiesTests/Rfc5646Tests.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.IO;
 using System.Reflection;
 using Xunit;
diff --git a/UtilitiesTests/StringCompressionTests.cs b/UtilitiesTests/StringCompressionTests.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using Xunit;
 
 namespace InsaneGenius.Utilities.Tests;
diff --git a/UtilitiesTests/UtilitiesTests.cs b/UtilitiesTests/UtilitiesTests.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 
 namespace InsaneGenius.Utilities.Tests;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Diagnostics;`
	`1`	`+using System.Diagnostics;`
`2`	`2`	`using System.IO;`
`3`	`3`	`using System.Reflection;`
`4`	`4`	`using InsaneGenius.Utilities;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`
`3`	`3`	`namespace InsaneGenius.Utilities;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Threading;`
	`1`	`+using System.Threading;`
`2`	`2`
`3`	`3`	`namespace InsaneGenius.Utilities;`
`4`	`4`