From 8d19286cd44d1f92a346b8d650baa49a1819469c Mon Sep 17 00:00:00 2001 From: techyian Date: Tue, 18 Apr 2017 20:45:24 +0100 Subject: [PATCH] Fix NetFramework build --- build.cmd | 13 ++++++------- build.fsx | 2 +- paket.dependencies | 4 ++-- paket.lock | 6 ++++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/build.cmd b/build.cmd index 1a43c584..1dacc7f5 100644 --- a/build.cmd +++ b/build.cmd @@ -19,14 +19,13 @@ if errorlevel 1 ( cd .. -packages\FAKE\tools\FAKE.exe "%PWD%" Clean -packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpReleaseApp -packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpDebugApp +packages\netframework\FAKE\tools\FAKE.exe "%PWD%" MMALSharpReleaseApp +packages\netframework\FAKE\tools\FAKE.exe "%PWD%" MMALSharpDebugApp -packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpCommonReleaseApp -packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpCommonDebugApp +packages\netframework\FAKE\tools\FAKE.exe "%PWD%" MMALSharpCommonReleaseApp +packages\netframework\FAKE\tools\FAKE.exe "%PWD%" MMALSharpCommonDebugApp -packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpFFmpegReleaseApp -packages\FAKE\tools\FAKE.exe "%PWD%" MMALSharpFFmpegDebugApp +packages\netframework\FAKE\tools\FAKE.exe "%PWD%" MMALSharpFFmpegReleaseApp +packages\netframework\FAKE\tools\FAKE.exe "%PWD%" MMALSharpFFmpegDebugApp .paket\paket.exe pack output build templatefile MMALSharp\paket.template \ No newline at end of file diff --git a/build.fsx b/build.fsx index 09debcbf..25c52ffc 100644 --- a/build.fsx +++ b/build.fsx @@ -1,5 +1,5 @@ // include Fake lib -#r "packages/FAKE/tools/FakeLib.dll" +#r "packages/netframework/FAKE/tools/FakeLib.dll" open Fake // Properties diff --git a/paket.dependencies b/paket.dependencies index f6156967..00821e2d 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -2,13 +2,13 @@ group NetFramework source https://www.nuget.org/api/v2 - nuget FAKE ~> 4.50.0 + nuget FAKE nuget Nito.AsyncEx ~> 3.0.1 group NetStandard source https://www.nuget.org/api/v2 source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json - nuget FAKE ~> 4.50.0 + nuget FAKE nuget Microsoft.CSharp ~> 4.3.0 nuget System.Diagnostics.Process ~> 4.3.0 nuget Nito.AsyncEx ~> 5.0.0-pre-02 diff --git a/paket.lock b/paket.lock index 92871807..8ea03153 100644 --- a/paket.lock +++ b/paket.lock @@ -3,7 +3,7 @@ GROUP NetFramework NUGET remote: https://www.nuget.org/api/v2 - FAKE (4.50.1) + FAKE (4.58.6) Microsoft.Bcl (1.1.10) - framework: net40, portable-net40+win80+sl40+wp71, portable-net40+win80+sl50+wp80+wpa81, sl50 Microsoft.Bcl.Build (>= 1.0.14) Microsoft.Bcl.Async (1.0.168) - framework: net40, portable-net40+win80+sl40+wp71, portable-net40+win80+sl50+wp80+wpa81, sl50 @@ -15,7 +15,7 @@ NUGET GROUP NetStandard NUGET remote: https://www.nuget.org/api/v2 - FAKE (4.50.1) + FAKE (4.58.6) Microsoft.CSharp (4.3) System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13 System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13 @@ -632,3 +632,5 @@ NUGET System.Text.Encoding (>= 4.3) - framework: dnxcore50, >= netstandard13 System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard13 System.Xml.ReaderWriter (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 + remote: https://dotnet.myget.org/F/dotnet-core + runtime.ubuntu.16.04-arm.Microsoft.NETCore.App (2.0.0-preview1-002028-00)