Skip to content

Commit 557f44d

Browse files
craigfowlercraigfowler
committed
Merge branch 'release/2.0.0' into production
2 parents ea99949 + 0dcb000 commit 557f44d

23 files changed

Lines changed: 195 additions & 358 deletions

‎.appveyor.yml‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
11
version: '{branch}-{build}'
2+
image: Visual Studio 2017
3+
4+
init:
5+
- cmd: git config --global core.autocrlf true
6+
7+
install:
8+
- cmd: git submodule update --init --recursive
9+
- cmd: dotnet tool install --global dotnet-sonarscanner
10+
211
before_build:
3-
- cmd: nuget restore CSF.Validation.sln
4-
build:
5-
verbosity: minimal
6-
test:
7-
assemblies:
8-
except:
9-
- '**\Ploeh.AutoFixture.NUnit3.dll'
12+
- cmd: dotnet --version
13+
- cmd: dotnet restore --verbosity m
14+
- cmd: dotnet-sonarscanner begin /k:"CSF.Validation" /v:AppVeyor_build_%APPVEYOR_BUILD_NUMBER% /o:craigfowler-github /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login=%SONARCLOUD_SECRET_KEY% /d:sonar.cs.nunit.reportsPaths=%APPVEYOR_BUILD_FOLDER%\CSF.Validation.Tests\TestResults\TestResults.xml /d:sonar.cs.opencover.reportsPaths=%APPVEYOR_BUILD_FOLDER%\CSF.Validation.Tests\TestResults\coverage.opencover.xml
15+
16+
build_script:
17+
- cmd: dotnet build
18+
19+
test_script:
20+
- cmd: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=\"json,opencover\" /p:CoverletOutput=\"TestResults/\" --test-adapter-path:. --logger:\"nunit\"
21+
22+
after_test:
23+
- cmd: dotnet-sonarscanner end /d:"sonar.login=%SONARCLOUD_SECRET_KEY%"

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ TestResult.formatted.xml
55
*.userprefs
66
*.orig
77
.directory
8-
packages/*/
8+
packages/
99
.vs/

‎.travis.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
language: csharp
22
solution: CSF.Validation.sln
33

4-
install:
5-
- nuget restore CSF.Validation.sln
6-
- nuget install NUnit.ConsoleRunner -Version 3.6.1 -OutputDirectory testrunner
4+
jobs:
5+
include:
6+
- dotnet: 2.2.207
7+
mono: latest
78

89
script:
9-
- xbuild /p:Configuration=Debug CSF.Validation.sln
10-
- mono "./testrunner/NUnit.ConsoleRunner.3.6.1/tools/nunit3-console.exe" CSF.Validation.Tests/bin/Debug/CSF.Validation.Tests.dll
10+
- dotnet build
11+
- dotnet test

‎CSF.Validation.Tests/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
7-
<bindingRedirect oldVersion="3.0.0.0-3.6.1.0" newVersion="3.6.1.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-3.6.1.0" newVersion="3.6.1.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
11-
<bindingRedirect oldVersion="4.0.0.0-4.7.8.0" newVersion="4.7.8.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-4.7.8.0" newVersion="4.7.8.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

‎CSF.Validation.Tests/AutoMoqDataAttribute.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
// THE SOFTWARE.
2626
using System;
27-
using Ploeh.AutoFixture;
28-
using Ploeh.AutoFixture.AutoMoq;
29-
using Ploeh.AutoFixture.NUnit3;
27+
using AutoFixture;
28+
using AutoFixture.AutoMoq;
29+
using AutoFixture.NUnit3;
3030
namespace CSF.Validation.Tests
3131
{
3232
public class AutoMoqDataAttribute : AutoDataAttribute
3333
{
34-
public AutoMoqDataAttribute() : base(new Fixture().Customize(new AutoMoqCustomization()))
34+
public AutoMoqDataAttribute() : base(() => new Fixture().Customize(new AutoMoqCustomization()))
3535
{
3636
}
3737
}

‎CSF.Validation.Tests/CSF.Validation.Tests.csproj‎

Lines changed: 25 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,38 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{11DCF35A-6E2A-4C62-B536-14B83FF5AE07}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<RootNamespace>CSF.Validation.Tests</RootNamespace>
11-
<AssemblyName>CSF.Validation.Tests</AssemblyName>
12-
<ReleaseVersion>1.0.2</ReleaseVersion>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<ReleaseVersion>2.0.0</ReleaseVersion>
146
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug</OutputPath>
20-
<DefineConstants>DEBUG;</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<ConsolePause>false</ConsolePause>
24-
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>none</DebugType>
28-
<Optimize>false</Optimize>
29-
<OutputPath>bin\Release</OutputPath>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
<ConsolePause>false</ConsolePause>
33-
</PropertyGroup>
34-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
35-
<ItemGroup>
36-
<Reference Include="System" />
37-
<Reference Include="nunit.framework">
38-
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
39-
<Package>nunit</Package>
40-
</Reference>
41-
<Reference Include="Castle.Core">
42-
<HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
43-
</Reference>
44-
<Reference Include="Moq">
45-
<HintPath>..\packages\Moq.4.7.8\lib\net45\Moq.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Ploeh.AutoFixture">
48-
<HintPath>..\packages\AutoFixture.3.50.2\lib\net40\Ploeh.AutoFixture.dll</HintPath>
49-
</Reference>
50-
<Reference Include="Ploeh.AutoFixture.NUnit3">
51-
<HintPath>..\packages\AutoFixture.NUnit3.3.50.2\lib\net40\Ploeh.AutoFixture.NUnit3.dll</HintPath>
52-
</Reference>
53-
<Reference Include="Ploeh.AutoFixture.AutoMoq">
54-
<HintPath>..\packages\AutoFixture.AutoMoq.3.50.2\lib\net40\Ploeh.AutoFixture.AutoMoq.dll</HintPath>
55-
</Reference>
56-
<Reference Include="CSF.Reflection">
57-
<HintPath>..\packages\CSF.Reflection.1.0.3\lib\net45\CSF.Reflection.dll</HintPath>
58-
</Reference>
59-
<Reference Include="CSF.Utils">
60-
<HintPath>..\packages\CSF.Utils.6.1.1\lib\net45\CSF.Utils.dll</HintPath>
61-
</Reference>
62-
</ItemGroup>
7+
8+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
9+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
6310
<ItemGroup>
64-
<ProjectReference Include="..\CSF.Validation\CSF.Validation.csproj">
65-
<Project>{C4446BF2-FF24-4C05-893E-0C9E195FBF82}</Project>
66-
<Name>CSF.Validation</Name>
67-
</ProjectReference>
11+
<PackageReference Include="AutoFixture" Version="4.11.0" />
12+
<PackageReference Include="AutoFixture.AutoMoq" Version="4.11.0" />
13+
<PackageReference Include="AutoFixture.NUnit3" Version="4.11.0" />
14+
<PackageReference Include="coverlet.msbuild" Version="2.8.0">
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
<PrivateAssets>all</PrivateAssets>
17+
</PackageReference>
18+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
19+
<PackageReference Include="NUnit" Version="3.12.0" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
21+
<PackageReference Include="Moq" Version="4.13.1" />
22+
<PackageReference Include="NunitXml.TestLogger" Version="2.1.41" />
6823
</ItemGroup>
6924
<ItemGroup>
70-
<Folder Include="StockRules\" />
71-
<Folder Include="ValidationRuns\" />
72-
<Folder Include="Manifest\" />
73-
<Folder Include="Integration\" />
74-
<Folder Include="Rules\" />
75-
<Folder Include="Resources\" />
76-
<Folder Include="Messages\" />
25+
<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Resources\FailureMessageTemplates.resx" />
7726
</ItemGroup>
7827
<ItemGroup>
79-
<Compile Include="StockRules\NotNullRuleTests.cs" />
80-
<Compile Include="RuleRunner.cs" />
81-
<Compile Include="StockRules\NotNullValueRuleTests.cs" />
82-
<Compile Include="StubValidatedObject.cs" />
83-
<Compile Include="OutcomeAssert.cs" />
84-
<Compile Include="StubRule.cs" />
85-
<Compile Include="ValidationRuns\RunnableRuleTests.cs" />
86-
<Compile Include="ValidationRuns\ValidationRunnerTests.cs" />
87-
<Compile Include="Manifest\DefaultManifestIdentityTests.cs" />
88-
<Compile Include="ValidationRuns\ValidationRunFactoryTests.cs" />
89-
<Compile Include="AutoMoqDataAttribute.cs" />
90-
<Compile Include="Integration\IValidatorCreator.cs" />
91-
<Compile Include="Integration\StringPropertyValidatorCreator.cs" />
92-
<Compile Include="Integration\StringPropertyIntegrationTests.cs" />
93-
<Compile Include="Integration\IntegrationTestBase.cs" />
94-
<Compile Include="Integration\StringAndDecimalPropertyValidatorCreator.cs" />
95-
<Compile Include="Integration\StringAndDecimalPropertyIntegrationTests.cs" />
96-
<Compile Include="Rules\ValueRuleTests.cs" />
97-
<Compile Include="StockRules\NullableNumericRangeValueRuleTests.cs" />
98-
<Compile Include="StockRules\NumericRangeValueRuleTests.cs" />
99-
<Compile Include="StockRules\StringLengthValueRuleTests.cs" />
100-
<Compile Include="StockRules\DateTimeRangeValueRuleTests.cs" />
101-
<Compile Include="StockRules\NullableDateTimeRangeValueRuleTests.cs" />
102-
<Compile Include="StockRules\IsDefinedEnumMemberValueRuleTests.cs" />
103-
<Compile Include="StockRules\NullableIsDefinedEnumMemberValueRuleTests.cs" />
104-
<Compile Include="StockRules\RegexMatchValueRuleTests.cs" />
105-
<Compile Include="Resources\FailureMessageTemplates.cs" />
106-
<Compile Include="Messages\MessageProviderIntegrationTests.cs" />
28+
<Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Resources\FailureMessageTemplates.cs">
29+
<DependentUpon>FailureMessageTemplates.resx</DependentUpon>
30+
</Compile>
10731
</ItemGroup>
10832
<ItemGroup>
109-
<None Include="packages.config" />
110-
<None Include="App.config" />
33+
<Folder Include="Resources\" />
11134
</ItemGroup>
11235
<ItemGroup>
113-
<EmbeddedResource Include="Resources\FailureMessageTemplates.resx">
114-
<LastGenOutput>FailureMessages.Designer.cs</LastGenOutput>
115-
</EmbeddedResource>
36+
<ProjectReference Include="..\CSF.Validation\CSF.Validation.csproj" />
11637
</ItemGroup>
11738
</Project>

‎CSF.Validation.Tests/packages.config‎

100644100755
Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,42 @@
44
<package id="AutoFixture.AutoMoq" version="3.50.2" targetFramework="net45" />
55
<package id="AutoFixture.NUnit3" version="3.50.2" targetFramework="net45" />
66
<package id="Castle.Core" version="4.0.0" targetFramework="net45" />
7-
<package id="CSF.Reflection" version="1.0.3" targetFramework="net45" />
7+
<package id="CSF.Reflection" version="2.0.0" targetFramework="net45" />
8+
<package id="CSF.Specifications" version="1.1.0" targetFramework="net45" />
89
<package id="CSF.Utils" version="6.1.1" targetFramework="net45" />
10+
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
911
<package id="Moq" version="4.7.8" targetFramework="net45" />
12+
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
1013
<package id="NUnit" version="3.6.1" targetFramework="net45" />
1114
<package id="NUnit.ConsoleRunner" version="3.6.1" targetFramework="net45" />
15+
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
16+
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
17+
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
18+
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
19+
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" />
20+
<package id="System.Globalization" version="4.3.0" targetFramework="net45" />
21+
<package id="System.IO" version="4.3.0" targetFramework="net45" />
22+
<package id="System.IO.Compression" version="4.3.0" targetFramework="net45" />
23+
<package id="System.Linq" version="4.3.0" targetFramework="net45" />
24+
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" />
25+
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net45" />
26+
<package id="System.Net.Http" version="4.3.0" targetFramework="net45" />
27+
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net45" />
28+
<package id="System.ObjectModel" version="4.3.0" targetFramework="net45" />
29+
<package id="System.Reflection" version="4.3.0" targetFramework="net45" />
30+
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net45" />
31+
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net45" />
32+
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
33+
<package id="System.Runtime" version="4.3.0" targetFramework="net45" />
34+
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
35+
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
36+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />
37+
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net45" />
38+
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
39+
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
40+
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
41+
<package id="System.Threading" version="4.3.0" targetFramework="net45" />
42+
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
43+
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" />
44+
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net45" />
1245
</packages>

‎CSF.Validation.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,6 @@ Global
163163
$25.NamingStyle = PascalCase
164164
$25.IncludeInstanceMembers = True
165165
$25.IncludeStaticEntities = True
166-
version = 1.0.2
166+
version = 2.0.0
167167
EndGlobalSection
168168
EndGlobal

0 commit comments

Comments
 (0)