Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "To netstandard2.0" #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "To netstandard2.0" #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
325 changes: 60 additions & 265 deletions .paket/Paket.Restore.targets
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
branches:
only:
- master
version: 2.0.{build}
version: 1.2.{build}
build_script:
build.cmd version=%APPVEYOR_BUILD_VERSION%
test: off
Expand Down
27 changes: 22 additions & 5 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@ open Fake.DotNetCli

let buildDir = "./build/"
let sourceDir = "./source/"

let testProjects = "./source/*Tests/*.csproj"
let testOutputDir = "./tests/"
let haliteProjectReferences = "./source/Halite/Halite.csproj"
let examplesProjectReferences = "./source/Halite.Examples/Halite.Examples.csproj"

let analyzerProjectReferences = !! "./source/analyzer/Halite.Analyzer/Halite.Analyzer.csproj"
let testProjectReferences = !! "./source/Halite.Tests/Halite.Tests.csproj"
++ "./source/Halite.Examples.Tests/Halite.Examples.Tests.csproj"
++ "./source/analyzer/Halite.Analyzer.Test/Halite.Analyzer.Tests.csproj"
let projectName = "Halite"
let description = "Library for representing HAL objects and links."
let version = environVarOrDefault "version" "0.0.0"
Expand All @@ -23,7 +27,7 @@ let templateFilePath = "./Halite.paket.template"
let toolPathPaket = ".paket/paket.exe"

Target "Clean" (fun _ ->
CleanDirs [buildDir]
CleanDirs [buildDir; testOutputDir]
)

let buildReleaseProperties =
Expand Down Expand Up @@ -55,6 +59,16 @@ Target "BuildExamples" (fun _ ->
Project = examplesProjectReferences })
)

Target "BuildAnalyzer" (fun _ -> MSBuild buildDir "Build" buildReleaseProperties analyzerProjectReferences |> Log "Building analyzer project: ")

Target "BuildTests" (fun _ -> MSBuild testOutputDir "Build" [ "Configuration", "Debug" ] testProjectReferences |> Log "TestBuild-Output: ")

Target "RunTests" (fun _ ->
!! (testOutputDir @@ "*Tests.dll")
|> xUnit2 (fun p ->
{ p with HtmlOutputPath = Some (testOutputDir @@ "xunit.html") })
)

Target "CreateNugetPackage" (fun _ ->
let description = "Implementation of the HAL specification."
DotNetCli.Pack (fun c ->
Expand All @@ -71,7 +85,7 @@ Target "CreateNugetPackage" (fun _ ->

Target "CreatePaketTemplate" (fun _ ->
PaketTemplate (fun p ->
let targetLib = "lib/netstandard2.0"
let targetLib = "lib/netstandard1.0"
{
p with
TemplateFilePath = Some templateFilePath
Expand All @@ -84,7 +98,7 @@ Target "CreatePaketTemplate" (fun _ ->
Files = [ Include (buildDir @@ "Halite.dll", targetLib)
Include (buildDir @@ "Halite.pdb", targetLib)
Include (buildDir @@ "Halite.xml", targetLib)
]
Include (buildDir @@ "Halite.Analyzer.dll", "analyzers/dotnet/cs") ]
Dependencies =
[ "JetBrains.Annotations", GreaterOrEqual (Version "11.1.0") ]
} )
Expand Down Expand Up @@ -117,6 +131,9 @@ Target "PushPackage" (fun _ ->
==> "AddAssemblyVersion"
==> "Build"
==> "BuildExamples"
==> "BuildAnalyzer"
==> "BuildTests"
==> "RunTests"
==> "CreatePaketTemplate"
==> "CreatePackage"
==> "PushPackage"
Expand Down
26 changes: 13 additions & 13 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
source https://api.nuget.org/v3/index.json

nuget Newtonsoft.Json 12.0.2
nuget JetBrains.Annotations 11.1.0
nuget Shouldly 2.8.3
nuget xunit 2.1.0
nuget xunit.runner.console 2.1.0
nuget Newtonsoft.Json 6.0.8 restriction: >= net45
nuget JetBrains.Annotations 11.1.0 framework: netstandard1.0, net45, net461
nuget Shouldly 2.8.3 restriction: >= net45
nuget xunit 2.1.0 restriction: >= net45
nuget xunit.runner.console 2.1.0 restriction: >= net45
nuget xunit.runner.visualstudio 2.1.0 version_in_path: true
nuget FAKE

nuget Microsoft.CodeAnalysis.Analyzers
nuget Microsoft.CodeAnalysis.Common
nuget Microsoft.CodeAnalysis.CSharp
nuget Microsoft.CodeAnalysis.CSharp.Workspaces
nuget Microsoft.CodeAnalysis.Workspaces.Common
nuget Microsoft.Composition
nuget System.Collections.Immutable >= 1.2
nuget System.Reflection.Metadata >= 1.2
nuget Microsoft.CodeAnalysis.Analyzers 1.1.0 restriction: >= portable45-net45+win8
nuget Microsoft.CodeAnalysis.Common 1.0.1 restriction: >= portable45-net45+win8
nuget Microsoft.CodeAnalysis.CSharp 1.0.1 restriction: >= portable45-net45+win8
nuget Microsoft.CodeAnalysis.CSharp.Workspaces 1.0.1 restriction: >= portable45-net45+win8
nuget Microsoft.CodeAnalysis.Workspaces.Common 1.0.1 restriction: >= portable45-net45+win8
nuget Microsoft.Composition 1.0.27 restriction: >= portable45-net45+win8
nuget System.Collections.Immutable 1.1.36 restriction: >= portable45-net45+win8
nuget System.Reflection.Metadata 1.0.21 restriction: >= portable45-net45+win8
Loading