diff --git a/Build.fsx b/Build.fsx
index 358e96cd..ba588240 100644
--- a/Build.fsx
+++ b/Build.fsx
@@ -46,32 +46,38 @@ Target.create "Build" (fun _ ->
!! "SonOfPicasso.sln"
|> MSBuild.runRelease configuration null "Build"
- |> Trace.logItems "AppBuild-Output: "
+ |> Trace.logItems "Build-Output: "
)
-(*
Target.create "Test" (fun _ ->
- List.allPairs ["BCC.Core.Tests"] ["net471" ; "netcoreapp2.1"]
- |> Seq.iter (fun (proj, framework) ->
+ [
+ ("SonOfPicasso.Core.Tests", "netcoreapp2.1");
+ ("SonOfPicasso.UI.Tests", "net472");
+ ]
+ |> Seq.iter (fun (proj, framework) ->
+ (
let projectPath = sprintf "src\\%s\\%s.csproj" proj proj
let reportFile = sprintf "%s-%s.results.trx" proj framework
let configuration: (DotNet.TestOptions -> DotNet.TestOptions)
= (fun t -> {t with
- Configuration = DotNet.BuildConfiguration.Release
- NoBuild = true
- Framework = Some framework
- Logger = Some (sprintf "trx;LogFileName=%s" reportFile)
- ResultsDirectory = Some "../../reports"})
+ Configuration = DotNet.BuildConfiguration.Release
+ NoBuild = true
+ Framework = Some framework
+ Logger = Some (sprintf "trx;LogFileName=%s" reportFile)
+ ResultsDirectory = Some "../../reports"})
DotNet.test configuration projectPath
Trace.publish ImportData.BuildArtifact (sprintf "reports/%s" reportFile)
- )
+ ))
)
Target.create "Coverage" (fun _ ->
- List.allPairs ["BCC.Core.Tests"] ["net471" ; "netcoreapp2.1"]
+ [
+ ("SonOfPicasso.Core.Tests", "netcoreapp2.1");
+ ("SonOfPicasso.UI.Tests", "net472");
+ ]
|> Seq.iter (fun (proj, framework) ->
let dllPath = sprintf "src\\%s\\bin\\Release\\%s\\%s.dll" proj framework proj
let projectPath = sprintf "src\\%s\\%s.csproj" proj proj
@@ -91,19 +97,16 @@ Target.create "Coverage" (fun _ ->
|> ignore
)
)
-*)
Target.create "Default" (fun _ ->
()
)
open Fake.Core.TargetOperators
-"Clean" ==> "Build" ==> "Default"
+"Clean" ==> "Build"
-(*
"Build" ==> "Test" ==> "Default"
"Build" ==> "Coverage" ==> "Default"
-*)
// start build
Target.runOrDefault "Default"
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 00000000..15f24f7d
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,32 @@
+codecov:
+ notify:
+ require_ci_to_pass: yes
+
+coverage:
+ precision: 2
+ round: down
+ range: "70...100"
+
+ status:
+ project: yes
+ patch: yes
+ changes: no
+
+parsers:
+ gcov:
+ branch_detection:
+ conditional: yes
+ loop: yes
+ method: no
+ macro: no
+
+comment:
+ layout: "header, diff, files"
+ behavior: once
+ require_changes: no
+
+fixes:
+ - "/C/projects/son-of-picasso/::"
+
+ignore:
+ - "*Tests/"
diff --git a/paket.dependencies b/paket.dependencies
index 83027754..b18e1d5d 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -11,6 +11,5 @@ group FakeBuild
nuget Fake.BuildServer.AppVeyor
nuget Fake.DotNet.Cli
nuget Fake.DotNet.MSBuild
- nuget Fake.DotNet.Testing.XUnit2
nuget Fake.IO.FileSystem
nuget Fake.Tools.GitVersion
\ No newline at end of file
diff --git a/src/SonOfPicasso.Core.Tests/SonOfPicasso.Core.Tests.csproj b/src/SonOfPicasso.Core.Tests/SonOfPicasso.Core.Tests.csproj
index 79397083..552ae4f5 100644
--- a/src/SonOfPicasso.Core.Tests/SonOfPicasso.Core.Tests.csproj
+++ b/src/SonOfPicasso.Core.Tests/SonOfPicasso.Core.Tests.csproj
@@ -2,10 +2,14 @@
netcoreapp2.1
-
false
+ false
+
+
+
+
diff --git a/src/SonOfPicasso.Core/SonOfPicasso.Core.csproj b/src/SonOfPicasso.Core/SonOfPicasso.Core.csproj
index 9a91d455..439e08c8 100644
--- a/src/SonOfPicasso.Core/SonOfPicasso.Core.csproj
+++ b/src/SonOfPicasso.Core/SonOfPicasso.Core.csproj
@@ -1,7 +1,8 @@
-
+
netstandard2.0
+ false
@@ -13,6 +14,10 @@
+
+
+
+
diff --git a/src/SonOfPicasso.Testing.Common/SonOfPicasso.Testing.Common.csproj b/src/SonOfPicasso.Testing.Common/SonOfPicasso.Testing.Common.csproj
index 671039d6..feb3c0a5 100644
--- a/src/SonOfPicasso.Testing.Common/SonOfPicasso.Testing.Common.csproj
+++ b/src/SonOfPicasso.Testing.Common/SonOfPicasso.Testing.Common.csproj
@@ -2,6 +2,7 @@
netstandard2.0
+ false
@@ -13,6 +14,10 @@
+
+
+
+
diff --git a/src/SonOfPicasso.UI.Tests/Properties/AssemblyInfo.cs b/src/SonOfPicasso.UI.Tests/Properties/AssemblyInfo.cs
index ed4c7ad6..cbcf9be0 100644
--- a/src/SonOfPicasso.UI.Tests/Properties/AssemblyInfo.cs
+++ b/src/SonOfPicasso.UI.Tests/Properties/AssemblyInfo.cs
@@ -16,5 +16,5 @@
[assembly: Guid("95cceaee-8a44-40d2-975a-defdaed35523")]
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+// [assembly: AssemblyVersion("1.0.0.0")]
+// [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/SonOfPicasso.UI.Tests/SonOfPicasso.UI.Tests.csproj b/src/SonOfPicasso.UI.Tests/SonOfPicasso.UI.Tests.csproj
index 5c14a5ee..cfc80175 100644
--- a/src/SonOfPicasso.UI.Tests/SonOfPicasso.UI.Tests.csproj
+++ b/src/SonOfPicasso.UI.Tests/SonOfPicasso.UI.Tests.csproj
@@ -26,7 +26,7 @@
true
full
false
- bin\Debug\
+ bin\Debug\net472\
DEBUG;TRACE
prompt
4
@@ -34,11 +34,14 @@
pdbonly
true
- bin\Release\
+ bin\Release\net472\
TRACE
prompt
4
+
+
+
..\..\packages\Bogus.25.0.3\lib\net40\Bogus.dll
diff --git a/src/SonOfPicasso.UI/Properties/AssemblyInfo.cs b/src/SonOfPicasso.UI/Properties/AssemblyInfo.cs
index 9f1b3dd5..92b1b266 100644
--- a/src/SonOfPicasso.UI/Properties/AssemblyInfo.cs
+++ b/src/SonOfPicasso.UI/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+// [assembly: AssemblyVersion("1.0.0.0")]
+// [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/SonOfPicasso.UI/SonOfPicasso.UI.csproj b/src/SonOfPicasso.UI/SonOfPicasso.UI.csproj
index 6a118c20..ad08ec12 100644
--- a/src/SonOfPicasso.UI/SonOfPicasso.UI.csproj
+++ b/src/SonOfPicasso.UI/SonOfPicasso.UI.csproj
@@ -36,6 +36,9 @@
prompt
4
+
+
+
..\..\packages\akavache.6.2.3\lib\net461\Akavache.dll