2181 project conversion issue (#2182)

* Fixes #2181 wrong test cases * Fixes #2181 project conversion issue
Open-Systems-Pharmacology · Apr 6, 2022 · 0261fa7 · 0261fa7
1 parent cfe7bda
commit 0261fa7
Show file tree

Hide file tree

Showing 20 changed files with 42 additions and 47 deletions.
diff --git a/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj b/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj
@@ -26,8 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.153" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.Assets/PKSim.Assets.csproj b/src/PKSim.Assets/PKSim.Assets.csproj
@@ -26,8 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.153" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.BatchTool/PKSim.BatchTool.csproj b/src/PKSim.BatchTool/PKSim.BatchTool.csproj
@@ -63,7 +63,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.47" GeneratePathProperty="true" />

diff --git a/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj b/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
@@ -28,7 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.CLI/PKSim.CLI.csproj b/src/PKSim.CLI/PKSim.CLI.csproj
@@ -61,8 +61,8 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.153" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.47" GeneratePathProperty="true" />

diff --git a/src/PKSim.Core/PKSim.Core.csproj b/src/PKSim.Core/PKSim.Core.csproj
@@ -30,10 +30,10 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.0.153" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/src/PKSim.Infrastructure/ORM/DAS/DAS.cs b/src/PKSim.Infrastructure/ORM/DAS/DAS.cs
@@ -232,7 +232,7 @@ public string DatabaseName
          get
          {
             if (IsConnected)
-               return String.IsNullOrEmpty(Connection.Database)
+               return string.IsNullOrEmpty(Connection.Database)
                   ? Connection.DataSource
                   : Connection.Database;
             throw new NotConnectedException();

diff --git a/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj b/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj
@@ -41,14 +41,14 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.13" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Infrastructure" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.0.153" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
   </ItemGroup>
 

diff --git a/src/PKSim.Infrastructure/Services/GeneExpressionQueries.cs b/src/PKSim.Infrastructure/Services/GeneExpressionQueries.cs
@@ -317,7 +317,7 @@ private void validateQuery(string columns, string query)
       /// <summary>
       ///    This method validates the schema of the database.
       /// </summary>
-      /// <exception cref="PKSimException">Thrown when an error occured.</exception>
+      /// <exception cref="PKSimException">Thrown when an error occurred.</exception>
       public void ValidateDatabase()
       {
          try

diff --git a/src/PKSim.Matlab/PKSim.Matlab.csproj b/src/PKSim.Matlab/PKSim.Matlab.csproj
@@ -27,7 +27,7 @@
 
   <ItemGroup>
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.Presentation/PKSim.Presentation.csproj b/src/PKSim.Presentation/PKSim.Presentation.csproj
@@ -29,8 +29,8 @@
   <ItemGroup>
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.R/PKSim.R.csproj b/src/PKSim.R/PKSim.R.csproj
@@ -50,7 +50,7 @@
 
   <ItemGroup>
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.47" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />

diff --git a/src/PKSim.UI/PKSim.UI.csproj b/src/PKSim.UI/PKSim.UI.csproj
@@ -51,9 +51,9 @@
     <PackageReference Include="OSPSuite.DataBinding.DevExpress" Version="6.0.0.2" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.UI" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.UI" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim/PKSim.csproj b/src/PKSim/PKSim.csproj
@@ -76,13 +76,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.47" 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="11.0.152" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.153" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
   </ItemGroup>
 

diff --git a/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj b/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj
@@ -23,7 +23,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.47" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />

diff --git a/tests/PKSim.R.Tests/PKSim.R.Tests.csproj b/tests/PKSim.R.Tests/PKSim.R.Tests.csproj
@@ -23,7 +23,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.47" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />

diff --git a/tests/PKSim.Tests/IntegrationTests/RenameBuildingBlockTaskSpecs.cs b/tests/PKSim.Tests/IntegrationTests/RenameBuildingBlockTaskSpecs.cs
@@ -47,9 +47,8 @@ public override void GlobalContext()
          LoadProject("BuildingBlockRename_611");
          _formulation = FindByName<Formulation>("Weibull");
          _oldName = _formulation.Name;
-         _formulation.Name = "NEW F";
          _simulation = FindByName<IndividualSimulation>("S3");
-         sut.RenameBuildingBlock(_formulation, _oldName);
+         sut.RenameBuildingBlock(_formulation, "NEW F");
       }
 
       [Observation]
@@ -91,11 +90,8 @@ public override void GlobalContext()
          _s2 = FindByName<IndividualSimulation>("S2");
          _s3 = FindByName<IndividualSimulation>("S3");
 
-         _iv.Name = "NEW_IV";
-         sut.RenameBuildingBlock(_iv, "IV");
-
-         _oral.Name = "NEW_ORAL";
-         sut.RenameBuildingBlock(_oral, "ORAL");
+         sut.RenameBuildingBlock(_iv, "NEW_IV");
+         sut.RenameBuildingBlock(_oral, "NEW_ORAL");
       }
 
       [Observation]
@@ -127,8 +123,7 @@ public override void GlobalContext()
          _iv = FindByName<Protocol>("aa");
          _s1 = FindByName<IndividualSimulation>("aa");
 
-         _iv.Name = "bb";
-         sut.RenameBuildingBlock(_iv, "IV");
+         sut.RenameBuildingBlock(_iv, "bb");
       }
 
       [Observation]

diff --git a/tests/PKSim.Tests/PKSim.Tests.csproj b/tests/PKSim.Tests/PKSim.Tests.csproj
@@ -21,7 +21,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.47" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />

diff --git a/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj b/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj
@@ -56,13 +56,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.47" 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="11.0.152" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.153" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
   </ItemGroup>
 

diff --git a/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj b/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj
@@ -18,8 +18,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="nunit" Version="3.13.2" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.152" />
-    <PackageReference Include="OSPSuite.UI" Version="11.0.152" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.153" />
+    <PackageReference Include="OSPSuite.UI" Version="11.0.153" />
   </ItemGroup>
 
   <ItemGroup>