Merge branch 'main' of https://github.com/USArmy-Corps-of-Engineers-RMC/Numerics

Author: tikig21

4.8.1/Numerics/Numerics.csproj

@@ -84,6 +84,16 @@
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\8.0\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=8.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\8.0\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\8.0\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>

4.8.1/Numerics/Utilities/SafeProgressReporter.cs

@@ -204,15 +204,15 @@ protected void SetContext(SynchronizationContext context)
         /// </summary>
         public void IndicateTaskStart()
         {
-            _synchronizationContext.Post(new SendOrPostCallback(state => TaskStarted?.Invoke()), null);
+            _synchronizationContext?.Post(new SendOrPostCallback(state => TaskStarted?.Invoke()), null);
         }
 
         /// <summary>
         /// Indicate that the task has ended.
         /// </summary>
         public void IndicateTaskEnded()
         {
-            _synchronizationContext.Post(new SendOrPostCallback(state => TaskEnded?.Invoke()), null);
+            _synchronizationContext?.Post(new SendOrPostCallback(state => TaskEnded?.Invoke()), null);
         }
 
         /// <summary>
@@ -312,7 +312,7 @@ public SafeProgressReporter CreateProgressModifier(float fractionOfTotal, string
             child._cancellationTokenSource = _cancellationTokenSource;
             _subProgReporterCollection.Add(child);
             var invokeChildCreatedHandlers = new SendOrPostCallback(state => ChildReporterCreated?.Invoke(child));
-            _synchronizationContext.Post(invokeChildCreatedHandlers, child);
+            _synchronizationContext?.Post(invokeChildCreatedHandlers, child);
             return child;
         }
 
@@ -335,7 +335,7 @@ public void Report(double progress, string message, MessageType messageType)
         public void ReportProgress(double progress)
         {
             if (_previousProgress == progress) return;
-            _synchronizationContext.Post(_invokeProgressHandlers, new double[] { progress, _previousProgress });
+            _synchronizationContext?.Post(_invokeProgressHandlers, new double[] { progress, _previousProgress });
             _previousProgress = progress;
         }
 
@@ -346,7 +346,7 @@ public void ReportProgress(double progress)
         /// <param name="messageType">The message type.</param>
         public void ReportMessage(string message, MessageType messageType = MessageType.Status)
         {
-            _synchronizationContext.Post(_invokeMessageHandlers, new MessageContentStruct(message, messageType, this));
+            _synchronizationContext?.Post(_invokeMessageHandlers, new MessageContentStruct(message, messageType, this));
             MessageCount += 1;
             _previousMessage = message;
             _previousMessageType = messageType;
@@ -358,7 +358,7 @@ public void ReportMessage(string message, MessageType messageType = MessageType.
         /// <param name="message">The message to report.</param>
         protected void ReportMessage(MessageContentStruct message)
         {
-            _synchronizationContext.Post(_invokeMessageHandlers, message);
+            _synchronizationContext?.Post(_invokeMessageHandlers, message);
             MessageCount += 1;
             _previousMessage = message.Message;
             _previousMessageType = message.MessageType;

4.8.1/Test_Numerics/Test_Numerics.csproj

@@ -208,12 +208,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Numerics\Numerics.csproj">
-      <Project>{fcafbc53-72c3-0f70-07f2-e14a0fdaff8d}</Project>
-      <Name>Numerics</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />