From a88785c4b678f7f97e8bf0b56297aae6a38fc207 Mon Sep 17 00:00:00 2001 From: Mark Underseth Date: Thu, 29 Dec 2016 09:44:47 -0800 Subject: [PATCH 1/6] example branch --- README.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5501ef2..8b70ec0 100644 --- a/README.md +++ b/README.md @@ -7,17 +7,9 @@ This sample demonstrates techniques for using Testspace with C# code and the [NUnit](http://nunit.org/) test framework, along with the [OpenCover](https://github.com/OpenCover/opencover) coverage tool and [Visual Studio's](https://msdn.microsoft.com/en-us/library/dd264939.aspx) static analysis tool using [NUnit's C# examples](https://github.com/nunit/nunit-csharp-samples). *** -Build using AppVeyor's Online CI: +Example branching only: **development** -[![Build status](https://ci.appveyor.com/api/projects/status/1n2pyp8otedkeebq?svg=true)](https://ci.appveyor.com/project/munderseth/csharp-nunit) - -*** -Publishing **Test Content** using www.testspace.com. - -[![Space Health](https://samples.testspace.com/projects/168/spaces/822/badge)](https://samples.testspace.com/projects/168/spaces/822 "Test Cases") -[![Space Metric](https://samples.testspace.com/projects/168/spaces/822/metrics/805/badge)](https://samples.testspace.com/spaces/822/schema/Code%20Coverage "Code Coverage (branches)") -[![Space Metric](https://samples.testspace.com/projects/168/spaces/822/metrics/806/badge)](https://samples.testspace.com/spaces/822/schema/Code%20Coverage "Code Coverage (methods)") -[![Space Metric](https://samples.testspace.com/projects/168/spaces/822/metrics/808/badge)](https://samples.testspace.com/spaces/822/schema/Static%20Analysis "Static Analysis (issues)") +* Reference article: [git branching workflow](https://git-scm.com/book/en/v1/Git-Branching-Branching-Workflows) *** From e8ab49f588c9445d7fe78d666c4a7ea94e466cc5 Mon Sep 17 00:00:00 2001 From: Mark Underseth Date: Thu, 29 Dec 2016 09:48:47 -0800 Subject: [PATCH 2/6] topic branch example --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b70ec0..06cb8cd 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This sample demonstrates techniques for using Testspace with C# code and the [NUnit](http://nunit.org/) test framework, along with the [OpenCover](https://github.com/OpenCover/opencover) coverage tool and [Visual Studio's](https://msdn.microsoft.com/en-us/library/dd264939.aspx) static analysis tool using [NUnit's C# examples](https://github.com/nunit/nunit-csharp-samples). *** -Example branching only: **development** +Example branching only: **topic** * Reference article: [git branching workflow](https://git-scm.com/book/en/v1/Git-Branching-Branching-Workflows) From 2c61e53f7abd035bd7cd1834b71ff47b89651e54 Mon Sep 17 00:00:00 2001 From: Jeffrey Schultz Date: Tue, 3 Jan 2017 12:25:43 -0800 Subject: [PATCH 3/6] Update NUnit versions --- .../ExpectedExceptionExample.csproj | 11 ++++++++--- ExpectedExceptionExample/packages.config | 4 ++-- money/cs-money.csproj | 8 ++++++-- money/packages.config | 8 +------- syntax/cs-syntax.csproj | 11 ++++++++--- syntax/packages.config | 6 +++--- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/ExpectedExceptionExample/ExpectedExceptionExample.csproj b/ExpectedExceptionExample/ExpectedExceptionExample.csproj index 516fb37..37d12e5 100644 --- a/ExpectedExceptionExample/ExpectedExceptionExample.csproj +++ b/ExpectedExceptionExample/ExpectedExceptionExample.csproj @@ -1,4 +1,4 @@ - + Local @@ -70,8 +70,13 @@ AllRules.ruleset - - packages\NUnit.3.0.0\lib\net20\nunit.framework.dll + + packages\NUnit.3.4.1\lib\net20\nunit.framework.dll + True + + + packages\NUnit.3.4.1\lib\net20\NUnit.System.Linq.dll + True System diff --git a/ExpectedExceptionExample/packages.config b/ExpectedExceptionExample/packages.config index ac308b1..21ab7f7 100644 --- a/ExpectedExceptionExample/packages.config +++ b/ExpectedExceptionExample/packages.config @@ -1,4 +1,4 @@ - + - + \ No newline at end of file diff --git a/money/cs-money.csproj b/money/cs-money.csproj index c39710b..b09af63 100644 --- a/money/cs-money.csproj +++ b/money/cs-money.csproj @@ -70,8 +70,12 @@ AllRules.ruleset - - packages\NUnit.3.2.1\lib\net20\nunit.framework.dll + + packages\NUnit.3.4.1\lib\net20\nunit.framework.dll + True + + + packages\NUnit.3.4.1\lib\net20\NUnit.System.Linq.dll True diff --git a/money/packages.config b/money/packages.config index b36fe35..30d9438 100644 --- a/money/packages.config +++ b/money/packages.config @@ -1,11 +1,5 @@ - - - - - - - + \ No newline at end of file diff --git a/syntax/cs-syntax.csproj b/syntax/cs-syntax.csproj index e415acb..648f12b 100644 --- a/syntax/cs-syntax.csproj +++ b/syntax/cs-syntax.csproj @@ -1,4 +1,4 @@ - + Local @@ -70,8 +70,13 @@ AllRules.ruleset - - packages\NUnit.3.0.0\lib\net20\nunit.framework.dll + + packages\NUnit.3.4.1\lib\net20\nunit.framework.dll + True + + + packages\NUnit.3.4.1\lib\net20\NUnit.System.Linq.dll + True System diff --git a/syntax/packages.config b/syntax/packages.config index ee52ea5..21ab7f7 100644 --- a/syntax/packages.config +++ b/syntax/packages.config @@ -1,4 +1,4 @@ - + - - + + \ No newline at end of file From f0dca1d60ee7e0c9f8e19bf0a232d188cf6868d8 Mon Sep 17 00:00:00 2001 From: Jeffrey Schultz Date: Tue, 3 Jan 2017 12:33:21 -0800 Subject: [PATCH 4/6] Fix token and Nunit version --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 847493d..53b6ee4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,12 +3,12 @@ configuration: Debug build_script: - nuget restore money/cs-money.sln - + test_script: - msbuild money/cs-money.csproj /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:runCodeAnalysis=true /p:codeanalysislogfile=..\analysis.xml - - .\money\packages\OpenCover.4.6.519\tools\OpenCover.Console -target:".\money\packages\NUnit.ConsoleRunner.3.2.1\tools\nunit3-console.exe" -targetargs:"money\bin\Debug\cs-money.dll" -output:"coverage.xml" -filter:"+[*]* -[*]*MoneyTest*" -register:user + - .\money\packages\OpenCover.4.6.519\tools\OpenCover.Console -target:".\money\packages\NUnit.ConsoleRunner.3.4.1\tools\nunit3-console.exe" -targetargs:"money\bin\Debug\cs-money.dll" -output:"coverage.xml" -filter:"+[*]* -[*]*MoneyTest*" -register:user after_test: - - curl -fsS -o testspace-windows.zip https://testspace-client.s3.amazonaws.com/testspace-windows.zip + - curl -fsS -o testspace-windows.zip https://testspace-client.s3.amazonaws.com/testspace-windows.zip - 7z x -y testspace-windows.zip - - testspace @.testspace.txt %TESTSPACE_TOKEN%/testspace-samples:csharp.nunit/%APPVEYOR_REPO_BRANCH%#appveyor.build.%APPVEYOR_BUILD_NUMBER% \ No newline at end of file + - testspace analysis.xml [Tests]TestResult.xml coverage.xml %TESTSPACE_TOKEN%/%APPVEYOR_REPO_NAME:/=:%/%APPVEYOR_REPO_BRANCH%#appveyor.build.%APPVEYOR_BUILD_NUMBER% From 0e50f14d54c2f3659ef2351297f8887aa77c7fe5 Mon Sep 17 00:00:00 2001 From: Jeffrey Schultz Date: Tue, 3 Jan 2017 12:39:10 -0800 Subject: [PATCH 5/6] Revert removal of Console Runner --- ExpectedExceptionExample/packages.config | 3 ++- money/packages.config | 3 ++- syntax/packages.config | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ExpectedExceptionExample/packages.config b/ExpectedExceptionExample/packages.config index 21ab7f7..4d19bfb 100644 --- a/ExpectedExceptionExample/packages.config +++ b/ExpectedExceptionExample/packages.config @@ -1,4 +1,5 @@ - \ No newline at end of file + + diff --git a/money/packages.config b/money/packages.config index 30d9438..75e8e3d 100644 --- a/money/packages.config +++ b/money/packages.config @@ -1,5 +1,6 @@ + - \ No newline at end of file + diff --git a/syntax/packages.config b/syntax/packages.config index 21ab7f7..4d19bfb 100644 --- a/syntax/packages.config +++ b/syntax/packages.config @@ -1,4 +1,5 @@ - \ No newline at end of file + + From d712955175f29604f52811777e786016b96878fb Mon Sep 17 00:00:00 2001 From: Jeffrey Schultz Date: Tue, 3 Jan 2017 12:49:22 -0800 Subject: [PATCH 6/6] Update Testspace push command --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 06cb8cd..eeab481 100644 --- a/README.md +++ b/README.md @@ -31,15 +31,14 @@ Pushing Content using **Testspace client**: 
 curl -fsS -o testspace-windows.zip https://testspace-client.s3.amazonaws.com/testspace-windows.zip
 7z x -y .\testspace-windows.zip
-testspace @.testspace.txt %TESTSPACE_TOKEN%/testspace-samples:csharp.nunit/%APPVEYOR_REPO_BRANCH%#appveyor.build.%APPVEYOR_BUILD_NUMBER%
+testspace analysis.xml [Tests]TestResult.xml coverage.xml %TESTSPACE_TOKEN%/%APPVEYOR_REPO_NAME:/=:%/%APPVEYOR_REPO_BRANCH%#appveyor.build.%APPVEYOR_BUILD_NUMBER%
-Checkout the published [Testspace Content](https://samples.testspace.com/projects/csharp.nunit). Note that the `.testspace.txt` file contains the [set of files](http://help.testspace.com/how-to:publish-content#publishing-via-content-list-file) to publish. +Checkout the published [Testspace Content](https://samples.testspace.com/projects/csharp.nunit). Note that the `.testspace.txt` file contains the [set of files](http://help.testspace.com/how-to:publish-content#publishing-via-content-list-file) to publish. -To replicate this sample: +To replicate this sample: - Setup account at www.testspace.com. - Create a Environment variable called `TESTSPACE_TOKEN` - `TESTSPACE_TOKEN` = `credentials@Your-Org-Name.testspace.com` - `credentials` set to `username:password` or your [access token](http://help.testspace.com/reference:client-reference#login-credentials) - To [use Testspace with a CI system](http://help.testspace.com/how-to:add-to-ci-workflow), store `TESTSPACE_TOKEN` as a secure environment variable - \ No newline at end of file