Skip to content

Commit

Permalink
run tests
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Nov 12, 2019
1 parent 40b08e4 commit 2d063df
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
8 changes: 5 additions & 3 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ let tags = "nuget, bundler, F#"
let solutionFile = "Paket.sln"

// Pattern specifying assemblies to be tested using NUnit
let testAssemblies = "tests/**/bin/Release/*Tests*.dll"
let testAssemblies = "tests/**/bin/Release/net46/*Tests*.dll"
let integrationTestAssemblies = "integrationtests/Paket.IntegrationTests/bin/Release/*Tests*.dll"

// Git configuration (used for publishing documentation in gh-pages branch)
Expand All @@ -69,6 +69,7 @@ let mutable dotnetExePath = "dotnet"
// --------------------------------------------------------------------------------------

let buildDir = "bin"
let buildDirNet46 = "bin/net46"
let buildDirNetCore = "bin_netcore"
let tempDir = "temp"
let buildMergedDir = buildDir @@ "merged"
Expand Down Expand Up @@ -140,6 +141,7 @@ Target "Clean" (fun _ ->
!! "src/**/bin"
++ "tests/**/bin"
++ buildDir
++ buildDirNet46
++ buildDirNetCore
++ tempDir
|> CleanDirs
Expand Down Expand Up @@ -340,13 +342,13 @@ Target "MergePaketTool" (fun _ ->

let toPack =
mergeLibs
|> List.map (fun l -> buildDir @@ l)
|> List.map (fun l -> buildDirNet46 @@ l)
|> separated " "

let result =
ExecProcess (fun info ->
info.FileName <- currentDirectory </> "packages" </> "build" </> "ILRepack" </> "tools" </> "ILRepack.exe"
info.Arguments <- sprintf "/lib:%s /ver:%s /out:%s %s" buildDir release.AssemblyVersion paketFile toPack
info.Arguments <- sprintf "/lib:%s /ver:%s /out:%s %s" buildDirNet46 release.AssemblyVersion paketFile toPack
) (TimeSpan.FromMinutes 5.)

if result <> 0 then failwithf "Error during ILRepack execution."
Expand Down
4 changes: 2 additions & 2 deletions docs/tools/generate.fsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// Getting help docs from Paket.exe
#r "../../bin/Argu.dll"
#r "../../bin/Paket.exe"
#r "../../bin/net46/Argu.dll"
#r "../../bin/net46/Paket.exe"
open System.IO


Expand Down
1 change: 1 addition & 0 deletions src/Paket/Paket.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>net46</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputPath>..\..\bin\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
Expand Down
1 change: 1 addition & 0 deletions tests/Paket.Tests/Paket.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<OutputType>Library</OutputType>
<TargetFramework>net46</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\paket-files\forki\FsUnit\FsUnit.fs">
Expand Down

0 comments on commit 2d063df

Please sign in to comment.