Skip to content

Commit 0a99cf9

Browse files
i4004i4004
committed
Merge branch 'develop'
2 parents f52943b + 6701004 commit 0a99cf9

File tree

6 files changed

+32
-21
lines changed

6 files changed

+32
-21
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![AppVeyor branch](https://img.shields.io/appveyor/ci/i4004/simplify-web-messagebox/master)](https://ci.appveyor.com/project/i4004/simplify-web-messagebox)
66
[![Libraries.io dependency status for latest release](https://img.shields.io/librariesio/release/nuget/Simplify.Web.MessageBox)](https://libraries.io/nuget/Simplify.Web.MessageBox)
77
[![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/SimplifyNet/Simplify.Web.MessageBox)](https://www.codefactor.io/repository/github/simplifynet/simplify.web.MessageBox)
8-
![Platform](https://img.shields.io/badge/platform-.NET%20Standard%202.0%20%7C%20.NET%204.6.2-lightgrey)
8+
![Platform](https://img.shields.io/badge/platform-NET%205.0%20%7C%20.NET%20Standard%202.0%20%7C%20.NET%204.6.2-lightgrey)
99
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=SimplifyNet/Simplify.Web.MessageBox)](https://dependabot.com)
1010
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen)](http://makeapullrequest.com)
1111

‎Simplify.Web.MessageBox/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Changelog
2+
3+
## [1.4.3] - 2021-04-26
4+
5+
### Added
6+
7+
- .NET 5.0 explicit support
8+
9+
### Dependencies
10+
11+
- Simplify.Web bump to 4.4

‎Simplify.Web.MessageBox/IMessageBoxHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ public interface IMessageBoxHandler
2525
/// <param name="text">Text of a message box</param>
2626
/// <param name="status">Status of a message box</param>
2727
/// <param name="title">Title of a message box</param>
28-
void Show(string text, MessageBoxStatus status = MessageBoxStatus.Error, string title = null);
28+
void Show(string text, MessageBoxStatus status = MessageBoxStatus.Error, string? title = null);
2929

3030
/// <summary>
3131
///Generate message box HTML and set to data collector
3232
/// </summary>
3333
/// <param name="stringTableItemName">Show message from string table item</param>
3434
/// <param name="status">Status of a message box</param>
3535
/// <param name="title">Title of a message box</param>
36-
void ShowSt(string stringTableItemName, MessageBoxStatus status = MessageBoxStatus.Error, string title = null);
36+
void ShowSt(string stringTableItemName, MessageBoxStatus status = MessageBoxStatus.Error, string? title = null);
3737

3838
/// <summary>
3939
/// Get inline message box HTML

‎Simplify.Web.MessageBox/MessageBoxHandler.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public MessageBoxHandler(ITemplateFactory templateFactory, IStringTable stringTa
4848
/// <param name="text">Text of a message box</param>
4949
/// <param name="status">Status of a message box</param>
5050
/// <param name="title">Title of a message box</param>
51-
public void Show(string text, MessageBoxStatus status = MessageBoxStatus.Error, string title = null)
51+
public void Show(string? text, MessageBoxStatus status = MessageBoxStatus.Error, string? title = null)
5252
{
5353
if (string.IsNullOrEmpty(text))
5454
throw new ArgumentNullException(nameof(text));
@@ -85,18 +85,16 @@ public void Show(string text, MessageBoxStatus status = MessageBoxStatus.Error,
8585
/// <param name="stringTableItemName">Show message from string table item</param>
8686
/// <param name="status">Status of a message box</param>
8787
/// <param name="title">Title of a message box</param>
88-
public void ShowSt(string stringTableItemName, MessageBoxStatus status = MessageBoxStatus.Error, string title = null)
89-
{
88+
public void ShowSt(string stringTableItemName, MessageBoxStatus status = MessageBoxStatus.Error, string? title = null) =>
9089
Show(_stringTable.GetItem(stringTableItemName), status, title);
91-
}
9290

9391
/// <summary>
9492
/// Get inline message box HTML
9593
/// </summary>
9694
/// <param name="text">Text of a message box</param>
9795
/// <param name="status">Status of a message box</param>
9896
/// <returns>Message box html</returns>
99-
public string GetInline(string text, MessageBoxStatus status = MessageBoxStatus.Error)
97+
public string GetInline(string? text, MessageBoxStatus status = MessageBoxStatus.Error)
10098
{
10199
if (string.IsNullOrEmpty(text))
102100
throw new ArgumentNullException(nameof(text));
@@ -131,9 +129,7 @@ public string GetInline(string text, MessageBoxStatus status = MessageBoxStatus.
131129
/// <param name="stringTableItemName">Show message from string table item</param>
132130
/// <param name="status">Status of a message box</param>
133131
/// <returns>Message box html</returns>
134-
public string GetInlineSt(string stringTableItemName, MessageBoxStatus status = MessageBoxStatus.Error)
135-
{
136-
return GetInline(_stringTable.GetItem(stringTableItemName), status);
137-
}
132+
public string GetInlineSt(string stringTableItemName, MessageBoxStatus status = MessageBoxStatus.Error) =>
133+
GetInline(_stringTable.GetItem(stringTableItemName), status);
138134
}
139135
}

‎Simplify.Web.MessageBox/Responses/MessageBox.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class MessageBox : ControllerResponse
1414
/// <param name="status">The message box status.</param>
1515
/// <param name="statusCode">The HTTP response status code.</param>
1616
/// <param name="title">The title.</param>
17-
public MessageBox(string text, MessageBoxStatus status = MessageBoxStatus.Error, int statusCode = 200, string title = null)
17+
public MessageBox(string text, MessageBoxStatus status = MessageBoxStatus.Error, int statusCode = 200, string? title = null)
1818
{
1919
Text = text;
2020
Status = status;
@@ -65,7 +65,7 @@ public MessageBox(string text, int statusCode, MessageBoxStatus status = Message
6565
/// <value>
6666
/// The title.
6767
/// </value>
68-
public string Title { get; }
68+
public string? Title { get; }
6969

7070
/// <summary>
7171
/// Processes this response

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
3+
<TargetFrameworks>net5.0;netstandard2.0;net462</TargetFrameworks>
4+
<LangVersion>9.0</LangVersion>
5+
<Nullable>enable</Nullable>
46
<IncludeSymbols>true</IncludeSymbols>
57
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
68
<OutputPath>bin\Any CPU\$(Configuration)\</OutputPath>
79
<GenerateDocumentationFile>true</GenerateDocumentationFile>
810

9-
<Version>1.4.2</Version>
10-
<PackageReleaseNotes>
11-
Updates
12-
* Upgrade to Simplify.Web 4.2.3
13-
</PackageReleaseNotes>
11+
<Version>1.4.3</Version>
1412

1513
<Authors>Alexander Krylkov</Authors>
1614
<Product>Simplify</Product>
@@ -21,6 +19,8 @@
2119
<RepositoryUrl>https://github.com/SimplifyNet/Simplify.Web.MessageBox</RepositoryUrl>
2220
<RepositoryType>GIT</RepositoryType>
2321
<PackageTags>Simplify.Web</PackageTags>
22+
23+
<PackageReleaseNotes>See https://github.com/SimplifyNet/Simplify.Web.Multipart/tree/master/src/Simplify.Web.Multipart/CHANGELOG.md for details</PackageReleaseNotes>
2424
</PropertyGroup>
2525
<ItemGroup>
2626
<Content Include="Templates\App_Packages\Simplify.Web.MessageBox\ErrorMessageBox.tpl" />
@@ -31,7 +31,11 @@
3131
<Content Include="Templates\App_Packages\Simplify.Web.MessageBox\OkMessageBox.tpl" />
3232
</ItemGroup>
3333
<ItemGroup>
34-
<PackageReference Include="Simplify.Web" Version="4.2.*" />
34+
<PackageReference Include="Simplify.Web" Version="4.4.*" />
35+
</ItemGroup>
36+
<ItemGroup>
37+
<None Include="..\images\icon.png" Pack="true" Visible="false" PackagePath="" />
38+
<None Include="CHANGELOG.md" Pack="true" PackagePath="\" />
3539
</ItemGroup>
3640
<ItemGroup>
3741
<None Include="..\images\icon.png" Pack="true" Visible="false" PackagePath="" />

0 commit comments

Comments
 (0)