diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index dc26595e..42454b7e 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -20,4 +20,5 @@ * 1.1.4-alpha - Fix load script in the NuGet package * 1.1.5-alpha - Downgrade R.NET version and update load script * 1.1.6 - Mono support & use and support Paket + minor improvements -* 1.1.8 - Simplify load script (RProvider.fsx), improve logging \ No newline at end of file +* 1.1.8 - Simplify load script (RProvider.fsx), improve logging +* 1.1.9 - Update to R.NET 1.6.3 \ No newline at end of file diff --git a/build.cmd b/build.cmd index 8ca7acd7..1e3fb505 100644 --- a/build.cmd +++ b/build.cmd @@ -1,3 +1,37 @@ @echo off -.nuget\nuget.exe install FAKE -OutputDirectory packages -ExcludeVersion -packages\FAKE\tools\FAKE.exe build.fsx %* \ No newline at end of file + +if not exist .paket\paket.bootstrapper.exe goto pktbootnotfound +.paket\paket.bootstrapper.exe +if not errorlevel 0 goto pktbootfailed + +.paket\paket.exe restore +if not errorlevel 0 goto pktrestorefailed + +packages\FAKE\tools\FAKE.exe %* --fsiargs -d:MONO build.fsx +if not errorlevel 0 goto fakefailed + +set exit_code=0 +goto leave + +:pktbootnotfound +echo command not found: .paket\paket.bootstrapper.exe +set exit_code=1 +goto leave + +:pktbootfailed +echo command failed: .paket\paket.bootstrapper.exe +set exit_code=1 +goto leave + +:pktrestorefailed +echo command failed: .paket\paket.exe restore +set exit_code=1 +goto leave + +:fakefailed +echo command failed: packages\FAKE\tools\FAKE.exe %* --fsiargs -d:MONO build.fsx +set exit_code=1 +goto leave + +:leave +exit /b %exit_code% \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 92693d43..c41440f0 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -3,9 +3,10 @@ source https://www.nuget.org/api/v2 nuget FsCheck.Xunit nuget FSharp.Data nuget FSharp.Formatting -nuget R.NET.Community 1.5.16 -nuget R.NET.Community.FSharp 0.1.9 -nuget xunit.runners +nuget R.NET.Community 1.6.3 +nuget R.NET.Community.FSharp 1.6.3 +nuget xunit.runners 1.9.2 +nuget xunit 1.9.2 nuget FAKE nuget NuGet.CommandLine nuget ILRepack diff --git a/paket.lock b/paket.lock index f954e7aa..f8e0c9bb 100644 --- a/paket.lock +++ b/paket.lock @@ -1,28 +1,33 @@ NUGET remote: https://www.nuget.org/api/v2 specs: - FAKE (3.13.4) + DynamicInterop (0.7.4) + FAKE (3.34.7) FsCheck (1.0.4) FsCheck.Xunit (1.0.4) FsCheck (>= 1.0.4) xunit (>= 1.9.2) - FSharp.Compiler.Service (0.0.81) + FSharp.Compiler.Service (0.0.89) FSharp.Core (3.0.2) - FSharp.Data (2.1.1) - Zlib.Portable (>= 1.10.0) - FSharp.Formatting (2.6.0) - FSharp.Compiler.Service (>= 0.0.81) - ILRepack (1.25.0) - NuGet.CommandLine (2.8.3) - R.NET.Community (1.5.16) - R.NET.Community.FSharp (0.1.9) - R.NET.Community (>= 1.5.16) + FSharp.Data (2.2.2) + Zlib.Portable (>= 1.10.0) - framework: portable-net40+sl50+wp80+win80 + FSharp.Formatting (2.9.6) + FSharp.Compiler.Service (>= 0.0.87) + FSharpVSPowerTools.Core (1.8.0) + FSharpVSPowerTools.Core (1.8.0) + FSharp.Compiler.Service (>= 0.0.87) + ILRepack (2.0.0) + NuGet.CommandLine (2.8.5) + R.NET.Community (1.6.3) + DynamicInterop (0.7.4) + R.NET.Community.FSharp (1.6.3) + R.NET.Community (>= 1.6.3) xunit (1.9.2) xunit.runners (1.9.2) - Zlib.Portable (1.10.0) + Zlib.Portable (1.10.0) - framework: portable-net40+sl50+wp80+win80 GITHUB remote: fsprojects/FSharp.TypeProviders.StarterPack specs: - src/DebugProvidedTypes.fs (66277f5f3b881706a2b7af30e0aedee3feee9bc0) - src/ProvidedTypes.fs (66277f5f3b881706a2b7af30e0aedee3feee9bc0) - src/ProvidedTypes.fsi (66277f5f3b881706a2b7af30e0aedee3feee9bc0) \ No newline at end of file + src/DebugProvidedTypes.fs (70080986a4226e8218af09386cceb42e7a0ff00e) + src/ProvidedTypes.fs (70080986a4226e8218af09386cceb42e7a0ff00e) + src/ProvidedTypes.fsi (70080986a4226e8218af09386cceb42e7a0ff00e) \ No newline at end of file diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs index 837e920e..7f7ef67d 100644 --- a/src/Common/AssemblyInfo.fs +++ b/src/Common/AssemblyInfo.fs @@ -5,7 +5,7 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () diff --git a/src/RProvider.DesignTime/RProvider.DesignTime.fsproj b/src/RProvider.DesignTime/RProvider.DesignTime.fsproj index 8517ad97..c8cc0b4d 100644 --- a/src/RProvider.DesignTime/RProvider.DesignTime.fsproj +++ b/src/RProvider.DesignTime/RProvider.DesignTime.fsproj @@ -93,7 +93,18 @@ --> - + + + + ..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll + True + True + + + + + + ..\..\packages\R.NET.Community\lib\net40\RDotNet.NativeLibrary.dll @@ -109,7 +120,7 @@ - + ..\..\packages\R.NET.Community.FSharp\lib\net40\RDotNet.FSharp.dll diff --git a/src/RProvider/RProvider.Runtime.fsproj b/src/RProvider/RProvider.Runtime.fsproj index 68fa6ee7..fc94833b 100644 --- a/src/RProvider/RProvider.Runtime.fsproj +++ b/src/RProvider/RProvider.Runtime.fsproj @@ -82,7 +82,18 @@ --> - + + + + ..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll + True + True + + + + + + ..\..\packages\R.NET.Community\lib\net40\RDotNet.NativeLibrary.dll @@ -98,7 +109,7 @@ - + ..\..\packages\R.NET.Community.FSharp\lib\net40\RDotNet.FSharp.dll diff --git a/src/RProvider/RProvider.Server.fsproj b/src/RProvider/RProvider.Server.fsproj index d4220f2b..fde5e1ee 100644 --- a/src/RProvider/RProvider.Server.fsproj +++ b/src/RProvider/RProvider.Server.fsproj @@ -88,7 +88,18 @@ - + + + + ..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll + True + True + + + + + + ..\..\packages\R.NET.Community\lib\net40\RDotNet.NativeLibrary.dll @@ -104,7 +115,7 @@ - + ..\..\packages\R.NET.Community.FSharp\lib\net40\RDotNet.FSharp.dll diff --git a/src/RProvider/RProvider.fsproj b/src/RProvider/RProvider.fsproj index ff1f7adb..6897fb85 100644 --- a/src/RProvider/RProvider.fsproj +++ b/src/RProvider/RProvider.fsproj @@ -82,7 +82,18 @@ --> - + + + + ..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll + True + True + + + + + + ..\..\packages\R.NET.Community\lib\net40\RDotNet.NativeLibrary.dll @@ -98,7 +109,7 @@ - + ..\..\packages\R.NET.Community.FSharp\lib\net40\RDotNet.FSharp.dll diff --git a/src/RWrapperGenerator/RWrapperGenerator.fsproj b/src/RWrapperGenerator/RWrapperGenerator.fsproj index c24e90e0..adfe426d 100644 --- a/src/RWrapperGenerator/RWrapperGenerator.fsproj +++ b/src/RWrapperGenerator/RWrapperGenerator.fsproj @@ -116,7 +116,18 @@ --> - + + + + ..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll + True + True + + + + + + ..\..\packages\R.NET.Community\lib\net40\RDotNet.NativeLibrary.dll @@ -132,7 +143,7 @@ - + ..\..\packages\R.NET.Community.FSharp\lib\net40\RDotNet.FSharp.dll diff --git a/tests/Test.RProvider/Test.RProvider.fsproj b/tests/Test.RProvider/Test.RProvider.fsproj index 1480f7e3..4adc188d 100644 --- a/tests/Test.RProvider/Test.RProvider.fsproj +++ b/tests/Test.RProvider/Test.RProvider.fsproj @@ -82,7 +82,18 @@ --> - + + + + ..\..\packages\DynamicInterop\lib\net40\DynamicInterop.dll + True + True + + + + + + ..\..\packages\FsCheck\lib\net45\FsCheck.dll @@ -93,7 +104,7 @@ - + ..\..\packages\FsCheck.Xunit\lib\net45\FsCheck.Xunit.dll @@ -104,7 +115,7 @@ - + ..\..\packages\R.NET.Community\lib\net40\RDotNet.NativeLibrary.dll @@ -120,7 +131,7 @@ - + ..\..\packages\xunit\lib\net20\xunit.dll