Skip to content

Commit

Permalink
Merge pull request #294 from ivanz/feature/dotnet-cli-build
Browse files Browse the repository at this point in the history
dotnet cli build pipeline and AppVeyor CI pipeline #296
  • Loading branch information
ivanz authored Jul 26, 2016
2 parents 82a48cf + d513b32 commit 989166a
Show file tree
Hide file tree
Showing 23 changed files with 521 additions and 122 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
root = true

[*.cs]
indent_style = space
indent_size = 4

[project.json]
indent_style = space
indent_size = 4

16 changes: 12 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,15 @@ NDependOut
/packages
install.ps1
Misc/machine.specifications.nuspec

Source/packages/*
logs/*
.bundle/*
/TestResult.xml
/packages-dotnet

Source/packages/*
Source/**/bin/
Source/**/obj/
logs/*
.bundle/*

.vs/
project.lock.json

4 changes: 2 additions & 2 deletions Machine.Specifications.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{85BC2C4A-493A-476C-971E-BE9CE51ECF5D}"
EndProject
Expand Down
2 changes: 0 additions & 2 deletions Source/.gitignore

This file was deleted.

22 changes: 22 additions & 0 deletions Source/Examples/Example.Failing/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": "1-*",
"buildOptions": {
"nowarn": [
"169"
],
"define": [
"DEBUG",
"TRACE"
]
},
"frameworks": {
"net40": {}
},
"dependencies": {
"FluentAssertions": "4.*",
"Machine.Specifications": {
"version": "",
"target": "project"
}
}
}
22 changes: 22 additions & 0 deletions Source/Examples/Example.Random/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": "1-*",
"buildOptions": {
"nowarn": [
"169"
],
"define": [
"DEBUG",
"TRACE"
]
},
"frameworks": {
"net40": {}
},
"dependencies": {
"FluentAssertions": "4.*",
"Machine.Specifications": {
"version": "",
"target": "project"
}
}
}
22 changes: 22 additions & 0 deletions Source/Examples/Example/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": "1-*",
"buildOptions": {
"nowarn": [
"169"
],
"define": [
"DEBUG",
"TRACE"
]
},
"frameworks": {
"net40": {}
},
"dependencies": {
"FluentAssertions": "4.*",
"Machine.Specifications": {
"version": "",
"target": "project"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,6 @@ public static Task MultipleFails()
}
}

[Subject(typeof(TaskSpecificationExtensions))]
public class when_an_async_operation_runs_without_await : AsyncSpecs
{
static Task<string> Result;

Because of = () => { Result = Delayed.Echo("result"); };

It should_not_wait_for_completion =
() => Result.IsCompleted.Should().BeFalse();
}

[Subject(typeof(TaskSpecificationExtensions))]
public class when_an_async_operation_runs_with_await : AsyncSpecs
{
Expand Down
31 changes: 31 additions & 0 deletions Source/Machine.Specifications.Clr4.Specs/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": "1-*",
"buildOptions": {
"emitEntryPoint": false,
"define": [
"DEBUG",
"TRACE"
]
},
"frameworks": {
"net461": {
"dependencies": {
"Machine.Specifications.Runner.Console": {
"version": "0.*",
"type": "build"
}
}
}
},
"dependencies": {
"Machine.Specifications": {
"version": "",
"target": "project"
},
"Machine.Specifications.Clr4": {
"version": "",
"target": "project"
},
"FluentAssertions": "4.*"
}
}
6 changes: 6 additions & 0 deletions Source/Machine.Specifications.Clr4/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1-*",
"frameworks": {
"net40": {}
}
}
41 changes: 41 additions & 0 deletions Source/Machine.Specifications.Specs/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": "1-*",
"buildOptions": {
"nowarn": [
"169"
],
"define": [
"DEBUG",
"TRACE"
]
},
"frameworks": {
"net461": {
"dependencies": {
"Machine.Specifications.Runner.Console": {
"version": "0.*",
"type": "build"
}
}
}
},
"dependencies": {
"Machine.Specifications": {
"version": "",
"target": "project"
},
"Example": {
"version": "",
"target": "project"
},
"Example.Random": {
"version": "",
"target": "project"
},
"Example.Failing": {
"version": "",
"target": "project"
},
"FluentAssertions": "4.*"
}
}
26 changes: 0 additions & 26 deletions Source/Machine.Specifications.Tests/Model/RequirementTests.cs

This file was deleted.

Loading

0 comments on commit 989166a

Please sign in to comment.