Merge branch 'r-sharp-r6' of https://github.com/Open-Systems-Pharmaco…

…logy/OSPSuite-R into r-sharp-r6

# Conflicts:
#	DESCRIPTION

.github/workflows/bump-dev-version.yaml

@@ -39,10 +39,15 @@ jobs:
           }
         shell: Rscript {0}
 
-      - name: commit modified DESCRIPTION file
-        uses: EndBug/add-and-commit@v9
+      - name: Get package version from DESCRIPTION file and set as environment variable
+        run: |
+          echo "PKG_VERSION=$(grep -oP '(?<=Version: )\d+\.\d+\.\d+\.*\d*' DESCRIPTION)" >> $GITHUB_ENV
+        shell: bash
+
+      - uses: EndBug/add-and-commit@v9
         if: ${{ success() }}
         with:
-          message: '🤖 Bump development version. [skip actions]'
+          message: '🤖 Bump version. [skip actions]'
           default_author: github_actions
           add: 'DESCRIPTION'
+          tag: 'v${{ env.PKG_VERSION }}'

inst/lib/ConsoleApp.deps.json

@@ -9,7 +9,7 @@
       "ConsoleApp/1.0.0": {
         "dependencies": {
           "OSPSuite.R": "12.0.297",
-          "PKSim.R": "12.0.288"
+          "PKSim.R": "12.0.289"
         },
         "runtime": {
           "ConsoleApp.dll": {}
@@ -1302,7 +1302,7 @@
           "System.Xml.ReaderWriter": "4.3.0"
         }
       },
-      "PKSim.Assets/12.0.288": {
+      "PKSim.Assets/12.0.289": {
         "dependencies": {
           "OSPSuite.Assets": "12.0.298",
           "OSPSuite.Assets.Images": "12.0.298",
@@ -1312,7 +1312,7 @@
           "PKSim.Assets.dll": {}
         }
       },
-      "PKSim.Assets.Images/12.0.288": {
+      "PKSim.Assets.Images/12.0.289": {
         "dependencies": {
           "OSPSuite.Assets": "12.0.298",
           "OSPSuite.Assets.Images": "12.0.298"
@@ -1321,33 +1321,33 @@
           "PKSim.Assets.Images.dll": {}
         }
       },
-      "PKSim.CLI.Core/12.0.288": {
+      "PKSim.CLI.Core/12.0.289": {
         "dependencies": {
           "OSPSuite.Assets": "12.0.298",
           "OSPSuite.Core": "12.0.298",
           "OSPSuite.Utility": "4.1.0.5",
-          "PKSim.Core": "12.0.288"
+          "PKSim.Core": "12.0.289"
         },
         "runtime": {
           "PKSim.CLI.Core.dll": {}
         }
       },
-      "PKSim.Core/12.0.288": {
+      "PKSim.Core/12.0.289": {
         "dependencies": {
           "Newtonsoft.Json": "12.0.3",
           "OSPSuite.Assets": "12.0.298",
           "OSPSuite.Assets.Images": "12.0.298",
           "OSPSuite.Core": "12.0.298",
           "OSPSuite.Infrastructure.Import": "12.0.298",
           "OSPSuite.Utility": "4.1.0.5",
-          "PKSim.Assets": "12.0.288",
+          "PKSim.Assets": "12.0.289",
           "System.ComponentModel.Annotations": "4.7.0"
         },
         "runtime": {
           "PKSim.Core.dll": {}
         }
       },
-      "PKSim.Infrastructure/12.0.288": {
+      "PKSim.Infrastructure/12.0.289": {
         "dependencies": {
           "FluentNHibernate": "2.1.2",
           "LumenWorksCsvReader": "4.0.0",
@@ -1366,40 +1366,40 @@
           "OSPSuite.Infrastructure.Serialization": "12.0.298",
           "OSPSuite.Presentation.Serialization": "12.0.298",
           "OSPSuite.Utility": "4.1.0.5",
-          "PKSim.Assets": "12.0.288",
-          "PKSim.Core": "12.0.288",
-          "PKSim.Presentation": "12.0.288"
+          "PKSim.Assets": "12.0.289",
+          "PKSim.Core": "12.0.289",
+          "PKSim.Presentation": "12.0.289"
         },
         "runtime": {
           "PKSim.Infrastructure.dll": {}
         }
       },
-      "PKSim.Presentation/12.0.288": {
+      "PKSim.Presentation/12.0.289": {
         "dependencies": {
           "OSPSuite.Assets": "12.0.298",
           "OSPSuite.Core": "12.0.298",
           "OSPSuite.Presentation": "12.0.298",
           "OSPSuite.TeXReporting": "3.0.0.5",
           "OSPSuite.Utility": "4.1.0.5",
-          "PKSim.Assets": "12.0.288",
-          "PKSim.Assets.Images": "12.0.288",
-          "PKSim.Core": "12.0.288"
+          "PKSim.Assets": "12.0.289",
+          "PKSim.Assets.Images": "12.0.289",
+          "PKSim.Core": "12.0.289"
         },
         "runtime": {
           "PKSim.Presentation.dll": {}
         }
       },
-      "PKSim.R/12.0.288": {
+      "PKSim.R/12.0.289": {
         "dependencies": {
           "OSPSuite.Assets": "12.0.298",
           "OSPSuite.Core": "12.0.298",
           "OSPSuite.FuncParser": "4.0.0.54",
           "OSPSuite.SimModel": "4.0.0.56",
           "OSPSuite.SimModelSolver_CVODES": "4.1.0.8",
           "OSPSuite.Utility": "4.1.0.5",
-          "PKSim.CLI.Core": "12.0.288",
-          "PKSim.Core": "12.0.288",
-          "PKSim.Infrastructure": "12.0.288",
+          "PKSim.CLI.Core": "12.0.289",
+          "PKSim.Core": "12.0.289",
+          "PKSim.Infrastructure": "12.0.289",
           "System.Data.SQLite.Core": "1.0.112"
         },
         "runtime": {
@@ -2254,37 +2254,37 @@
       "path": "system.xml.xmldocument/4.3.0",
       "hashPath": "system.xml.xmldocument.4.3.0.nupkg.sha512"
     },
-    "PKSim.Assets/12.0.288": {
+    "PKSim.Assets/12.0.289": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "PKSim.Assets.Images/12.0.288": {
+    "PKSim.Assets.Images/12.0.289": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "PKSim.CLI.Core/12.0.288": {
+    "PKSim.CLI.Core/12.0.289": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "PKSim.Core/12.0.288": {
+    "PKSim.Core/12.0.289": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "PKSim.Infrastructure/12.0.288": {
+    "PKSim.Infrastructure/12.0.289": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "PKSim.Presentation/12.0.288": {
+    "PKSim.Presentation/12.0.289": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "PKSim.R/12.0.288": {
+    "PKSim.R/12.0.289": {
       "type": "project",
       "serviceable": false,
       "sha512": ""