Skip to content

Commit fa3c354

Browse files
committed
* Simplify.System.Sources internal upgrade to 1.2.2
* Simplify.Xml.Sources internal upgrade to 1.1.2 ControllerMetaDatab nullability fix WarningsAsErrors for nullable enabled
1 parent 0a3c37e commit fa3c354

File tree

5 files changed

+31
-23
lines changed

5 files changed

+31
-23
lines changed

src/Simplify.Web.Tests/Meta/ControllersMetaDataFactoryTests.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Linq;
1+
using System;
2+
using System.Linq;
23
using NUnit.Framework;
34
using Simplify.Web.Meta;
45
using Simplify.Web.Tests.TestEntities;
@@ -17,6 +18,10 @@ public void CreateControllerMetaData_TestController_PropertiesSetCorrectly()
1718
// Act
1819

1920
var metaData = factory.CreateControllerMetaData(typeof(TestController1));
21+
22+
if (metaData.Security == null || metaData.ExecParameters == null || metaData.Role == null)
23+
throw new InvalidOperationException();
24+
2025
var roles = metaData.Security.RequiredUserRoles.ToList();
2126

2227
// Assert

src/Simplify.Web.Tests/Simplify.Web.Tests.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
44
<LangVersion>8.0</LangVersion>
55
<Nullable>enable</Nullable>
6+
<WarningsAsErrors>nullable</WarningsAsErrors>
7+
<Version>2.1.2</Version>
68
<Authors>Alexander Krylkov</Authors>
79
<Product>Simplify</Product>
810
<Description>Simplify.Web unit tests</Description>
911
<Copyright>Licensed under LGPL</Copyright>
10-
<Version>2.1.1</Version>
1112
</PropertyGroup>
1213
<ItemGroup>
1314
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />

src/Simplify.Web/Meta/ControllerExecParameters.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class ControllerExecParameters
1212
/// </summary>
1313
/// <param name="routes">The routes.</param>
1414
/// <param name="execPriority">The execute priority.</param>
15-
public ControllerExecParameters(IDictionary<HttpMethod, string> routes, int execPriority = 0)
15+
public ControllerExecParameters(IDictionary<HttpMethod, string>? routes, int execPriority = 0)
1616
{
1717
Routes = routes ?? new Dictionary<HttpMethod, string>();
1818
RunPriority = execPriority;

src/Simplify.Web/Meta/ControllerMetaData.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#nullable disable
2-
3-
using System;
1+
using System;
42

53
namespace Simplify.Web.Meta
64
{
@@ -16,7 +14,7 @@ public class ControllerMetaData : IControllerMetaData
1614
/// <param name="execParameters">The execute parameters.</param>
1715
/// <param name="role">The controller role.</param>
1816
/// <param name="security">The security.</param>
19-
public ControllerMetaData(Type controllerType, ControllerExecParameters execParameters = null, ControllerRole role = null, ControllerSecurity security = null)
17+
public ControllerMetaData(Type controllerType, ControllerExecParameters? execParameters = null, ControllerRole? role = null, ControllerSecurity? security = null)
2018
{
2119
ControllerType = controllerType;
2220
ExecParameters = execParameters;

src/Simplify.Web/Simplify.Web.csproj

+20-16
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,33 @@
33
<TargetFrameworks>netcoreapp3.1;netcoreapp3.0;netstandard2.0;net462</TargetFrameworks>
44
<LangVersion>8.0</LangVersion>
55
<Nullable>enable</Nullable>
6+
<WarningsAsErrors>nullable</WarningsAsErrors>
7+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
8+
<IncludeSymbols>true</IncludeSymbols>
9+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
10+
<OutputPath>bin\Any CPU\$(Configuration)\</OutputPath>
11+
<DocumentationFile>bin\Any CPU\$(Configuration)\$(TargetFramework)\Simplify.Web.xml</DocumentationFile>
12+
13+
<Version>4.2.1</Version>
14+
<PackageReleaseNotes>
15+
Bug Fixes
16+
* IControllerMetaData incorrect fields nullability (#97)
17+
Updates
18+
* Upgrade to Microsoft.Extensions.Configuration.Json 3.1.9
19+
* Simplify.System.Sources internal upgrade to 1.2.2
20+
* Simplify.Xml.Sources internal upgrade to 1.1.2
21+
</PackageReleaseNotes>
22+
623
<Authors>Alexander Krylkov</Authors>
724
<Product>Simplify</Product>
825
<Description>Lightweight and fast .NET web-framework based on MVC and OWIN</Description>
926
<Copyright>Licensed under LGPL</Copyright>
10-
<Version>4.2</Version>
1127
<PackageProjectUrl>https://web.simplifynet.dev</PackageProjectUrl>
1228
<PackageIconUrl>https://raw.githubusercontent.com/SimplifyNet/Images/master/LogoWeb32x32.png</PackageIconUrl>
1329
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1430
<PackageTags>.NET web-framework MVC DI OWIN</PackageTags>
15-
<PackageReleaseNotes>
16-
New Features
17-
* Nested properties validation (#94)
18-
* Inherited properties validation (#95)
19-
* Nested/Inherited properties validation toggle
20-
Updates
21-
* Upgrade to Microsoft.Extensions.Configuration.Json 3.1.8
22-
</PackageReleaseNotes>
23-
<OutputPath>bin\Any CPU\$(Configuration)\</OutputPath>
24-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
25-
<IncludeSymbols>true</IncludeSymbols>
26-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
27-
<DocumentationFile>bin\Any CPU\$(Configuration)\$(TargetFramework)\Simplify.Web.xml</DocumentationFile>
2831
</PropertyGroup>
32+
2933
<ItemGroup>
3034
<EmbeddedResource Include="Diagnostics\ExceptionIDetails.html" />
3135
<EmbeddedResource Include="Diagnostics\ExceptionInfoPage.html" />
@@ -36,8 +40,8 @@
3640
<PackageReference Include="Simplify.DI" Version="4.0.7" />
3741
<PackageReference Include="Simplify.Templates" Version="2.0.0" />
3842
<PackageReference Include="Simplify.String.Sources" Version="1.2.1" PrivateAssets="All" />
39-
<PackageReference Include="Simplify.System.Sources" Version="1.2.1" PrivateAssets="All" />
40-
<PackageReference Include="Simplify.Xml.Sources" Version="1.1.1" PrivateAssets="All" />
43+
<PackageReference Include="Simplify.System.Sources" Version="1.2.2" PrivateAssets="All" />
44+
<PackageReference Include="Simplify.Xml.Sources" Version="1.1.2" PrivateAssets="All" />
4145
</ItemGroup>
4246
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'netcoreapp3.0' ">
4347
<FrameworkReference Include="Microsoft.AspNetCore.App" />

0 commit comments

Comments
 (0)