Skip to content

Commit 3af5015

Browse files
bchavezbchavez
committed
Reverting paket.dependencies to root source folder. Paket no longer interferes with csproj: fsprojects/Paket#2224 
1 parent 2a6a473 commit 3af5015

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎Source/Bogus.Tests/Bogus.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</Reference>
4242
<Reference Include="Newtonsoft.Json">
4343
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\paket\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
44+
<HintPath>..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
4545
</Reference>
4646
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
4747
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>

‎Source/Builder/Utils.fsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module Utils
22

33
// include Fake lib
4-
#load @"../paket/.paket/load/build/build.group.fsx"
4+
#load @"../.paket/load/build/build.group.fsx"
55

6-
#I @"../paket/packages/build/FAKE/tools"
6+
#I @"../packages/build/FAKE/tools"
77
#r @"FakeLib.dll"
88

99
open Fake
@@ -59,15 +59,13 @@ module Setup =
5959
let test = workingFolder @@ "__test"
6060
let source = workingFolder @@ "Source"
6161
let lib = source @@ "packages"
62-
let paketLib = source @@ "paket" @@ "packages"
6362
let builder = workingFolder @@ "Builder"
6463

6564
member this.WorkingFolder = workingFolder
6665
member this.CompileOutput = compileOutput
6766
member this.Package = package
6867
member this.Source = source
6968
member this.Lib = lib
70-
member this.PaketLib = paketLib
7169
member this.Builder = builder
7270
member this.Test = test
7371

‎Source/Builder/build.fsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
//#endif
66

77
// include Fake lib
8-
#I @"../paket/packages/build/FAKE/tools"
9-
#I @"../paket/packages/build/DotNetZip/lib/net20"
8+
#I @"../packages/build/FAKE/tools"
9+
#I @"../packages/build/DotNetZip/lib/net20"
1010
#r @"FakeLib.dll"
1111
#r @"DotNetZip.dll"
1212

@@ -67,7 +67,7 @@ Target "dnx" (fun _ ->
6767

6868
Target "restore" (fun _ ->
6969
trace "MS NuGet Project Restore"
70-
let lookIn = Folders.PaketLib @@ "build"
70+
let lookIn = Folders.Lib @@ "build"
7171
let toolPath = findToolInSubPath "NuGet.exe" lookIn
7272

7373
tracefn "NuGet Tool Path: %s" toolPath
@@ -209,7 +209,7 @@ Target "Clean" (fun _ ->
209209

210210
let RunTests() =
211211
CreateDir Folders.Test
212-
let nunit = findToolInSubPath "nunit3-console.exe" Folders.PaketLib
212+
let nunit = findToolInSubPath "nunit3-console.exe" Folders.Lib
213213
let nunitFolder = System.IO.Path.GetDirectoryName(nunit)
214214

215215
!! TestProject.TestAssembly

Source/paket/paket.dependencies renamed to Source/paket.dependencies

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
version 4.3.0
2+
13
source https://www.nuget.org/api/v2
24

3-
nuget Newtonsoft.Json == 10.0.1
5+
nuget Newtonsoft.Json == 10.0.2
46

57
group build
68
generate_load_scripts: true

‎build.cmd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
@echo off
22
cls
33

4-
pushd Source\paket\
5-
..\.paket\paket.exe install
4+
pushd Source\
5+
.paket\paket.exe install
66
if errorlevel 1 (
77
popd
88
exit /b %errorlevel%
99
)
1010
popd
1111

12-
"Source\paket\packages\build\FAKE\tools\Fake.exe" .\Source\Builder\build.fsx %1
12+
"Source\packages\build\FAKE\tools\Fake.exe" .\Source\Builder\build.fsx %1

0 commit comments

Comments
 (0)