Permalink
Browse files

Updated latest from master and switched to the beta vesion of the por…

…table agent
  • Loading branch information...
2 parents 9bbe582 + b04c34f commit 6ccb9dba1a4a65b3224f94cd2229dd07cdbb5c3f @rprouse rprouse committed Jun 29, 2016
Showing with 90 additions and 15 deletions.
  1. +70 −0 .travis.yml
  2. +13 −12 README.md
  3. +4 −0 appveyor.yml
  4. +1 −1 scripts/set-version.ps1
  5. +1 −1 src/dotnet-test-nunit/project.json
  6. +1 −1 test/dotnet-test-nunit.test.runner/project.json
View
@@ -0,0 +1,70 @@
+---
+sudo: false
+language: c++
+# dotnet cli require Ubuntu 14.04
+sudo: required
+dist: trusty
+
+# dotnet cli require OSX 10.10
+osx_image: xcode7.1
+
+addons:
+ apt:
+ packages:
+ - gettext
+ - libcurl4-openssl-dev
+ - libicu-dev
+ - libssl-dev
+ - libunwind8
+ - zlib1g
+
+os:
+ - osx
+ - linux
+
+env:
+ matrix:
+ - CLI_VERSION: Latest
+ Configuration: Debug
+ - CLI_VERSION: Latest
+ Configuration: Release
+
+before_install:
+ # Install OpenSSL
+ - if test "$TRAVIS_OS_NAME" == "osx"; then
+ brew update;
+ brew install openssl;
+ brew link --force openssl;
+ fi
+
+ # Download script to install dotnet cli
+ - curl -L --create-dirs https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh -o ./scripts/install.sh
+
+ - export DOTNET_INSTALL_DIR="$PWD/.dotnetcli"
+
+ # Install the latest versio of dotnet CLI
+ - bash ./scripts/install.sh --channel "beta" --version "$CLI_VERSION" --install-dir "$DOTNET_INSTALL_DIR" --no-path
+
+ # Add dotnet to PATH
+ - export PATH="$DOTNET_INSTALL_DIR:$PATH"
+
+install:
+ # Display dotnet version info
+ - which dotnet;
+ if [ $? -eq 0 ]; then
+ echo "Using dotnet:";
+ dotnet --info;
+ else
+ echo "dotnet.exe not found"
+ exit 1;
+ fi
+
+ # Restore dependencies
+ - dotnet restore
+
+ # Build projects
+ - dotnet build -c $Configuration -f netcoreapp1.0 ./test/dotnet-test-nunit.test.runner
+
+script:
+ # Run tests
+ - dotnet run -c $Configuration -f netcoreapp1.0 -p ./test/dotnet-test-nunit.test.runner
View
@@ -1,6 +1,6 @@
# NUnit 3 Test Runner for .NET Core
-[![Build status](https://ci.appveyor.com/api/projects/status/yg7dawcy1106g1li/branch/master?svg=true)](https://ci.appveyor.com/project/CharliePoole/dotnet-test-nunit/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/yg7dawcy1106g1li/branch/master?svg=true)](https://ci.appveyor.com/project/CharliePoole/dotnet-test-nunit/branch/master) [![Travis Build Status](https://travis-ci.org/nunit/dotnet-test-nunit.svg?branch=master)](https://travis-ci.org/nunit/dotnet-test-nunit)
`dotnet-test-nunit` is the unit test runner for .NET Core for running unit tests with NUnit 3.
@@ -20,30 +20,31 @@ Your `project.json` in your test project should look like the following;
"NUnitWithDotNetCoreRC2": "1.0.0-*",
"NETStandard.Library": "1.5.0-rc2-24027",
"NUnit": "3.2.1",
- "dotnet-test-nunit": "3.4.0-alpha-1"
+ "dotnet-test-nunit": "3.4.0-alpha-2"
},
"testRunner": "nunit",
"frameworks": {
- "netstandard1.5": {
+ "netcoreapp1.0": {
"imports": [
"dnxcore50",
"netcoreapp1.0",
"portable-net45+win8"
- ]
+ ],
+ "dependencies": {
+ "Microsoft.NETCore.App": {
+ "version": "1.0.0-*",
+ "type": "platform"
+ }
+ }
}
- },
-
- "runtimes": {
- "win10-x86": { },
- "win10-x64": { }
}
}
```
-The lines of interest here are the dependency on `dotnet-test-nunit`. Feel free to use the newest version that is available. Note that the `NUnitWithDotNetCoreRC2` dependency is the project under test.
+The lines of interest here are the dependency on `dotnet-test-nunit`. Note that the `NUnitWithDotNetCoreRC2` dependency is the project under test.
-I have added `"testRunner": "nunit"` to specify NUnit 3 as the test adapter. I also had to add to the imports for both the test adapter and NUnit to resolve. Lastly, I had to add the `runtimes`.
+I have added `"testRunner": "nunit"` to specify NUnit 3 as the test adapter. I also had to add to the imports for both the test adapter and NUnit to resolve.
You can now run your tests using the Visual Studio Test Explorer, or by running `dotnet test` from the command line.
@@ -62,4 +63,4 @@ dotnet test .\test\NUnitWithDotNetCoreRC2.Test\
Note that the `dotnet` command line swallows blank lines and does not work with color.
The NUnit test runner's output is in color, but you won't see it. These are known issues with
-the `dotnet` CLI and not an NUnit bug.
+the `dotnet` CLI and not an NUnit bug.
View
@@ -16,7 +16,11 @@ before_build:
build_script:
- cmd: dotnet build -c Release test\dotnet-test-nunit.test.runner\
+
+test_script:
- cmd: dotnet run -c Release -p test\dotnet-test-nunit.test.runner\
+
+after_test:
- cmd: dotnet pack -c Release src\dotnet-test-nunit\
test: off
@@ -3,7 +3,7 @@ $PreReleaseName = ''
If($env:APPVEYOR_PULL_REQUEST_NUMBER -ne $null) {
$PreReleaseName = '-PR-' + $env:APPVEYOR_PULL_REQUEST_NUMBER
-} ElseIf($env:APPVEYOR_REPO_BRANCH -ne 'master') {
+} ElseIf($env:APPVEYOR_REPO_BRANCH -ne 'master' -and -not $env:APPVEYOR_REPO_BRANCH.StartsWith('release')) {
$PreReleaseName = '-' + $env:APPVEYOR_REPO_BRANCH
} Else {
$PreReleaseName = '-CI'
@@ -24,7 +24,7 @@
"dependencies": {
"Microsoft.Extensions.Testing.Abstractions": "1.0.0-preview2-003121",
"Microsoft.Extensions.DependencyModel": "1.0.0",
- "NUnit.Portable.Agent": "3.4.0.54-PR-6"
+ "NUnit.Portable.Agent": "3.4.0-beta-1"
},
"frameworks": {
@@ -3,7 +3,7 @@
"authors": [ "Rob Prouse" ],
"title": "NUnit .NET Core Runner Test Runner",
"name": "dotnet-test-nunit.test.runner",
- "version": "3.3.0-*",
+ "version": "3.4.0-*",
"buildOptions": {
"emitEntryPoint": true,
"preserveCompilationContext": true,

0 comments on commit 6ccb9db

Please sign in to comment.