Merge pull request #19 from stavroskasidis/release/2.2

Version 2.2
stavroskasidis · Jan 18, 2024 · 9783a57 · 9783a57
2 parents c08f0e0 + 0e31667
commit 9783a57
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/BlazorDialog/BlazorDialog.csproj b/BlazorDialog/BlazorDialog.csproj
@@ -2,8 +2,6 @@
 
   <PropertyGroup>
     <IsPackable>true</IsPackable>
-
-
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageId>BlazorDialog</PackageId>
     <Authors>Stavros Kasidis (AkiraGTX)</Authors>
@@ -14,7 +12,7 @@
     <Copyright />
     <PackageTags>blazor blazor-component blazor-dialog dialog modal blazor-modal blazordialog blazormodaldialog blazormodal razor razor-components razorcomponents</PackageTags>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
     <Product>BlazorDialog</Product>
   </PropertyGroup>

diff --git a/BlazorDialog/Components/Dialog.razor b/BlazorDialog/Components/Dialog.razor
@@ -210,7 +210,7 @@
         dialogStore.Unregister(this);
         if (taskCompletionSource != null)
         {
-            taskCompletionSource.SetCanceled();
+            taskCompletionSource.TrySetCanceled();
             taskCompletionSource = null;
         }
     }
@@ -256,7 +256,7 @@
         }
         if (taskCompletionSource != null)
         {
-            taskCompletionSource.SetCanceled();
+            taskCompletionSource.TrySetCanceled();
             taskCompletionSource = null;
         }
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
   <!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
   <PropertyGroup>
 	  <TargetFramework>net6.0</TargetFramework>
-	  <MSPackagesVersion>6.0.0</MSPackagesVersion>
+	  <MSPackagesVersion>6.0.26</MSPackagesVersion>
 	  <Nullable>enable</Nullable>
 	  <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/README.md b/README.md
@@ -81,8 +81,14 @@ Make sure that there is a call to `app.UseStaticFiles();` in your server project
 </details>
 
 ## Release Notes
+<details open="open"><summary>2.2</summary>
+
+>- Fix for showing the same dialog with the dialog service more than once in the same async function.
+>- Upgrade MS packages dependecy to 6.0.26
+</details>
+
 
-<details open="open"><summary>2.1</summary>
+<details><summary>2.1</summary>
 
 >- Minor fix for when returning null dialog results to non nullable result types.
 </details>