573 update core (#577)

* Fixes #573 Fixes #572 Fixes #574 * Fixes #573 update core
Open-Systems-Pharmacology · Jun 29, 2021 · 919b82b · 919b82b
1 parent 2f30cf6
commit 919b82b
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 33 deletions.
diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj
@@ -26,9 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-     <PackageReference Include="OSPSuite.Assets" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Core" Version="10.0.233" />
+     <PackageReference Include="OSPSuite.Assets" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Core" Version="10.0.261" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj
@@ -60,10 +60,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Core" Version="10.0.233" />
+    <PackageReference Include="OSPSuite.Core" Version="10.0.261" />
     <PackageReference Include="OSPSuite.DevExpress" Version="20.1.6" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.50" GeneratePathProperty="true" />
-    <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.43" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" GeneratePathProperty="true" />
   </ItemGroup>

diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj
@@ -31,13 +31,13 @@
     <PackageReference Include="FluentNHibernate" Version="2.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Assets" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="10.0.233" />
+    <PackageReference Include="OSPSuite.Core" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Assets" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="10.0.261" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/src/MoBi.Engine/MoBi.Engine.csproj b/src/MoBi.Engine/MoBi.Engine.csproj
@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-     <PackageReference Include="OSPSuite.Core" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Assets" Version="10.0.233" />
+     <PackageReference Include="OSPSuite.Core" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Assets" Version="10.0.261" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj
@@ -28,12 +28,12 @@
     <PackageReference Include="Northwoods.GoWin" Version="5.2.0" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Presentation" Version="10.0.233" />
+    <PackageReference Include="OSPSuite.Presentation" Version="10.0.261" />
     <PackageReference Include="OSPSuite.Presentation.Importer" Version="10.0.92" />
-    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="10.0.233" />
+    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="10.0.261" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="10.0.233" />  
+    <PackageReference Include="OSPSuite.Core" Version="10.0.261" />  
    </ItemGroup>
   <ItemGroup>
     <None Include="..\..\LICENSE">

diff --git a/src/MoBi.Presentation/Tasks/ObservedDataTask.cs b/src/MoBi.Presentation/Tasks/ObservedDataTask.cs
@@ -442,7 +442,7 @@ private void addNamingPatterns(DimensionInfo.DataImporterSettings dataImporterSe
             Constants.ObservedData.GENDER,
             Constants.ObservedData.DOSE,
             Constants.ObservedData.ROUTE,
-            Constants.ObservedData.PATIENT_ID
+            Constants.ObservedData.SUBJECT_ID
          );
       }
 

diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj
@@ -27,13 +27,13 @@
     <PackageReference Include="OSPSuite.DataBinding.DevExpress" Version="5.0.0.1" />
     <PackageReference Include="OSPSuite.DevExpress" Version="20.1.6" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Infrastructure" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Presentation" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.UI" Version="10.0.233" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Presentation" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.UI" Version="10.0.261" />
     <PackageReference Include="OSPSuite.UI.Importer" Version="10.0.92" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="10.0.233" />
+    <PackageReference Include="OSPSuite.Core" Version="10.0.261" />
    </ItemGroup>
   <ItemGroup>
     <None Include="..\..\LICENSE">

diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj
@@ -68,13 +68,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Core" Version="10.0.233" />
+    <PackageReference Include="OSPSuite.Core" Version="10.0.261" />
     <PackageReference Include="OSPSuite.DevExpress" Version="20.1.6" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.50" GeneratePathProperty="true" />
-    <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.43" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" GeneratePathProperty="true" />
-    <PackageReference Include="OSPSuite.Presentation" Version="10.0.233" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="10.0.261" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
 
   </ItemGroup>

diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj
@@ -45,12 +45,12 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Infrastructure" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.UI" Version="10.0.233" />
+    <PackageReference Include="OSPSuite.Core" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.UI" Version="10.0.261" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.50" GeneratePathProperty="true" />
-    <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.43" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />

diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj
@@ -17,8 +17,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="10.0.233" />
-    <PackageReference Include="OSPSuite.UI" Version="10.0.233" />
+    <PackageReference Include="OSPSuite.Core" Version="10.0.261" />
+    <PackageReference Include="OSPSuite.UI" Version="10.0.261" />
    </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\MoBi.Core\MoBi.Core.csproj" />