Skip to content

Commit e864940

Browse files
committed
Related to #41 - Tidy up some project leftovers
1 parent 89c6940 commit e864940

5 files changed

Lines changed: 33 additions & 18 deletions

File tree

.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/CSF.Validation.Tests.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp2.2</TargetFramework>
5-
<ReleaseVersion>2.0.2</ReleaseVersion>
5+
<ReleaseVersion>1.0.2</ReleaseVersion>
66
</PropertyGroup>
77

88
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
@@ -22,7 +22,9 @@
2222
<PackageReference Include="NunitXml.TestLogger" Version="2.1.41" />
2323
</ItemGroup>
2424
<ItemGroup>
25-
<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Resources\FailureMessageTemplates.resx" />
25+
<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Resources\FailureMessageTemplates.resx">
26+
<LogicalName>FailureMessageTemplates.resx</LogicalName>
27+
</EmbeddedResource>
2628
</ItemGroup>
2729
<ItemGroup>
2830
<Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="Resources\FailureMessageTemplates.cs">

CSF.Validation/CSF.Validation.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;netstandard1.0</TargetFrameworks>
5-
</PropertyGroup>
6-
<PropertyGroup>
5+
<ReleaseVersion>1.0.2</ReleaseVersion>
76
<PackageId>CSF.Validation</PackageId>
87
<Authors>craigfowler</Authors>
98
<Title>CSF.Validation</Title>
109
<Description>A framework for business rule validation</Description>
11-
<ReleaseVersion>2.0.2</ReleaseVersion>
1210
<Version>$(ReleaseVersion)</Version>
1311
<PackageVersion>$(ReleaseVersion)</PackageVersion>
1412
<PackageLicenseExpression>MIT</PackageLicenseExpression>

0 commit comments

Comments
 (0)