Migrate to use VS2019 level toolchain - update readme.

Author: jmp75

R/zzz.R

@@ -22,8 +22,8 @@ startupMsg <- ''
   monoexepath <- Sys.which('mono')
   ext <- .Platform$dynlib.ext
   nativeLibsNames <- paste(c('rClrMono', 'rClrMs'), ext, sep='')
-  msDll <- nativeLibsNames[2]
   monoDll <- nativeLibsNames[1]
+  msDll <- nativeLibsNames[2]
   getFnameNoExt <- function(x) {strsplit(x, '\\.')[[1]][1]}
   rClrPkgDir <- file.path(libname, pkgname)
   archLibPath <- file.path(rClrPkgDir, 'libs', Sys.getenv('R_ARCH'))
@@ -43,20 +43,25 @@ startupMsg <- ''
   }
   dlls <- list.files(archLibPath, pattern=ext)
   if ( Sys.info()[['sysname']] == 'Windows') {
-    if ( msDll %in% dlls && rclr_env!='Mono') {
-      if( Sys.which('msvcr120.dll') == '') {
-        stop(paste("'msvcr120.dll' was not found on this Windows system.",
-          "You are probably missing the Visual C++ Redistributable for Visual Studio 2013.",
-          "Check instructions at https://r2clr.codeplex.com/wikipage?title=Installing%20R%20packages&referringTitle=Documentation", 
+    if ( rclr_env!='Mono') {
+      msvcrFileName <- 'msvcp140.dll'
+      if( Sys.which(msvcrFileName) == '') {
+        stop(paste(msvcrFileName, "was not found on this Windows system.",
+          "You are probably missing the Visual C++ Redistributable for Visual Studio 2019.",
+          "Go to https://visualstudio.microsoft.com/downloads/ and dowload 'Microsoft Visual C++ Redistributable for Visual Studio 2019'", 
           sep="\n"))
       }
+      if(!(msDll %in% dlls)) {
+        stop(paste('rClr library .NET framework not found - looked under', archLibPath, 'but not found in', paste(dlls, collapse=','))) 
+      }
       appendStartupMsg('Loading the dynamic library for Microsoft .NET runtime...')
       chname <- getFnameNoExt(msDll) 
       loadAndInit(chname, pkgname, libname, srcPkgLibPath) 
-    } else {  # on Windows, but we are requesting to load Mono.
+    } else if ( rclr_env=='Mono') {
+    # on Windows, but we are requesting to load Mono.
       appendStartupMsg('Loading the dynamic library for Mono runtime...')
       if(!(monoDll %in% dlls)) {
-        stop(paste('rClr library for Mono not found - looked under', archLibPath)) 
+        stop(paste('rClr library for Mono not found - looked under', archLibPath, 'but not found in', paste(dlls, collapse=','))) 
       } else if (monoexepath=='') {
         stop("mono.exe was not found by 'Sys.which'. You must add the mono bin directory (e.g. c:\\Program Files\\Mono-3.0.6\\bin) to your PATH environment variable")
       } else {

README.md

@@ -2,47 +2,64 @@
 
 ## R package for accessing .NET
 
-The latest is on the [testing branch](https://github.com/jmp75/rClr/tree/testing). As of March 2019 testing support for R 3.5.
-
 Accessing the Common Language Runtime (.NET or Mono) from the R statistical software, in-process.
 
 ## Installing
 
-As of September 2015, the source code snapshot of tagged releases can be found via the [release tab of the rClr GitHub repository](https://github.com/jmp75/rClr/releases). Binary R packages for Windows cannot be released via github, and you can get them from [https://rclr.codeplex.com](https://rclr.codeplex.com).
+As of 2019-04, releases can be found via the [release tab of the rClr GitHub repository](https://github.com/jmp75/rClr/releases).
 
 ### Pre-compiled binaries
 
 You can install pre-compiled rClr for Windows via [https://rclr.codeplex.com](https://rclr.codeplex.com). You can use from the command line `R CMD INSTALL rclr_0.8.zip` where `R` points to one of the R.exe installed on your machine, or from R itself `install.packages('c:/path/to/rclr_0.8.zip')`
 
 ### From source
 
+If you want to compile from source note that you may be interested in using the [testing branch](https://github.com/jmp75/rClr/tree/testing).
+
+rClr is not your average R package and requires a few more tools than is typical for most R packages.
+
 #### Windows
 
+On Windows you will need a C# and C and/or Visual C++ compiler. Using the Visual Studio 2019 toolchain is recommended as of April 2019. Check the [visual studio download page](https://visualstudio.microsoft.com/downloads/) for options.
+
 Under construction as of 2019-04:
 
 ```bat
-REM important to not have nuget.exe under c:\bin 
+REM IMPORTANT to not have nuget.exe or other commands under c:\bin; RTools mingw cannot find these commands
 set PATH=C:\cmd_bin;%PATH%
-REM and make sure we use a recent msbuild, otherwise issues with netstandard2 formats.
-set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\;%PATH%
 cd c:\src\github_jm
+```
+
+Make sure we use a recent msbuild, otherwise there may be issues with targetting .NET netstandard2.0. `.\rClr\src\setup_vcpp.cmd` may help detect the most recent `msbuild.exe` you have if you have installed visual studio (unsure it works for Build Tools for Visual Studio). You can start a development prompt as a fallback if setup_vcpp fails to work on your machine.
+
+```bat
+REM https://github.com/jmp75/rClr/issues/42 may need to use VS2019
+.\rClr\src\setup_vcpp.cmd
+```
+
+```bat
 set R_EXE="c:\Program Files\R\R-3.5.2\bin\x64\R.exe"
 set R_VANILLA=%R_EXE% --no-save --no-restore-data
 %R_VANILLA% CMD build rClr
-%R_VANILLA% CMD INSTALL --build rClr_0.8.x.tar.gz
-```
+%R_VANILLA% CMD INSTALL --build rClr_0.8.2.tar.gz
 
-#### Windows
+set R_EXE="c:\Program Files\R\R-3.4.4\bin\x64\R.exe"
+set R_VANILLA=%R_EXE% --no-save --no-restore-data
+REM %R_VANILLA% CMD build rClr
+%R_VANILLA% CMD INSTALL --build rClr_0.8.2.tar.gz
+```
 
-Installing on Linux is always installing from source anyway, be it from a tarball, cloning the repo, or using `devtools`. 
+Note that as of September 2015 using Mono on Windows is not maintained.
 
-rClr is not your average R package and requires a few more tools than is typical for most R packages. 
+#### Linux
 
-On Windows you will need a C# and C and/or Visual C++ compiler. Using the Visual Studio 2013 toolchain is recommended. Read [the current build instructions](https://r2clr.codeplex.com/wikipage?title=Build%20instructions&referringTitle=Documentation). Note that as of September 2015 using Mono on Windows is not maintained.
+Installing on Linux is always installing from source anyway, be it from a tarball, cloning the repo, or using `devtools`.
 
 A Linux distribution with R, g++ and the Mono toolchain (including xbuild) should work. Note that while a range of Mono versions in the 3.X series may work, I recommend you use versions 3.8 or above. This may require you to look for adequate versions (for instance Debian is lagging behind currently). You may want to have a look at the instructions at the [mono download page for Linux](http://www.mono-project.com/download/#download-lin) and use the Xamarin packages.
 
-You should be able to install the package using the `install_github` function of the package `devtools`. The following commands have been tested successfully on Windows with VS2013 and Linux with Mono 3.10, on 2014-12-19. 
+#### Using devtools
+
+You should be able to install the package using the `install_github` function of the package `devtools`. The following commands have been tested successfully on Windows with VS2013 and Linux with Mono 3.10, on 2014-12-19.
 
 ```R
 ## Optionally you may remove a prior package
@@ -64,7 +81,7 @@ library(rClr)
 browseVignettes('rClr')
 ```
 
-You will otherwise find some documentation at [https://r2clr.codeplex.com/documentation](https://r2clr.codeplex.com/documentation)
+OBSOLETE: You will otherwise find some documentation at [https://r2clr.codeplex.com/documentation](https://r2clr.codeplex.com/documentation)
 
 ## Feedback and contributions
 

src/rClr.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -49,70 +49,71 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1EE5689F-F71E-49E1-874A-0DF63E174635}</ProjectGuid>
     <RootNamespace>rClr</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <!--VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath-->
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MonoDebug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MonoInstallDebug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MonoInstall|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MonoDebug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MonoInstallDebug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MonoInstall|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/setup_vcpp.cmd

@@ -1,21 +1,76 @@
+@echo off
+
+REM -------------------------------------
+REM NOTE: This file is a copy of 
+REM https://github.com/jmp75/config-utils/blob/master/R/packages/msvs/exec/setup_vcpp.cmd
+REM -------------------------------------
+
+@set exit_code=0
+
+
+REM load Visual Studio 2017 developer command prompt setup has changed compared to previous versions. 
+REM Inspired from: https://github.com/ctaggart  via https://github.com/Microsoft/visualfsharp/pull/2690/commits/bf52776167fe6a9f2354ea96094a025191dbd3e7
+
+set VsDevCmdFile=\Common7\Tools\VsDevCmd.bat
+
+set progf=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\
+if exist "%progf%" (
+    goto foundVsDevCmdFile
+)
+
+set progf=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\
+
+:foundVsDevCmdFile
+
+if exist "%progf%Enterprise%VsDevCmdFile%" (
+    call "%progf%Enterprise%VsDevCmdFile%"
+    goto end
+)
+if exist "%progf%Professional%VsDevCmdFile%" (
+    call "%progf%Professional%VsDevCmdFile%"
+    goto end
+)
+if exist "%progf%Community%VsDevCmdFile%" (
+    call "%progf%Community%VsDevCmdFile%"
+    goto end
+)
+if exist "%progf%BuildTools%VsDevCmdFile%" (
+    call "%progf%BuildTools%VsDevCmdFile%"
+    goto end
+)
 
-set VSCOMNTOOLS=%VS120COMNTOOLS%
-@if "%VSCOMNTOOLS%"=="" VSCOMNTOOLS=%VS110COMNTOOLS%
-@if "%VSCOMNTOOLS%"=="" goto error_no_VS110COMNTOOLSDIR
 REM for instance C:\bin\VS2012\Common7\Tools\
+if defined VSCOMNTOOLS (
+    goto found
+)
+
+if defined VS140COMNTOOLS set VSCOMNTOOLS=%VS140COMNTOOLS%
+if defined VS140COMNTOOLS goto found
+if defined VS120COMNTOOLS set VSCOMNTOOLS=%VS140COMNTOOLS%
+if defined VS120COMNTOOLS goto found
+if defined VS110COMNTOOLS set VSCOMNTOOLS=%VS140COMNTOOLS%
+if defined VS110COMNTOOLS goto found
+
+@echo ERROR: Could not locate command prompt devenv setup for anything between VS2012 and VS2017
+@set exit_code=127
+@goto end
 
-set VSDEVENV="%VSCOMNTOOLS%..\..\VC\vcvarsall.bat"
-@if not exist %VSDEVENV% goto error_no_vcvarsall
-@call %VSDEVENV%
+:found
+set VSDEVENV=%VSCOMNTOOLS%..\..\VC\vcvarsall.bat
+@if not exist "%VSDEVENV%" goto error_no_vcvarsall
+@call "%VSDEVENV%"
 @goto end
 
 :error_no_VS110COMNTOOLSDIR
 @echo ERROR: setup_vcpp cannot determine the location of the VS Common Tools folder.
+@set exit_code=1
 @goto end
 
 :error_no_vcvarsall
 @echo ERROR: Cannot find file %VSDEVENV%.
+@set exit_code=1
 @goto end
 
 :end
+exit /b %exit_code%