From 2d063dfbe4154f097be65d1a73b057963f868435 Mon Sep 17 00:00:00 2001
From: Steffen Forkmann <steffen.forkmann@msu-solutions.de>
Date: Tue, 12 Nov 2019 13:40:56 +0100
Subject: [PATCH] run tests

---
 build.fsx                            | 8 +++++---
 docs/tools/generate.fsx              | 4 ++--
 src/Paket/Paket.fsproj               | 1 +
 tests/Paket.Tests/Paket.Tests.fsproj | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.fsx b/build.fsx
index dbef3f8253..b2a1c991f5 100644
--- a/build.fsx
+++ b/build.fsx
@@ -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)
@@ -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"
@@ -140,6 +141,7 @@ Target "Clean" (fun _ ->
     !! "src/**/bin"
     ++ "tests/**/bin"
     ++ buildDir
+    ++ buildDirNet46
     ++ buildDirNetCore
     ++ tempDir
     |> CleanDirs
@@ -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."
diff --git a/docs/tools/generate.fsx b/docs/tools/generate.fsx
index 3ca9b8243f..3032e77648 100644
--- a/docs/tools/generate.fsx
+++ b/docs/tools/generate.fsx
@@ -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
 
 
diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
index f790292f07..c6fbdb6039 100644
--- a/src/Paket/Paket.fsproj
+++ b/src/Paket/Paket.fsproj
@@ -3,6 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net46</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <OutputPath>..\..\bin\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj
index 5d250b4d97..b33c91acaf 100644
--- a/tests/Paket.Tests/Paket.Tests.fsproj
+++ b/tests/Paket.Tests/Paket.Tests.fsproj
@@ -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">