Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trying to pull the original repo to my fork #2

Open
wants to merge 95 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
2726827
Merge tag '1.7.0.1' into develop
lrasmus Jun 19, 2018
1a7f924
Add FlushCrashApp to TestApps reproducing issue on linux
davidpendraykalibrate Jun 20, 2018
88cb087
Fix bug where callback delegates get garbage collected on linux
davidpendraykalibrate May 31, 2018
c6e2e12
Remove xunit.runner.visualstudio from RDotNet.Tests project.
davidpendraykalibrate Jun 18, 2018
731e4c5
Add'l unit test for symbolic expr conversion
lrasmus Jun 26, 2018
4574d7f
Merge branch 'r_3_5_0' into develop
lrasmus Jun 27, 2018
5cf388c
Merge branch 'altrep_32bit_fix' into develop
lrasmus Jan 18, 2019
27fab92
Version bump for 1.7.0.2
lrasmus Jan 18, 2019
75ebfd2
Merge branch 'altrep_32bit_fix' into develop
lrasmus Jan 25, 2019
4d40e6e
Fix build settings for x86 builds
lrasmus Jan 25, 2019
46da067
v1.7.0.3 version bump
lrasmus Jan 25, 2019
fdc8c90
Merge branch 'develop'
lrasmus Jan 25, 2019
34387be
Test for targetting .net standard 2.0.
jmp75 Mar 24, 2019
91b4473
Merge pull request #80 from KalibrateTechnologies/FixGCBug
jmp75 Mar 25, 2019
d05ba51
migrate projects to .net core 2.0 / netstandard2.0. Compiles on windo…
jmp75 Mar 25, 2019
672c45f
Minor readme update
jmp75 Mar 25, 2019
c5ffe08
Merge remote-tracking branch 'origin/devel' into merge/KalibrateTechn…
jmp75 Mar 25, 2019
5daf4b3
Merge branch 'merge/KalibrateTechnologies' into testing
jmp75 Mar 25, 2019
1068dfb
Appveyor badges in readme.
jmp75 Mar 25, 2019
ec608db
update for 1.8.0-alpha1 nuget package version.
jmp75 Mar 25, 2019
0942746
Fix to run on Linux. Limited to R 3.5.x
jmp75 Mar 26, 2019
82f5fbf
Compile 1.7.0 with vs2017 to investigate #90. Needed to pin to older …
jmp75 Apr 15, 2019
2374d30
Reproduce issue #90
jmp75 Apr 15, 2019
9ee63ee
updates to release a nuget package RDotNet.FSharp
jmp75 Apr 30, 2019
d387b62
Tidy up package metadata for an alphar release. Add material to test …
jmp75 May 4, 2019
ac18f7d
Candidate fix for appveyor, travis
jmp75 May 4, 2019
ff006e1
try to fix CI scripts
jmp75 May 4, 2019
5d76c21
try to fix travis script
jmp75 May 4, 2019
6211421
Try Travis build options
jmp75 May 4, 2019
2f9fefe
try tu use ubuntu xenial for travis
jmp75 May 4, 2019
3f202d7
add nuget badge via buildstats.info
jmp75 May 4, 2019
9be0ac6
minor test app change
jmp75 May 4, 2019
b3f47ce
Merge branch 'testing'
jmp75 May 4, 2019
b95c6ef
version 1.8.1
jmp75 May 4, 2019
a88e188
documentation changes post 1.8.1 release
jmp75 May 11, 2019
890704d
Merge branch 'maintenance/1.7' into experimental
jmp75 May 11, 2019
efdb29e
Add unit test and repro investigations for https://github.com/jmp75/r…
jmp75 May 11, 2019
742005d
Merge remote-tracking branch 'StatTag/develop' into merge/StatTag
jmp75 May 20, 2019
f802fe2
update a test command line application to more easily specify R versi…
jmp75 May 20, 2019
39cc3d8
Merge branch 'merge/StatTag' into maintenance/1.8.1
jmp75 May 20, 2019
4fc6c3c
Fix https://github.com/jmp75/rdotnet/issues/97 and release 1.8.2
jmp75 May 20, 2019
b0d00bc
Fix broken links in readme
kierenj Jun 19, 2019
187a59e
Merge pull request #101 from kierenj/patch-1
jmp75 Jul 1, 2019
5638654
Add older license for R.NET 1.6.5, extracted from codeplex archives
jmp75 Aug 6, 2019
7b64ec8
Merge branch 'master' of github.com:rdotnet/rdotnet
jmp75 Aug 6, 2019
71f14ea
Closes #113 - consistent handling of NA values in
lrasmus Jan 10, 2020
4b7ffe8
Missing 'else' statements
lrasmus Jan 10, 2020
6db35dc
Merge branch 'master' of https://github.com/rdotnet/rdotnet into 113_…
lrasmus Jan 10, 2020
32a8f36
Allows search of HKCU
TongZhai Jan 24, 2020
da5341a
better testing of R-core registry key in HKLM then HKCU
TongZhai Feb 6, 2020
ac00ea2
Fix failing tests from changes in R 4.0
lrasmus Apr 30, 2020
3edef6f
Merge pull request #124 from lrasmus/r_4_0_tests
jmp75 Aug 19, 2020
1d2b33d
Update credits. Compiles but unit tests appear to fail on Windows.
Aug 20, 2020
0ade255
Update readme; changes in badges URLs
Oct 3, 2020
7413886
Candidate workaround for issue https://github.com/rdotnet/rdotnet/iss…
Oct 4, 2020
da130a3
Release notes for 1.9.0
Oct 4, 2020
145c656
Readme minor update
Oct 4, 2020
ddf1dcc
Merge pull request #116 from TongZhai/master
jmp75 Oct 5, 2020
1aad843
Try to fix unit tests and get it running on .netcore 3.1 on linux
jmp75 Oct 7, 2020
e29909d
Merge branch 'master' into experimental
jmp75 Oct 7, 2020
0ab670a
Fix build/test on Linux debian
jmp75 Oct 7, 2020
b226622
add a tasks.json for use from Linuxx, for now
jmp75 Oct 7, 2020
02d1505
Try to diagnose issue on Linux, TestUsingDefaultRPackages passes if r…
jmp75 Oct 7, 2020
14d91f6
Fix unit tests. Disalbe the use of "dynamic" on SEXP; not reliable.
Oct 7, 2020
2b624cb
fix appveyor config: .NET core 3.1 requires VS2019 image
Oct 7, 2020
0ce05bc
More details in dotnet test outputs to figure out what's blocking
Oct 7, 2020
762803a
Diagnose why appveyor projects fail to pass tests
jmp75 Oct 8, 2020
f750387
Diagnose why appveyor projects fail to pass tests
jmp75 Oct 8, 2020
41f7315
Readme minor change
Dec 26, 2020
d240268
Merge branch 'testing' of github.com:jmp75/rdotnet into testing
Dec 26, 2020
4df1140
Try to get appveyor to run unit tests
Dec 26, 2020
d9aab0d
diagnose dotnet exec on appveyor returning with exit code -1073740791
Dec 26, 2020
379ecf7
Modify a test script to diagnose why appveyor VM returns non zero err…
Dec 27, 2020
b7386bf
Modify a test script to diagnose why appveyor VM returns non zero err…
Dec 27, 2020
5b41e77
Readme minor change
Dec 26, 2020
b2ae6cb
appveyor diagnosis
Dec 27, 2020
f9e88f5
Add minimalist program to test failing test run on appveyor
Dec 27, 2020
d1302cd
Add minimalist program to test failing test run on appveyor
Dec 27, 2020
10d18dd
Add minimalist program to test failing test run on appveyor
Dec 27, 2020
8b36dc2
Fix travis build dotnet version to 3.1
Dec 27, 2020
fdd8e09
try fix travis CO
Dec 27, 2020
9badca9
try fix travis CO
Dec 27, 2020
b8fde3a
Try to stand up CI upon Ubuntu focal and bionic
jmp75 Dec 27, 2020
e17eb3c
revert last change
jmp75 Dec 27, 2020
7e792cf
Add R ubuntu packages to get R version post 3.5
jmp75 Dec 27, 2020
c38ce53
Add R ubuntu packages to get R version post 3.5
jmp75 Dec 27, 2020
304586c
missing sudo on travis commands
jmp75 Dec 27, 2020
b08dea0
Candidate fix for character device setup for Unix (issue #131), chang…
jmp75 Dec 28, 2020
27817e9
Adjust for Travis CI
jmp75 Dec 28, 2020
656026c
Fix travis CI config
jmp75 Dec 28, 2020
a44f3cb
Travis CI adjustments
jmp75 Dec 28, 2020
52058c2
Merge branch - Travis CI linux back to green
jmp75 Dec 28, 2020
42e461a
NA handling in CharacterMatrix
jmp75 Dec 28, 2020
99bcd28
draft releawse notes 1.9.1
jmp75 Dec 28, 2020
decf373
Bulk dos2unix on files on Linux. Seems CRLF was just about everywhere…
jmp75 Dec 28, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
version: '{build}'
image:
- Visual Studio 2017
# - Visual Studio 2015
- Visual Studio 2019


configuration: Debug
platform: Any CPU

environment:
R_ARCH: x64
PLATFORM: Any CPU
BuildPLATFORM: Any CPU
BuildConfiguration: Debug
configuration: Debug

branches:
only:
- devel
- master
- testing

# Install R for windows.
# Borrowed from http://raw.github.com/krlmlr/r-appveyor
Expand All @@ -33,12 +35,26 @@ cache:

build_script:
- cmd: >-
dotnet restore RDotNet.ns2.sln
dotnet --info

dotnet build --configuration Debug --no-restore RDotNet.ns2.sln
dotnet restore RDotNet.Tests.sln

dotnet build --configuration Debug --no-restore RDotNet.Tests.sln

dotnet restore TestApps/SimpleTest/SimpleTest.csproj

dotnet build --configuration Debug --no-restore TestApps/SimpleTest/SimpleTest.csproj

test_script:
- cmd: >-
dotnet test RDotNet.Tests/RDotNet.Tests.csproj
.\tests\detect_r.bat

dotnet test --blame --filter TestCharacter RDotNet.Tests/RDotNet.Tests.csproj

dotnet test --blame RDotNet.FSharp.Tests/RDotNet.FSharp.Tests.fsproj

# dotnet run -v d --project TestApps/SimpleTest/SimpleTest.csproj

# dotnet test -v d --blame --filter TestCharacter RDotNet.Tests/RDotNet.Tests.csproj

dotnet test RDotNet.FSharp.Tests/RDotNet.FSharp.Tests.fsproj
# dotnet test -v d --blame RDotNet.FSharp.Tests/RDotNet.FSharp.Tests.fsproj
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**/bin
**/obj
.git
13 changes: 4 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# Specific to R.NET setup
.fake/
.paket/
paket.lock
nuget/
UpgradeLog*

# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
[Bb]in/
[Oo]bj/
Expand All @@ -15,8 +8,6 @@ TestResults
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

.vs/

# User-specific files
*.suo
*.user
Expand Down Expand Up @@ -117,3 +108,7 @@ _UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
.paket/paket.exe
.fake/
.paket/Paket.Restore.targets
.vs/
paket.lock
39 changes: 23 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
language: csharp
mono: none
dotnet: 2.0.0
dist: trusty
# dotnet: 2.1.602
dotnet: 3.1
dist:
- bionic # R 3.4.x by default TODO how to have a matrix of pre 3.5 and post 3.5

script:
- dotnet restore
- dotnet build --configuration Release --no-restore

- cd DynamicInterop.Tests
- cd test_native_library
- cmake -H. -Bbuild
- cmake --build build -- -j3
- cd ..
- cd ..
branches:
only:
- master
- testing

script:
- dotnet restore RDotNet.Tests.sln
- dotnet build --configuration Debug --no-restore RDotNet.Tests.sln
# - dotnet test RDotNet.Tests/RDotNet.Tests.csproj
before_install:
- sudo echo "deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran40/" >> /etc/apt/sources.list
- sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9
- sudo apt-get -qq update
- sudo apt-get install -y r-base-dev r-cran-mass r-cran-lattice r-cran-matrix

install:
- dotnet restore RDotNet.Tests.sln
- dotnet build --configuration Debug --no-restore RDotNet.Tests.sln

script:
- R --version
- export R_HOME=/usr/lib/R
- ls $R_HOME
- dotnet run --project TestApps/SimpleTest/SimpleTest.csproj
- dotnet test RDotNet.Tests/RDotNet.Tests.csproj
- dotnet test RDotNet.FSharp.Tests/RDotNet.FSharp.Tests.fsproj
105 changes: 105 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "build-debug",
"command": "dotnet",
"type": "shell",
"args": [
"build",
"--configuration",
"Debug",
"--no-restore",
"RDotNet.Tests.sln"
],
"group": {
"kind": "build",
"isDefault": true
},
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},
{
"label": "build-release",
"command": "dotnet",
"type": "shell",
"args": [
"build",
"--configuration",
"Release",
"--no-restore",
"RDotNet.Tests.sln"
],
"group": {
"kind": "build",
"isDefault": true
},
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},
{
"label": "clean",
"command": "dotnet",
"type": "shell",
"args": [
"clean",
"--configuration",
"Debug",
"RDotNet.Tests.sln"
],
"group": {
"kind": "build",
"isDefault": true
},
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},
{
"label": "test-rdn",
"command": "dotnet",
"type": "shell",
"args": [
"test",
"--blame",
"RDotNet.Tests/RDotNet.Tests.csproj"
],
"group": {
"kind": "test",
"isDefault": true
},
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},
{
"label": "test-rdn-fs",
"command": "dotnet",
"type": "shell",
"args": [
"test",
"--blame",
"RDotNet.Tests.FSharp/RDotNet.Tests.FSharp.csproj"
],
"group": {
"kind": "test",
"isDefault": true
},
"presentation": {
"reveal": "always"
},
"problemMatcher": "$msCompile"
},



]
}
15 changes: 15 additions & 0 deletions FlushCrashApp.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM r-base as base
RUN apt-get update; apt-get --assume-yes install gnupg ; \
wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg; \
mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ ; \
wget -q https://packages.microsoft.com/config/debian/9/prod.list ; \
mv prod.list /etc/apt/sources.list.d/microsoft-prod.list ; \
apt-get update

RUN apt-get --assume-yes install dotnet-sdk-2.1
WORKDIR /
COPY . .
RUN dotnet publish TestApps/FlushCrashApp/FlushCrashApp.csproj -c Release -o out
WORKDIR TestApps/FlushCrashApp/out/
ENV "R_HOME" "/usr/lib/R"
RUN [ "dotnet", "FlushCrashApp.dll" ]
10 changes: 8 additions & 2 deletions License.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
The MIT License (MIT)

Copyright (c) 2014-2018 Jean-Michel Perraud
Copyright (c) 2013 Kosei, evolvedmicrobe
Copyright (c) 2014-2020 Jean-Michel Perraud
Copyright (c) 2019-2020 Luke Rasmussen
Copyright (c) 2018 David Pendray
Copyright (c) 2017 Guillaume Jamet
Copyright (c) 2016 Tomas Petricek, Wei Lu
Copyright (c) 2015 Nigel Delaney, Yuanhe Huang
Copyright (c) 2014 skuyguy94, David Charbonneau
Copyright (c) 2013 Kosei ABE, evolvedmicrobe

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
60 changes: 30 additions & 30 deletions R.NET.sln
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RDotNet", "R.NET/RDotNet.csproj", "{0923E1A0-2032-4997-AB73-49E42C4034A9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RDotNet.Graphics", "RDotNet.Graphics/RDotNet.Graphics.csproj", "{BCADF6CF-2D63-4BD7-BC28-F0AC4F98AE78}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0923E1A0-2032-4997-AB73-49E42C4034A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0923E1A0-2032-4997-AB73-49E42C4034A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0923E1A0-2032-4997-AB73-49E42C4034A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0923E1A0-2032-4997-AB73-49E42C4034A9}.Release|Any CPU.Build.0 = Release|Any CPU
{BCADF6CF-2D63-4BD7-BC28-F0AC4F98AE78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BCADF6CF-2D63-4BD7-BC28-F0AC4F98AE78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BCADF6CF-2D63-4BD7-BC28-F0AC4F98AE78}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BCADF6CF-2D63-4BD7-BC28-F0AC4F98AE78}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = R.NET/R.NET.csproj
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RDotNet", "R.NET/RDotNet.csproj", "{0923E1A0-2032-4997-AB73-49E42C4034A9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RDotNet.Graphics", "RDotNet.Graphics/RDotNet.Graphics.csproj", "{BCADF6CF-2D63-4BD7-BC28-F0AC4F98AE78}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0923E1A0-2032-4997-AB73-49E42C4034A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0923E1A0-2032-4997-AB73-49E42C4034A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0923E1A0-2032-4997-AB73-49E42C4034A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0923E1A0-2032-4997-AB73-49E42C4034A9}.Release|Any CPU.Build.0 = Release|Any CPU
{BCADF6CF-2D63-4BD7-BC28-F0AC4F98AE78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BCADF6CF-2D63-4BD7-BC28-F0AC4F98AE78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BCADF6CF-2D63-4BD7-BC28-F0AC4F98AE78}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BCADF6CF-2D63-4BD7-BC28-F0AC4F98AE78}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = R.NET/R.NET.csproj
EndGlobalSection
EndGlobal
Loading