Configure R plugin for RProvider v2

.github/workflows/pull-requests.yml

@@ -10,6 +10,16 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v1
+      - uses: r-lib/actions/setup-r@v1
+        name: Setup R environment
+        with:
+            r-version: '4.0.2'
+      - name: Set R_HOME (for RProvider)
+        run: echo "R_HOME=$(R RHOME)" >> "$GITHUB_ENV"
+        shell: bash
+      - name: Install R package dependencies
+        run: Rscript -e "install.packages(c('zoo'), repos = 'http://cran.us.r-project.org')"
+        shell: bash
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
@@ -25,6 +35,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
+      - name: Set R environment variables (for RProvider)
+        run:  |
+          mkdir -p ~/.local/lib/R
+          echo "R_LIBS_USER=~/.local/lib/R" >> "$GITHUB_ENV"
+          echo "R_HOME=$(R RHOME)" >> "$GITHUB_ENV"
+        shell: bash
+      - name: Install R package dependencies
+        run: Rscript -e "install.packages(c('zoo'))"
+        shell: bash
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:

.github/workflows/push-master.yml

@@ -10,6 +10,16 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v1
+      - uses: r-lib/actions/setup-r@v1
+        name: Setup R environment
+        with:
+            r-version: '4.0.2'
+      - name: Set R_HOME (for RProvider)
+        run: echo "R_HOME=$(R RHOME)" >> "$GITHUB_ENV"
+        shell: bash
+      - name: Install R package dependencies
+        run: Rscript -e "install.packages(c('zoo'), repos = 'http://cran.us.r-project.org')"
+        shell: bash
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
@@ -25,6 +35,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
+      - name: Set R_HOME (for RProvider)
+        run: echo "R_HOME=$(R RHOME)" >> "$GITHUB_ENV"
+        shell: bash
+      - name: Install R package dependencies
+        run:  |
+          mkdir -p ~/.local/lib/R
+          echo "R_LIBS_USER=~/.local/lib/R" >> "$GITHUB_ENV"
+          Rscript -e "install.packages(c('zoo'))"
+        shell: bash
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:

build.fsx

@@ -81,13 +81,13 @@ Target.create "AssemblyInfo" (fun _ ->
         AssemblyInfo.InformationalVersion release.NugetVersion
         AssemblyInfo.FileVersion release.AssemblyVersion]
 
-  // AssemblyInfoFile.createFSharp "src/Deedle.RProvider.Plugin/AssemblyInfo.fs"
-  //     [ AssemblyInfo.Title rpluginProject
-  //       AssemblyInfo.Product rpluginProject
-  //       AssemblyInfo.Description rpluginSummary
-  //       AssemblyInfo.Version release.AssemblyVersion
-  //       AssemblyInfo.InformationalVersion release.NugetVersion
-  //       AssemblyInfo.FileVersion release.AssemblyVersion]
+  AssemblyInfoFile.createFSharp "src/Deedle.RProvider.Plugin/AssemblyInfo.fs"
+      [ AssemblyInfo.Title rpluginProject
+        AssemblyInfo.Product rpluginProject
+        AssemblyInfo.Description rpluginSummary
+        AssemblyInfo.Version release.AssemblyVersion
+        AssemblyInfo.InformationalVersion release.NugetVersion
+        AssemblyInfo.FileVersion release.AssemblyVersion]
 
   AssemblyInfoFile.createFSharp "src/Deedle.Excel/AssemblyInfo.fs"
       [ AssemblyInfo.Title deedleExcelProject
@@ -133,27 +133,27 @@ let testProjs =
       "tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj"
       // "tests/Deedle.Documentation.Tests/Deedle.Documentation.Tests.fsproj"
       "tests/Deedle.PerfTests/Deedle.PerfTests.fsproj"
-      // "tests/Deedle.RPlugin.Tests/Deedle.RPlugin.Tests.fsproj"
     ]
 
 let testCoreProjs =
     [
       "tests/Deedle.Tests/Deedle.Tests.fsproj"
       "tests/Deedle.Math.Tests/Deedle.Math.Tests.fsproj"
       "tests/Deedle.CSharp.Tests/Deedle.CSharp.Tests.csproj"
+      "tests/Deedle.RPlugin.Tests/Deedle.RPlugin.Tests.fsproj"
       //"tests/Deedle.Documentation.Tests/Deedle.Documentation.Tests.fsproj"
       "tests/Deedle.PerfTests/Deedle.PerfTests.fsproj"
     ]
 
 let buildProjs =
     [ "src/Deedle/Deedle.fsproj"
       "src/Deedle.Math/Deedle.Math.fsproj"
-      // "src/Deedle.RProvider.Plugin/Deedle.RProvider.Plugin.fsproj"
       "src/Deedle.Excel/Deedle.Excel.fsproj" ]
 
 let buildCoreProjs =
     [ "src/Deedle/Deedle.fsproj"
-      "src/Deedle.Math/Deedle.Math.fsproj" ]
+      "src/Deedle.Math/Deedle.Math.fsproj"
+      "src/Deedle.RProvider.Plugin/Deedle.RProvider.Plugin.fsproj" ]
 
 Target.create "Build" ( fun _ ->
   Environment.setEnvironVar "GenerateDocumentationFile" "true"
@@ -213,25 +213,23 @@ Target.create "NuGet" (fun _ ->
             AccessKey = Environment.environVarOrDefault "nugetkey" ""
             Publish = Environment.hasEnvironVar "nugetkey" })
         ("nuget/Deedle.nuspec")
-    // NuGet.NuGetPack (fun p ->
-    //     { p with
-    //         ToolPath = nugetExe
-    //         Authors = authors
-    //         Project = rpluginProject
-    //         Summary = rpluginSummary
-    //         Description = description + "\n\n" + rpluginDescription
-    //         Version = release.NugetVersion
-    //         ReleaseNotes = releaseNotes
-    //         Tags = tags + " " + rpluginTags
-    //         OutputPath = "bin"
-    //         Dependencies =
-    //           [ "Deedle", release.NugetVersion
-    //             "R.NET.Community", NuGet.GetPackageVersion "packages" "R.NET.Community"
-    //             "R.NET.Community.FSharp", NuGet.GetPackageVersion "packages" "R.NET.Community.FSharp"
-    //             "RProvider", NuGet.GetPackageVersion "packages" "RProvider" ]
-    //         AccessKey = Environment.environVarOrDefault "nugetkey" ""
-    //         Publish = Environment.hasEnvironVar "nugetkey" })
-    //     ("nuget/Deedle.RPlugin.nuspec")
+    NuGet.NuGetPack (fun p ->
+        { p with
+            ToolPath = nugetExe
+            Authors = authors
+            Project = rpluginProject
+            Summary = rpluginSummary
+            Description = description + "\n\n" + rpluginDescription
+            Version = release.NugetVersion
+            ReleaseNotes = releaseNotes
+            Tags = tags + " " + rpluginTags
+            OutputPath = "bin"
+            Dependencies =
+              [ "Deedle", release.NugetVersion
+                "RProvider", NuGet.GetPackageVersion "packages" "RProvider" ]
+            AccessKey = Environment.environVarOrDefault "nugetkey" ""
+            Publish = Environment.hasEnvironVar "nugetkey" })
+        ("nuget/Deedle.RPlugin.nuspec")
     NuGet.NuGetPack (fun p ->
         { p with
             ToolPath = nugetExe
@@ -301,7 +299,7 @@ Target.create "ReleaseBinaries" (fun _ ->
     !! "temp/release/bin/*" |> File.deleteAll
     "temp/release/bin/netstandard2.0/Deedle.Math.fsx" |> Shell.moveFile "temp/release"
     "temp/release/bin/netstandard2.0/Deedle.fsx" |> Shell.moveFile "temp/release"
-    // "temp/release/bin/net451/RProvider.fsx" |> Shell.moveFile "temp/release"
+    "temp/release/bin/net5.0/RProvider.fsx" |> Shell.moveFile "temp/release"
 
     Git.CommandHelper.runSimpleGitCommand "temp/release" "add bin/*" |> printfn "%s"
     let cmd = sprintf """commit -a -m "Update binaries for version %s""" release.NugetVersion

paket.dependencies

@@ -8,21 +8,29 @@ nuget MathNet.Numerics.FSharp
 nuget NUnit 3.9.0
 nuget NUnit.ConsoleRunner 3.8.0
 nuget FsUnit 3.0.0
-nuget RProvider 1.1.22
 nuget System.Reflection.Emit
 nuget System.Reflection.Emit.Lightweight
 nuget FSharp.Core 4.5.2
 nuget Microsoft.NET.Test.Sdk 16.4.0
 nuget NUnit3TestAdapter 3.9.0
 nuget Microsoft.CSharp
-nuget R.NET.Community
-nuget R.NET.Community.FSharp
 nuget DynamicInterop
-nuget System.ComponentModel.Composition
 nuget NetOfficeFw.Core
 nuget NetOfficeFw.Excel
 nuget FSharp.Formatting
 
+group RProviderPlugin
+    source https://api.nuget.org/v3/index.json
+    framework: net5.0
+
+    nuget FSharp.Core 4.6.2
+    nuget RProvider 2.0.1-beta2
+    nuget System.ComponentModel.Composition
+    nuget NUnit3TestAdapter 3.9.0
+    nuget NUnit 3.9.0
+    nuget Microsoft.NET.Test.Sdk 16.4.0
+    nuget FsUnit 3.0.0
+
 // [ FAKE GROUP ]
 group Build
     source https://api.nuget.org/v3/index.json