Skip to content

Commit

Permalink
Update to nunit3 and netstandard 2.0 (#51)
Browse files Browse the repository at this point in the history
* Update to nunit3 and netstandard 2.0

* updates for nuget publishing

* Add dotnet restore to build.fsx (#1)

* add dotnet restore to build script

* Add prerelease version for netstandard2.0 packaging
  • Loading branch information
mtnrbq authored and ReedCopsey committed Feb 16, 2018
1 parent c284cd9 commit 2e2e124
Show file tree
Hide file tree
Showing 20 changed files with 587 additions and 848 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -173,7 +173,7 @@ docs/output/
temp/

# Test results produced by build
TestResults.xml
TestResult.xml

# Nuget outputs
nuget/*.nupkg
Expand Down
276 changes: 276 additions & 0 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

110 changes: 55 additions & 55 deletions Gjallarhorn.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.12
VisualStudioVersion = 15.0.27130.2024
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B98-5CED-492C-A5B7-A5B4F73CF142}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Gjallarhorn", "src\Gjallarhorn\Gjallarhorn.fsproj", "{41FAB705-05F3-45AE-99EF-524E6D9736FF}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Gjallarhorn", "src\Gjallarhorn\Gjallarhorn.fsproj", "{41FAB705-05F3-45AE-99EF-524E6D9736FF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{BF60BC93-E09B-4E5F-9D85-95A519479D54}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -39,13 +39,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Gjallarhorn.Tests", "tests\Gjallarhorn.Tests\Gjallarhorn.Tests.fsproj", "{E789C72A-5CFD-436B-8EF1-61AA2852A89F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C844E206-BE5F-4335-B8F5-0472CF0A7369}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Gjallarhorn.ReferenceDocumentation", "src\Gjallarhorn.ReferenceDocumentation\Gjallarhorn.ReferenceDocumentation.fsproj", "{5ACE0621-55CC-4DCD-A159-D7AB7D3057C6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gjallarhorn.Linq.Tests", "tests\Gjallarhorn.Linq.Tests\Gjallarhorn.Linq.Tests.csproj", "{D1DC92F1-0543-45FB-9B22-935E8A653DF5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gjallarhorn.Linq.Tests", "tests\Gjallarhorn.Linq.Tests\Gjallarhorn.Linq.Tests.csproj", "{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Gjallarhorn.Tests", "tests\Gjallarhorn.Tests\Gjallarhorn.Tests.fsproj", "{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -87,30 +87,6 @@ Global
{41FAB705-05F3-45AE-99EF-524E6D9736FF}.Release|iPhone.Build.0 = Release|Any CPU
{41FAB705-05F3-45AE-99EF-524E6D9736FF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{41FAB705-05F3-45AE-99EF-524E6D9736FF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.AppStore|Any CPU.Build.0 = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.AppStore|iPhone.Build.0 = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Debug|iPhone.Build.0 = Debug|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Release|Any CPU.Build.0 = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Release|iPhone.ActiveCfg = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Release|iPhone.Build.0 = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{E789C72A-5CFD-436B-8EF1-61AA2852A89F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{5ACE0621-55CC-4DCD-A159-D7AB7D3057C6}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{5ACE0621-55CC-4DCD-A159-D7AB7D3057C6}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{5ACE0621-55CC-4DCD-A159-D7AB7D3057C6}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
Expand All @@ -135,39 +111,63 @@ Global
{5ACE0621-55CC-4DCD-A159-D7AB7D3057C6}.Release|iPhone.Build.0 = Release|Any CPU
{5ACE0621-55CC-4DCD-A159-D7AB7D3057C6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{5ACE0621-55CC-4DCD-A159-D7AB7D3057C6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.AppStore|Any CPU.Build.0 = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.AppStore|iPhone.Build.0 = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Debug|iPhone.Build.0 = Debug|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Release|Any CPU.Build.0 = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Release|iPhone.ActiveCfg = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Release|iPhone.Build.0 = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D1DC92F1-0543-45FB-9B22-935E8A653DF5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.AppStore|Any CPU.Build.0 = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.AppStore|iPhone.Build.0 = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Debug|iPhone.Build.0 = Debug|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Release|Any CPU.Build.0 = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Release|iPhone.ActiveCfg = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Release|iPhone.Build.0 = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.AppStore|Any CPU.Build.0 = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.AppStore|iPhone.Build.0 = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Debug|iPhone.Build.0 = Debug|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Release|Any CPU.Build.0 = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Release|iPhone.ActiveCfg = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Release|iPhone.Build.0 = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{83F16175-43B1-4C90-A1EE-8E351C33435D} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
{8E6D5255-776D-4B61-85F9-73C37AA1FB9A} = {A6A6AF7D-D6E3-442D-9B1E-58CC91879BE1}
{E789C72A-5CFD-436B-8EF1-61AA2852A89F} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{D1DC92F1-0543-45FB-9B22-935E8A653DF5} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{C06ADA6F-044B-47FD-B2BD-B3C20ECD2ACB} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{6C4B7CFA-6F41-45D9-B7A8-59AD7C871DD9} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4182252C-17A1-4F04-B4E2-84A045EBC91E}
Expand Down
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
@@ -1,3 +1,6 @@
#### 1.2.0-beta1 - Feb 10th 2018
* Add .NetStandard2.0 Build and Package (Pre-release)

#### 1.1.0 - Sept 13th 2017
* Added IO.Direct for direct mapping of a signal into IO channels

Expand Down
16 changes: 12 additions & 4 deletions build.fsx
Expand Up @@ -4,6 +4,7 @@

#r @"packages/build/FAKE/tools/FakeLib.dll"
open Fake
open Fake.Testing.NUnit3
open Fake.Git
open Fake.AssemblyInfoFile
open Fake.ReleaseNotesHelper
Expand Down Expand Up @@ -130,6 +131,13 @@ Target "CleanDocs" (fun _ ->
CleanDirs ["docs/output"]
)

// --------------------------------------------------------------------------------------
// Restore dotnet core packages

Target "Restore" (fun _ ->
DotNetCli.Restore id
)

// --------------------------------------------------------------------------------------
// Build library & test project

Expand All @@ -148,11 +156,10 @@ Target "Build" (fun _ ->

Target "RunTests" (fun _ ->
!! testAssemblies
|> NUnit (fun p ->
|> NUnit3 (fun p ->
{ p with
DisableShadowCopy = true
TimeOut = TimeSpan.FromMinutes 20.
OutputFile = "TestResults.xml" })
ToolPath = @".\packages\test\NUnit.ConsoleRunner\tools\nunit3-console.exe"
TimeOut = TimeSpan.FromMinutes 20. })
)

#if MONO
Expand Down Expand Up @@ -378,6 +385,7 @@ Target "All" DoNothing

"Clean"
==> "AssemblyInfo"
==> "Restore"
==> "Build"
==> "CopyBinaries"
==> "RunTests"
Expand Down
28 changes: 13 additions & 15 deletions paket.dependencies
@@ -1,24 +1,22 @@
group Build
source https://nuget.org/api/v2

source https://api.nuget.org/v3/index.json
framework:netstandard2
redirects: on

framework: net461, net45, portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1


nuget SourceLink.Fake
nuget FAKE
nuget FSharp.Formatting
nuget FSharp.Core >= 4.0.0.1

nuget FSharp.Core >= 4.3.2
github fsharp/FAKE modules/Octokit/Octokit.fsx

group Test
source https://nuget.org/api/v2

source https://api.nuget.org/v3/index.json
redirects: on

framework: net461, net45, portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1

nuget NUnit ~> 2
nuget NUnit.Runners ~> 2
nuget FSharp.Core >= 4.0.0.1
framework:net461
nuget System.Globalization
nuget Microsoft.NET.Test.Sdk >= 15.5
nuget NUnit ~> 3
nuget NUnit.Console ~> 3
nuget NUnit.ConsoleRunner ~> 3
nuget NUnit3TestAdapter ~> 3
nuget FSharp.Core >= 4.3.2

0 comments on commit 2e2e124

Please sign in to comment.