Fixes some issues with configureawait and getting result

Author: soenneker

src/AsyncSingleton.cs

@@ -152,17 +152,17 @@ private object InitSyncInternal(params object[] objects)
                 if (_asyncObjectFunc is null)
                     throw new NullReferenceException(Constants.InitializationFuncError);
 
-                return _asyncObjectFunc(objects).NoSync().GetAwaiter().GetResult();
+                return _asyncObjectFunc(objects).AwaitSync();
             case InitializationType.AsyncObjectToken:
                 if (_asyncObjectTokenFunc is null)
                     throw new NullReferenceException(Constants.InitializationFuncError);
 
-                return _asyncObjectTokenFunc(CancellationToken.None, objects).NoSync().GetAwaiter().GetResult();
+                return _asyncObjectTokenFunc(CancellationToken.None, objects).AwaitSync();
             case InitializationType.Async:
                 if (_asyncFunc is null)
                     throw new NullReferenceException(Constants.InitializationFuncError);
 
-                return _asyncFunc().NoSync().GetAwaiter().GetResult();
+                return _asyncFunc().AwaitSync();
             case InitializationType.SyncObject:
                 if (_objectFunc is null)
                     throw new NullReferenceException(Constants.InitializationFuncError);
@@ -257,7 +257,7 @@ public void Dispose()
             else if (localInstance is IAsyncDisposable asyncDisposable)
             {
                 // Handle async disposal in a synchronous context.
-                asyncDisposable.DisposeAsync().NoSync().GetAwaiter().GetResult();
+                asyncDisposable.DisposeAsync().AwaitSync();
             }
 
             // Clear the instance explicitly to allow for garbage collection.

src/AsyncSingleton{T}.cs

@@ -173,19 +173,19 @@ private T GetSyncInternal(params object[] objects)
                     throw new NullReferenceException(Constants.InitializationFuncError);
 
                 // Not a great situation here - we only have async initialization but we're calling this synchronously... so we'll block
-                return _asyncObjectFunc(objects).NoSync().GetAwaiter().GetResult();
+                return _asyncObjectFunc(objects).AwaitSync();
             case InitializationType.AsyncObjectToken:
                 if (_asyncObjectTokenFunc is null)
                     throw new NullReferenceException(Constants.InitializationFuncError);
 
                 // Not a great situation here - we only have async initialization but we're calling this synchronously... so we'll block
-                return _asyncObjectTokenFunc(CancellationToken.None, objects).NoSync().GetAwaiter().GetResult();
+                return _asyncObjectTokenFunc(CancellationToken.None, objects).AwaitSync();
             case InitializationType.Async:
                 if (_asyncFunc is null)
                     throw new NullReferenceException(Constants.InitializationFuncError);
 
                 // Not a great situation here - we only have async initialization but we're calling this synchronously... so we'll block
-                return _asyncFunc().NoSync().GetAwaiter().GetResult();
+                return _asyncFunc().AwaitSync();
             case InitializationType.SyncObject:
                 if (_objectFunc is null)
                     throw new NullReferenceException(Constants.InitializationFuncError);
@@ -283,7 +283,7 @@ public void Dispose()
         // Handle IAsyncDisposable in a synchronous context
         else if (localInstance is IAsyncDisposable asyncDisposable)
         {
-            asyncDisposable.DisposeAsync().NoSync().GetAwaiter().GetResult();
+            asyncDisposable.DisposeAsync().AwaitSync();
         }
 
         // Clear the instance reference and suppress finalization

src/Soenneker.Utils.AsyncSingleton.csproj

@@ -38,6 +38,6 @@
         <None Include="..\icon.png" Pack="true" PackagePath="\" />
 
         <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-        <PackageReference Include="Soenneker.Extensions.ValueTask" Version="3.0.79" />
+        <PackageReference Include="Soenneker.Extensions.ValueTask" Version="3.0.81" />
     </ItemGroup>
 </Project>