Open-Systems-Pharmacology · Felixmil · May 13, 2024 · Apr 25, 2024 · Apr 25, 2024 · Apr 25, 2024
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -1,10 +1,11 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
-# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [main, master, develop]
-  pull_request:
-    branches: [main, master, develop]
+    branches: [main]
+  workflow_run:
+    workflows: ["build-c#-binaries"]
+    types:
+      - completed
+  workflow_dispatch:
 
 name: R-CMD-check
 
@@ -22,7 +23,7 @@ jobs:
           - {os: windows-latest, r: 'release'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
-          - {os: ubuntu-latest,   r: 'oldrel-1'}
+          # - {os: ubuntu-latest,   r: 'oldrel-1'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/build-c#.yaml b/.github/workflows/build-c#.yaml
@@ -0,0 +1,107 @@
+on:
+  pull_request:
+    branches: [main, master]
+  workflow_dispatch:
+
+name: build-c#-binaries
+
+jobs:
+  Linux-Build:
+
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        if: ${{ github.event_name == 'pull_request' }}
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - uses: actions/checkout@v4
+        if: ${{ github.event_name != 'pull_request' }}
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+        # documentation: https://github.com/actions/setup-dotnet
+
+      - name: Make
+        working-directory: ./shared
+        run: make
+
+      - name: Setup R
+        uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+      - name: Test C# binaries
+        run: |
+          export R_HOME=/usr/lib/R
+          dotnet test ./shared/RDotNet.Tests/ -c Release -d log.txt --no-build
+          dotnet test ./shared/rSharpTests/ -c Release -d log.txt --no-build
+          dotnet test ./shared/DynamicInterop.Tests/ -c Release -d log.txt --no-build
+
+      - uses: EndBug/add-and-commit@v9
+        if: ${{ success() }}
+        with:
+          default_author: github_actions
+          add: '*.so'
+
+  Windows-Build:
+    needs: Linux-Build
+    runs-on: windows-latest
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        if: ${{ github.event_name == 'pull_request' }}
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - uses: actions/checkout@v4
+        if: ${{ github.event_name != 'pull_request' }}
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+        # documentation: https://github.com/actions/setup-dotnet
+
+      - name: Setup R
+        uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+
+      - name: Install dependencies
+        run: |
+          nuget restore ./shared/packages.config -PackagesDirectory ./shared/packages
+          dotnet restore ./shared/rSharp.sln
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Build C# binaries
+        run: |
+          $env:R_INSTALL_PATH="C:\R"
+          msbuild ./shared/rSharp.sln -t:rebuild /p:Configuration=Release /p:Platform=x64
+
+      - name: Test C# binaries
+        run: |
+          dotnet test .\shared\RDotNet.Tests\ -c Release -d log.txt --no-build
+          dotnet test .\shared\rSharpTests\ -c Release -d log.txt --no-build
+          dotnet test .\shared\DynamicInterop.Tests\ -c Release -d log.txt --no-build
+
+
+      - uses: EndBug/add-and-commit@v9
+        if: ${{ success() }}
+        with:
+          default_author: github_actions
+          add: '*.dll'
diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -1,12 +1,10 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
-# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [main, master, develop]
-  pull_request:
-    branches: [main, master, develop]
-  release:
-    types: [published]
+    branches: [main]
+  workflow_run:
+    workflows: ["build-c#-binaries"]
+    types:
+      - completed
   workflow_dispatch:
 
 name: pkgdown

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -1,10 +1,11 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
-# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches: [main, master, develop]
-  pull_request:
-    branches: [main, master, develop]
+    branches: [main]
+  workflow_run:
+    workflows: ["build-c#-binaries"]
+    types:
+      - completed
+  workflow_dispatch:
 
 name: test-coverage
 

diff --git a/inst/extdata/rSharp.Examples.dll b/inst/extdata/rSharp.Examples.dll
diff --git a/inst/lib/ClrFacade.dll b/inst/lib/ClrFacade.dll
diff --git a/inst/lib/DynamicInterop.dll b/inst/lib/DynamicInterop.dll
diff --git a/inst/lib/RDotNet.dll b/inst/lib/RDotNet.dll
diff --git a/inst/lib/RSharp.runtimeconfig.json b/inst/lib/RSharp.runtimeconfig.json
@@ -1,12 +1,12 @@
-{
-  "runtimeOptions": {
-    "tfm": "net8.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "8.0.0"
-    },
-    "configProperties": {
-      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": true
-    }
-  }
-}
+{
+  "runtimeOptions": {
+    "tfm": "net8.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "8.0.0"
+    },
+    "configProperties": {
+      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": true
+    }
+  }
+}
diff --git a/inst/lib/rSharp.dll b/inst/lib/rSharp.dll
diff --git a/shared/ClrFacade/ClrFacade.csproj b/shared/ClrFacade/ClrFacade.csproj
@@ -1,37 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{024B0C26-BED0-467D-B332-E9796B756133}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <Version>1.0.0</Version>
-    <Copyright></Copyright>
-    <Description>.NET interoperability on top of R.NET for the rSharp package</Description>
-    <Product>$(AssemblyName)</Product>
-    <Company />
-    <Authors>Open-Systems-Pharmacology</Authors>
-    <Title>rSharp; embed .NET in R</Title>
-    <PackageLicenseUrl>https://github.com/Open-Systems-Pharmacology/rsharp/blob/master/License.txt</PackageLicenseUrl>
-    <RepositoryUrl>https://github.com/Open-Systems-Pharmacology/rsharp</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/Open-Systems-Pharmacology/rsharp</PackageProjectUrl>
-    <PackageReleaseNotes></PackageReleaseNotes>
-    <!-- forces SDK to copy dependencies into build output to make packing easier -->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>default</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\R.NET\RDotNet.csproj" />
-  </ItemGroup>
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <ItemGroup>
-      <AssemblyFiles Include="$(TargetDir)*.dll" />
-      <ConfigFiles Include="$(SolutionDir)*.runtimeconfig.json" />
-    </ItemGroup>
-    <Copy SourceFiles="@(AssemblyFiles); @(ConfigFiles)" DestinationFolder="$(SolutionDir)..\inst\lib\" />
-  </Target>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{024B0C26-BED0-467D-B332-E9796B756133}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <Version>1.0.0</Version>
+    <Copyright></Copyright>
+    <Description>.NET interoperability on top of R.NET for the rSharp package</Description>
+    <Product>$(AssemblyName)</Product>
+    <Company />
+    <Authors>Open-Systems-Pharmacology</Authors>
+    <Title>rSharp; embed .NET in R</Title>
+    <PackageLicenseUrl>https://github.com/Open-Systems-Pharmacology/rsharp/blob/master/License.txt</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/Open-Systems-Pharmacology/rsharp</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/Open-Systems-Pharmacology/rsharp</PackageProjectUrl>
+    <PackageReleaseNotes></PackageReleaseNotes>
+    <!-- forces SDK to copy dependencies into build output to make packing easier -->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>default</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\R.NET\RDotNet.csproj" />
+  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <ItemGroup>
+      <AssemblyFiles Include="$(TargetDir)*.dll" />
+      <ConfigFiles Include="$(SolutionDir)*.runtimeconfig.json" />
+    </ItemGroup>
+    <Copy SourceFiles="@(AssemblyFiles); @(ConfigFiles)" DestinationFolder="$(SolutionDir)..\inst\lib\" />
+  </Target>
+</Project>
diff --git a/shared/DynamicInterop.Tests/DynamicInterop.Tests.csproj b/shared/DynamicInterop.Tests/DynamicInterop.Tests.csproj
@@ -1,37 +1,40 @@
-<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <EnableUnmanagedDebugging Condition=" '$(Configuration)' == 'Debug' ">true</EnableUnmanagedDebugging>
-    <ProjectGuid>{CA934BF8-EC5B-49F5-8F52-25F3B11072E6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <Version>0.8.2</Version>
-    <Description>DynamicInterop unit tests</Description>
-    <Authors>Jean-Michel Perraud</Authors>
-    <PackageReleaseNotes>Migration to .NET Standard 2.0</PackageReleaseNotes>
-    <ApplicationIcon />
-    <StartupObject />
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Remove="test_native_library\**" />
-    <EmbeddedResource Remove="test_native_library\**" />
-    <None Remove="test_native_library\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0"></PackageReference>
-    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
-    <!-- Notice that xunit.assert, xunit.core, etc. are imported automatically.-->
-  </ItemGroup> 
-  <ItemGroup>
-    <ProjectReference Include="..\DynamicInterop\DynamicInterop.csproj">
-    </ProjectReference>
-  </ItemGroup> 
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <EnableUnmanagedDebugging Condition=" '$(Configuration)' == 'Debug' ">true</EnableUnmanagedDebugging>
+    <ProjectGuid>{CA934BF8-EC5B-49F5-8F52-25F3B11072E6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>0.8.2</Version>
+    <Description>DynamicInterop unit tests</Description>
+    <Authors>Jean-Michel Perraud</Authors>
+    <PackageReleaseNotes>Migration to .NET Standard 2.0</PackageReleaseNotes>
+    <ApplicationIcon />
+    <StartupObject />
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="test_native_library\**" />
+    <EmbeddedResource Remove="test_native_library\**" />
+    <None Remove="test_native_library\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0"></PackageReference>
+    <PackageReference Include="xunit" Version="2.8.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <!-- Notice that xunit.assert, xunit.core, etc. are imported automatically.-->
+  </ItemGroup> 
+  <ItemGroup>
+    <ProjectReference Include="..\DynamicInterop\DynamicInterop.csproj">
+    </ProjectReference>
+  </ItemGroup> 
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
 </Project>