Skip to content

Commit 3144f4c

Browse files
committed
Merge branch 'release/1.4'
2 parents 8e57704 + 23dd4e5 commit 3144f4c

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

Simplify.Web.MessageBox/Responses/MessageBox.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace Simplify.Web.MessageBox.Responses
1+
using System.Threading.Tasks;
2+
3+
namespace Simplify.Web.MessageBox.Responses
24
{
35
/// <summary>
46
/// Provides message box response (generate message box and puts it to the data collector)
@@ -69,15 +71,15 @@ public MessageBox(string text, int statusCode, MessageBoxStatus status = Message
6971
/// Processes this response
7072
/// </summary>
7173
/// <returns></returns>
72-
public override ControllerResponseResult Process()
74+
public override Task<ControllerResponseResult> Process()
7375
{
7476
Context.Response.StatusCode = StatusCode;
7577

7678
var handler = new MessageBoxHandler(TemplateFactory, StringTableManager, DataCollector);
7779

7880
handler.Show(Text, Status, Title);
7981

80-
return ControllerResponseResult.Default;
82+
return Task.FromResult(ControllerResponseResult.Default);
8183
}
8284
}
8385
}

Simplify.Web.MessageBox/Responses/MessageBoxInline.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace Simplify.Web.MessageBox.Responses
1+
using System.Threading.Tasks;
2+
3+
namespace Simplify.Web.MessageBox.Responses
24
{
35
/// <summary>
46
/// Provides inline message box response (generate inline message box and sends it to the user only, without site generation)
@@ -36,11 +38,11 @@ public MessageBoxInline(string text, MessageBoxStatus status = MessageBoxStatus.
3638
/// Processes this response
3739
/// </summary>
3840
/// <returns></returns>
39-
public override ControllerResponseResult Process()
41+
public override async Task<ControllerResponseResult> Process()
4042
{
4143
var handler = new MessageBoxHandler(TemplateFactory, StringTableManager, DataCollector);
4244

43-
ResponseWriter.Write(handler.GetInline(Text, Status), Context.Response);
45+
await ResponseWriter.WriteAsync(handler.GetInline(Text, Status), Context.Response);
4446

4547
return ControllerResponseResult.RawOutput;
4648
}

Simplify.Web.MessageBox/Simplify.Web.MessageBox.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<Product>Simplify</Product>
66
<Description>Simplify.Web static message box templates and controller response</Description>
77
<Copyright>Licensed under LGPL</Copyright>
8-
<Version>1.3</Version>
8+
<Version>1.4</Version>
99
<PackageProjectUrl>https://github.com/SimplifyNet/Simplify.Web.MessageBox</PackageProjectUrl>
1010
<PackageIconUrl>https://raw.githubusercontent.com/SimplifyNet/Images/master/LogoWeb32x32.png</PackageIconUrl>
1111
<RepositoryUrl>https://github.com/SimplifyNet/Simplify.Web.MessageBox</RepositoryUrl>
1212
<RepositoryType>GIT</RepositoryType>
1313
<PackageTags>Simplify.Web</PackageTags>
1414
<PackageReleaseNotes>
1515
Updates
16-
* Upgrade to Simplify.Web 3
16+
* Upgrade to Simplify.Web 4
1717
</PackageReleaseNotes>
1818
<OutputPath>bin\Any CPU\$(Configuration)\</OutputPath>
1919
<DocumentationFile>bin\Any CPU\$(Configuration)\$(TargetFramework)\Simplify.Web.MessageBox.xml</DocumentationFile>
@@ -27,6 +27,6 @@
2727
<Content Include="Templates\App_Packages\Simplify.Web.MessageBox\OkMessageBox.tpl" />
2828
</ItemGroup>
2929
<ItemGroup>
30-
<PackageReference Include="Simplify.Web" Version="3.0.0" />
30+
<PackageReference Include="Simplify.Web" Version="4.0.0" />
3131
</ItemGroup>
3232
</Project>

0 commit comments

Comments
 (0)