Skip to content

Commit fbfaa7b

Browse files
jaschultzjaschultz
authored
Merge pull request #3 from testspace-samples/topic
Topic
2 parents 1ebff65 + d712955 commit fbfaa7b

File tree

8 files changed

+41
-39
lines changed

8 files changed

+41
-39
lines changed

‎ExpectedExceptionExample/ExpectedExceptionExample.csproj‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
33
<PropertyGroup>
44
<ProjectType>Local</ProjectType>
@@ -70,8 +70,13 @@
7070
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
7171
</PropertyGroup>
7272
<ItemGroup>
73-
<Reference Include="nunit.framework">
74-
<HintPath>packages\NUnit.3.0.0\lib\net20\nunit.framework.dll</HintPath>
73+
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
74+
<HintPath>packages\NUnit.3.4.1\lib\net20\nunit.framework.dll</HintPath>
75+
<Private>True</Private>
76+
</Reference>
77+
<Reference Include="NUnit.System.Linq, Version=0.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
78+
<HintPath>packages\NUnit.3.4.1\lib\net20\NUnit.System.Linq.dll</HintPath>
79+
<Private>True</Private>
7580
</Reference>
7681
<Reference Include="System">
7782
<Name>System</Name>

‎ExpectedExceptionExample/packages.config‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="3.0.0" targetFramework="net20" />
4-
</packages>
3+
<package id="NUnit" version="3.4.1" targetFramework="net20" />
4+
<package id="NUnit.ConsoleRunner" version="3.4.1" targetFramework="net20" />
5+
</packages>

‎README.md‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,9 @@
77
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).
88

99
***
10-
Build using AppVeyor's Online CI:
10+
Example branching only: **topic**
1111

12-
[![Build status](https://ci.appveyor.com/api/projects/status/1n2pyp8otedkeebq?svg=true)](https://ci.appveyor.com/project/munderseth/csharp-nunit)
13-
14-
***
15-
Publishing **Test Content** using www.testspace.com.
16-
17-
[![Space Health](https://samples.testspace.com/projects/168/spaces/822/badge)](https://samples.testspace.com/projects/168/spaces/822 "Test Cases")
18-
[![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)")
19-
[![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)")
20-
[![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)")
12+
* Reference article: [git branching workflow](https://git-scm.com/book/en/v1/Git-Branching-Branching-Workflows)
2113

2214
***
2315

@@ -39,15 +31,14 @@ Pushing Content using **Testspace client**:
3931
<pre>
4032
curl -fsS -o testspace-windows.zip https://testspace-client.s3.amazonaws.com/testspace-windows.zip
4133
7z x -y .\testspace-windows.zip
42-
testspace @.testspace.txt %TESTSPACE_TOKEN%/testspace-samples:csharp.nunit/%APPVEYOR_REPO_BRANCH%#appveyor.build.%APPVEYOR_BUILD_NUMBER%
34+
testspace analysis.xml [Tests]TestResult.xml coverage.xml %TESTSPACE_TOKEN%/%APPVEYOR_REPO_NAME:/=:%/%APPVEYOR_REPO_BRANCH%#appveyor.build.%APPVEYOR_BUILD_NUMBER%
4335
</pre>
4436

45-
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.
37+
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.
4638

47-
To replicate this sample:
39+
To replicate this sample:
4840
- Setup account at www.testspace.com.
4941
- Create a Environment variable called `TESTSPACE_TOKEN`
5042
- `TESTSPACE_TOKEN` = `credentials@Your-Org-Name.testspace.com`
5143
- `credentials` set to `username:password` or your [access token](http://help.testspace.com/reference:client-reference#login-credentials)
5244
- 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
53-

‎appveyor.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ configuration: Debug
33

44
build_script:
55
- nuget restore money/cs-money.sln
6-
6+
77
test_script:
88
- msbuild money/cs-money.csproj /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:runCodeAnalysis=true /p:codeanalysislogfile=..\analysis.xml
9-
- .\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
9+
- .\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
1010

1111
after_test:
12-
- curl -fsS -o testspace-windows.zip https://testspace-client.s3.amazonaws.com/testspace-windows.zip
12+
- curl -fsS -o testspace-windows.zip https://testspace-client.s3.amazonaws.com/testspace-windows.zip
1313
- 7z x -y testspace-windows.zip
14-
- testspace @.testspace.txt %TESTSPACE_TOKEN%/testspace-samples:csharp.nunit/%APPVEYOR_REPO_BRANCH%#appveyor.build.%APPVEYOR_BUILD_NUMBER%
14+
- testspace analysis.xml [Tests]TestResult.xml coverage.xml %TESTSPACE_TOKEN%/%APPVEYOR_REPO_NAME:/=:%/%APPVEYOR_REPO_BRANCH%#appveyor.build.%APPVEYOR_BUILD_NUMBER%

‎money/cs-money.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,12 @@
7070
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
7171
</PropertyGroup>
7272
<ItemGroup>
73-
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
74-
<HintPath>packages\NUnit.3.2.1\lib\net20\nunit.framework.dll</HintPath>
73+
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
74+
<HintPath>packages\NUnit.3.4.1\lib\net20\nunit.framework.dll</HintPath>
75+
<Private>True</Private>
76+
</Reference>
77+
<Reference Include="NUnit.System.Linq, Version=0.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
78+
<HintPath>packages\NUnit.3.4.1\lib\net20\NUnit.System.Linq.dll</HintPath>
7579
<Private>True</Private>
7680
</Reference>
7781
<Reference Include="System">

‎money/packages.config‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="3.2.1" targetFramework="net20" />
4-
<package id="NUnit.ConsoleRunner" version="3.2.1" targetFramework="net20" />
5-
<package id="NUnit.Extension.NUnitProjectLoader" version="3.2.1" targetFramework="net20" />
6-
<package id="NUnit.Extension.NUnitV2Driver" version="3.2.1" targetFramework="net20" />
7-
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.2.1" targetFramework="net20" />
8-
<package id="NUnit.Extension.VSProjectLoader" version="3.2.1" targetFramework="net20" />
9-
<package id="NUnit.Runners" version="3.2.1" targetFramework="net20" />
3+
<package id="NUnit" version="3.4.1" targetFramework="net20" />
4+
<package id="NUnit.ConsoleRunner" version="3.4.1" targetFramework="net20" />
105
<package id="OpenCover" version="4.6.519" targetFramework="net20" />
11-
</packages>
6+
</packages>

‎syntax/cs-syntax.csproj‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
33
<PropertyGroup>
44
<ProjectType>Local</ProjectType>
@@ -70,8 +70,13 @@
7070
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
7171
</PropertyGroup>
7272
<ItemGroup>
73-
<Reference Include="nunit.framework">
74-
<HintPath>packages\NUnit.3.0.0\lib\net20\nunit.framework.dll</HintPath>
73+
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
74+
<HintPath>packages\NUnit.3.4.1\lib\net20\nunit.framework.dll</HintPath>
75+
<Private>True</Private>
76+
</Reference>
77+
<Reference Include="NUnit.System.Linq, Version=0.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
78+
<HintPath>packages\NUnit.3.4.1\lib\net20\NUnit.System.Linq.dll</HintPath>
79+
<Private>True</Private>
7580
</Reference>
7681
<Reference Include="System">
7782
<Name>System</Name>

‎syntax/packages.config‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="3.2.0" targetFramework="net20" />
3+
<package id="NUnit" version="3.4.1" targetFramework="net20" />
4+
<package id="NUnit.ConsoleRunner" version="3.4.1" targetFramework="net20" />
45
</packages>

0 commit comments

Comments
 (0)