Skip to content

Commit

Permalink
Fix for showing the same dialog with the dialog service more than onc…
Browse files Browse the repository at this point in the history
…e in the same async function
  • Loading branch information
stavroskasidis committed Jan 18, 2024
1 parent c08f0e0 commit 0e31667
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
4 changes: 1 addition & 3 deletions BlazorDialog/BlazorDialog.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

<PropertyGroup>
<IsPackable>true</IsPackable>


<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageId>BlazorDialog</PackageId>
<Authors>Stavros Kasidis (AkiraGTX)</Authors>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions BlazorDialog/Components/Dialog.razor
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
dialogStore.Unregister(this);
if (taskCompletionSource != null)
{
taskCompletionSource.SetCanceled();
taskCompletionSource.TrySetCanceled();
taskCompletionSource = null;
}
}
Expand Down Expand Up @@ -256,7 +256,7 @@
}
if (taskCompletionSource != null)
{
taskCompletionSource.SetCanceled();
taskCompletionSource.TrySetCanceled();
taskCompletionSource = null;
}

Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 0e31667

Please sign in to comment.