Prepare releasing of Deedle.RPlugin 2.5.0 (#541)

Fix R environment
Reference RProvider 2.0.2
Removed AllCore target from build script

.github/workflows/pull-requests.yml

@@ -14,7 +14,7 @@ jobs:
         name: Setup R environment
         with:
             r-version: '4.0.2'
-      - name: Set R_HOME (for RProvider)
+      - name: Set R environment variables (for RProvider)
         run: echo "R_HOME=$(R RHOME)" >> "$GITHUB_ENV"
         shell: bash
       - name: Install R package dependencies

.github/workflows/push-master.yml

@@ -14,7 +14,7 @@ jobs:
         name: Setup R environment
         with:
             r-version: '4.0.2'
-      - name: Set R_HOME (for RProvider)
+      - name: Set R environment variables (for RProvider)
         run: echo "R_HOME=$(R RHOME)" >> "$GITHUB_ENV"
         shell: bash
       - name: Install R package dependencies
@@ -35,14 +35,14 @@ 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
+      - name: Set R environment variables (for RProvider)
         run:  |
           mkdir -p ~/.local/lib/R
           echo "R_LIBS_USER=~/.local/lib/R" >> "$GITHUB_ENV"
-          Rscript -e "install.packages(c('zoo'))"
+          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

Deedle.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2035
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31624.102
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Deedle", "src\Deedle\Deedle.fsproj", "{22729065-4C30-4E43-A63F-4F3338A03878}"
 EndProject
@@ -57,6 +57,16 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Deedle.Excel", "src\Deedle.
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Deedle.Math", "src\Deedle.Math\Deedle.Math.fsproj", "{62ED9851-0A38-43DF-8C35-78F84EB13CB9}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Deedle.Tests", "tests\Deedle.Tests\Deedle.Tests.fsproj", "{EBB029E4-6898-4C48-8A0F-694D8B29475E}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Deedle.Math.Tests", "tests\Deedle.Math.Tests\Deedle.Math.Tests.fsproj", "{AD811C67-091A-4B03-A483-9FA3B1A8CE55}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Deedle.Documentation.Tests", "tests\Deedle.Documentation.Tests\Deedle.Documentation.Tests.fsproj", "{C438ED5D-2F80-499F-9CAC-653187201B51}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Deedle.RPlugin.Tests", "tests\Deedle.RPlugin.Tests\Deedle.RPlugin.Tests.fsproj", "{3332DF71-8B84-4C24-9E02-84FFBC9CAAD8}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Deedle.PerfTests", "tests\Deedle.PerfTests\Deedle.PerfTests.fsproj", "{B8224BD3-4B55-485D-AF3F-54B189D8541E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +93,26 @@ Global
 		{62ED9851-0A38-43DF-8C35-78F84EB13CB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62ED9851-0A38-43DF-8C35-78F84EB13CB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{62ED9851-0A38-43DF-8C35-78F84EB13CB9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBB029E4-6898-4C48-8A0F-694D8B29475E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBB029E4-6898-4C48-8A0F-694D8B29475E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBB029E4-6898-4C48-8A0F-694D8B29475E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBB029E4-6898-4C48-8A0F-694D8B29475E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD811C67-091A-4B03-A483-9FA3B1A8CE55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD811C67-091A-4B03-A483-9FA3B1A8CE55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD811C67-091A-4B03-A483-9FA3B1A8CE55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD811C67-091A-4B03-A483-9FA3B1A8CE55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C438ED5D-2F80-499F-9CAC-653187201B51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C438ED5D-2F80-499F-9CAC-653187201B51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C438ED5D-2F80-499F-9CAC-653187201B51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C438ED5D-2F80-499F-9CAC-653187201B51}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3332DF71-8B84-4C24-9E02-84FFBC9CAAD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3332DF71-8B84-4C24-9E02-84FFBC9CAAD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3332DF71-8B84-4C24-9E02-84FFBC9CAAD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3332DF71-8B84-4C24-9E02-84FFBC9CAAD8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8224BD3-4B55-485D-AF3F-54B189D8541E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8224BD3-4B55-485D-AF3F-54B189D8541E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8224BD3-4B55-485D-AF3F-54B189D8541E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8224BD3-4B55-485D-AF3F-54B189D8541E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

RELEASE_NOTES.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 2.5.0 - 2021-11-10
+
+- Restore Deedle.RPlugin targeting net5.0
+
 ## 2.4.3 - 2021-09-11
 
 - Add TryMin and TryMax in extension to be utilized in C#

build.fsx

@@ -135,24 +135,10 @@ let testProjs =
       "tests/Deedle.PerfTests/Deedle.PerfTests.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.Excel/Deedle.Excel.fsproj" ]
-
-let buildCoreProjs =
-    [ "src/Deedle/Deedle.fsproj"
-      "src/Deedle.Math/Deedle.Math.fsproj"
+      "src/Deedle.Excel/Deedle.Excel.fsproj"
       "src/Deedle.RProvider.Plugin/Deedle.RProvider.Plugin.fsproj" ]
 
 Target.create "Build" ( fun _ ->
@@ -162,13 +148,6 @@ Target.create "Build" ( fun _ ->
                                                                       CustomParams = Some "/v:n /p:SourceLinkCreate=true" }
                                           Configuration = DotNet.BuildConfiguration.Release }) proj )
 
-
-Target.create "BuildCore" ( fun _ ->
-  Environment.setEnvironVar "GenerateDocumentationFile" "true"
-  for proj in buildCoreProjs do
-    DotNet.build (fun opts -> { opts with Common = { opts.Common with CustomParams = Some "/v:n /p:SourceLinkCreate=true" }
-                                          Configuration = DotNet.BuildConfiguration.Release }) proj )
-
 // --------------------------------------------------------------------------------------
 // Run the unit tests using test runner & kill test runner when complete
 
@@ -180,14 +159,6 @@ Target.create "RunTests" (fun _ ->
   for proj in testProjs do
     DotNet.test (fun opts -> { opts with Configuration = DotNet.BuildConfiguration.Release }) proj )
 
-Target.create "BuildCoreTests" (fun _ ->
-  for proj in testCoreProjs do
-    DotNet.build (fun opts -> { opts with Configuration = DotNet.BuildConfiguration.Release }) proj )
-
-Target.create "RunCoreTests" (fun _ ->
-  for proj in testCoreProjs do
-    DotNet.test (fun opts -> { opts with  Configuration = DotNet.BuildConfiguration.Release }) proj )
-
 // --------------------------------------------------------------------------------------
 // Build a NuGet package
 
@@ -226,7 +197,7 @@ Target.create "NuGet" (fun _ ->
             OutputPath = "bin"
             Dependencies =
               [ "Deedle", release.NugetVersion
-                "RProvider", NuGet.GetPackageVersion "packages" "RProvider" ]
+                "RProvider", NuGet.GetPackageVersion "packages/rproviderplugin" "RProvider" ]
             AccessKey = Environment.environVarOrDefault "nugetkey" ""
             Publish = Environment.hasEnvironVar "nugetkey" })
         ("nuget/Deedle.RPlugin.nuspec")
@@ -327,14 +298,6 @@ Target.create "Release" ignore
 // Run all targets by default. Invoke 'build <Target>' to override
 
 Target.create "All" ignore
-Target.create "AllCore" ignore
-
-"Clean"
-  ==> "AssemblyInfo"
-  ==> "BuildCore"
-  ==> "BuildCoreTests"
-  ==> "RunCoreTests"
-  ==> "AllCore"
 
 "Clean"
   ==> "AssemblyInfo"
@@ -352,4 +315,4 @@ Target.create "AllCore" ignore
   ==> "TagRelease"
   ==> "Release"
 
-Target.runOrDefault "AllCore"
+Target.runOrDefault "All"

docs/csharp/CSharp.DocSnippets.csproj

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>

nuget/Deedle.RPlugin.nuspec

@@ -17,7 +17,7 @@
     @dependencies@
   </metadata>
   <files>
-    <file src="..\bin\net451\Deedle.RProvider.Plugin.dll" target="lib/net451" />
-    <file src="..\bin\net451\Deedle.RProvider.Plugin.pdb" target="lib/net451" />  
+    <file src="..\bin\net5.0\Deedle.RProvider.Plugin.dll" target="lib/net5.0" />
+    <file src="..\bin\net5.0\Deedle.RProvider.Plugin.pdb" target="lib/net5.0" />  
   </files>
 </package>

paket.dependencies

@@ -24,7 +24,7 @@ group RProviderPlugin
     framework: net5.0
 
     nuget FSharp.Core 4.6.2
-    nuget RProvider 2.0.1-beta2
+    nuget RProvider 2.0.2
     nuget System.ComponentModel.Composition
     nuget NUnit3TestAdapter 3.9.0
     nuget NUnit 3.9.0

paket.lock

@@ -1637,7 +1637,7 @@ NUGET
       DynamicInterop (>= 0.9.1)
       FSharp.Core (>= 4.6.2)
       R.NET (>= 1.9)
-    RProvider (2.0.1-beta2)
+    RProvider (2.0.2)
       FSharp.Core (>= 4.6.2)
       Newtonsoft.Json (>= 13.0.1)
       PipeMethodCalls (>= 3.0.4)
@@ -1671,7 +1671,7 @@ NUGET
       System.Threading (>= 4.3)
     System.ComponentModel (4.3)
       System.Runtime (>= 4.3)
-    System.ComponentModel.Composition (5.0)
+    System.ComponentModel.Composition (6.0)
     System.ComponentModel.EventBasedAsync (4.3)
       System.Resources.ResourceManager (>= 4.3)
       System.Runtime (>= 4.3)

src/Deedle.Excel/AssemblyInfo.fs

@@ -5,15 +5,15 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("Deedle.Excel")>]
 [<assembly: AssemblyProductAttribute("Deedle.Excel")>]
 [<assembly: AssemblyDescriptionAttribute("Deedle integration with Excel")>]
-[<assembly: AssemblyVersionAttribute("2.4.3")>]
-[<assembly: AssemblyInformationalVersionAttribute("2.4.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.4.3")>]
+[<assembly: AssemblyVersionAttribute("2.5.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("2.5.0")>]
+[<assembly: AssemblyFileVersionAttribute("2.5.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Deedle.Excel"
     let [<Literal>] AssemblyProduct = "Deedle.Excel"
     let [<Literal>] AssemblyDescription = "Deedle integration with Excel"
-    let [<Literal>] AssemblyVersion = "2.4.3"
-    let [<Literal>] AssemblyInformationalVersion = "2.4.3"
-    let [<Literal>] AssemblyFileVersion = "2.4.3"
+    let [<Literal>] AssemblyVersion = "2.5.0"
+    let [<Literal>] AssemblyInformationalVersion = "2.5.0"
+    let [<Literal>] AssemblyFileVersion = "2.5.0"

src/Deedle.Math/AssemblyInfo.fs

@@ -5,15 +5,15 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("Deedle.Math")>]
 [<assembly: AssemblyProductAttribute("Deedle.Math")>]
 [<assembly: AssemblyDescriptionAttribute("Deedle interop with Math.Net")>]
-[<assembly: AssemblyVersionAttribute("2.4.3")>]
-[<assembly: AssemblyInformationalVersionAttribute("2.4.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.4.3")>]
+[<assembly: AssemblyVersionAttribute("2.5.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("2.5.0")>]
+[<assembly: AssemblyFileVersionAttribute("2.5.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Deedle.Math"
     let [<Literal>] AssemblyProduct = "Deedle.Math"
     let [<Literal>] AssemblyDescription = "Deedle interop with Math.Net"
-    let [<Literal>] AssemblyVersion = "2.4.3"
-    let [<Literal>] AssemblyInformationalVersion = "2.4.3"
-    let [<Literal>] AssemblyFileVersion = "2.4.3"
+    let [<Literal>] AssemblyVersion = "2.5.0"
+    let [<Literal>] AssemblyInformationalVersion = "2.5.0"
+    let [<Literal>] AssemblyFileVersion = "2.5.0"

src/Deedle.RProvider.Plugin/AssemblyInfo.fs

@@ -5,15 +5,15 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("Deedle.RPlugin")>]
 [<assembly: AssemblyProductAttribute("Deedle.RPlugin")>]
 [<assembly: AssemblyDescriptionAttribute("Easy to use .NET library for data manipulation with R project integration")>]
-[<assembly: AssemblyVersionAttribute("2.4.3")>]
-[<assembly: AssemblyInformationalVersionAttribute("2.4.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.4.3")>]
+[<assembly: AssemblyVersionAttribute("2.5.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("2.5.0")>]
+[<assembly: AssemblyFileVersionAttribute("2.5.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Deedle.RPlugin"
     let [<Literal>] AssemblyProduct = "Deedle.RPlugin"
     let [<Literal>] AssemblyDescription = "Easy to use .NET library for data manipulation with R project integration"
-    let [<Literal>] AssemblyVersion = "2.4.3"
-    let [<Literal>] AssemblyInformationalVersion = "2.4.3"
-    let [<Literal>] AssemblyFileVersion = "2.4.3"
+    let [<Literal>] AssemblyVersion = "2.5.0"
+    let [<Literal>] AssemblyInformationalVersion = "2.5.0"
+    let [<Literal>] AssemblyFileVersion = "2.5.0"

src/Deedle/Common/AssemblyInfo.fs

@@ -5,15 +5,15 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("Deedle")>]
 [<assembly: AssemblyProductAttribute("Deedle")>]
 [<assembly: AssemblyDescriptionAttribute("Easy to use .NET library for data manipulation and scientific programming")>]
-[<assembly: AssemblyVersionAttribute("2.4.3")>]
-[<assembly: AssemblyInformationalVersionAttribute("2.4.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.4.3")>]
+[<assembly: AssemblyVersionAttribute("2.5.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("2.5.0")>]
+[<assembly: AssemblyFileVersionAttribute("2.5.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Deedle"
     let [<Literal>] AssemblyProduct = "Deedle"
     let [<Literal>] AssemblyDescription = "Easy to use .NET library for data manipulation and scientific programming"
-    let [<Literal>] AssemblyVersion = "2.4.3"
-    let [<Literal>] AssemblyInformationalVersion = "2.4.3"
-    let [<Literal>] AssemblyFileVersion = "2.4.3"
+    let [<Literal>] AssemblyVersion = "2.5.0"
+    let [<Literal>] AssemblyInformationalVersion = "2.5.0"
+    let [<Literal>] AssemblyFileVersion = "2.5.0"