Fixes #1933 Add urine compartment (#2049)

* Work in DB. Add event and event group * WIP #1933 add urine compartment emptying * Remove reference to gall bladder immediate * Remove Gallbladder emptying (immediate) event group not used anymiore * Fixes #1933 add uring compartment emptying * Add tests * Fixes #1933 add urine compartment emptying * Fixes failing test
Open-Systems-Pharmacology · Jan 18, 2022 · 69f4c8e · 69f4c8e
1 parent 7cabd68
commit 69f4c8e
Show file tree

Hide file tree

Showing 31 changed files with 322 additions and 5,222 deletions.
diff --git a/src/Db/Diff/PKSimDB_diff.txt b/src/Db/Diff/PKSimDB_diff.txt
diff --git a/src/Db/Dump/PKSimDB_dump.txt b/src/Db/Dump/PKSimDB_dump.txt
diff --git a/src/Db/PKSimDB.sqlite b/src/Db/PKSimDB.sqlite
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.27" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.27" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.40" />
   </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.27" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.27" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.40" />
   </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.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" 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.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
   </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.27" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.0.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.40" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />

diff --git a/src/PKSim.Core/CoreConstants.cs b/src/PKSim.Core/CoreConstants.cs
@@ -256,11 +256,6 @@ public static class Route
          }
       }
 
-      public static class EventGroup
-      {
-         public static readonly string EHCImmediate = "Gallbladder emptying (immediate)";
-      }
-
       public static class Category
       {
          public static readonly string DynamicFormulas = "DynamicFormulas";

diff --git a/src/PKSim.Core/Model/UnknownDistributionFormula.cs b/src/PKSim.Core/Model/UnknownDistributionFormula.cs
@@ -7,7 +7,7 @@ namespace PKSim.Core.Model
 {
    public class UnknownDistributionFormula : DistributionFormula
    {
-      protected override double CalculateFor(IEnumerable<IObjectReference> usedObjects, IUsingFormula dependentObject)
+      protected override double CalculateFor(IReadOnlyList<IObjectReference> usedObjects, IUsingFormula dependentObject)
       {
          return double.NaN;
       }

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.27" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.0.27" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.27" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.0.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.0.40" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/src/PKSim.Core/Repositories/IEventGroupRepository.cs b/src/PKSim.Core/Repositories/IEventGroupRepository.cs
@@ -9,11 +9,6 @@ namespace PKSim.Core.Repositories
    /// </summary>
    public interface IEventGroupRepository : IStartableRepository<IEventGroupBuilder>
    {
-      /// <summary>
-      ///    Returns all event groups which can be created by user
-      ///    <para></para>
-      ///    (some event groups are e.g. only used for project conversion)
-      /// </summary>
-      IEnumerable<IEventGroupBuilder> AllForCreationByUser();
+
    }
 }
diff --git a/src/PKSim.Infrastructure/ORM/Repositories/EventGroupRepository.cs b/src/PKSim.Infrastructure/ORM/Repositories/EventGroupRepository.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using OSPSuite.Utility.Collections;
-using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.Builder;
 using PKSim.Core;
 using PKSim.Core.Repositories;
@@ -15,7 +14,9 @@ public class EventGroupRepository : StartableRepository<IEventGroupBuilder>, IEv
       private readonly IFlatContainerToEventGroupBuilderMapper _eventGroupMapper;
       private readonly ICache<string, IEventGroupBuilder> _eventGroupBuilders;
 
-      public EventGroupRepository(IFlatContainerRepository flatContainerRepo, IFlatContainerToEventGroupBuilderMapper eventGroupMapper)
+      public EventGroupRepository(
+         IFlatContainerRepository flatContainerRepo, 
+         IFlatContainerToEventGroupBuilderMapper eventGroupMapper)
       {
          _flatContainerRepo = flatContainerRepo;
          _eventGroupMapper = eventGroupMapper;
@@ -39,15 +40,5 @@ protected override void DoStart()
             _eventGroupBuilders.Add(eventGroupBuilder);
          }
       }
-
-      public IEnumerable<IEventGroupBuilder> AllForCreationByUser()
-      {
-         return All().Where(canBeCreatedByUser);
-      }
-
-      private bool canBeCreatedByUser(IEventGroupBuilder eventGroup)
-      {
-         return !eventGroup.IsNamed(CoreConstants.EventGroup.EHCImmediate);
-      }
    }
 }
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.27" />
-    <PackageReference Include="OSPSuite.Infrastructure" Version="11.0.27" />
-    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.0.27" />
-    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.0.27" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.0.27" />
-    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.0.27" />
-    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.0.27" />
-    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.0.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.0.40" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
   </ItemGroup>
 

diff --git a/src/PKSim.Infrastructure/Reporting/Summary/SimpleProtocolReportBuilder.cs b/src/PKSim.Infrastructure/Reporting/Summary/SimpleProtocolReportBuilder.cs
@@ -20,8 +20,8 @@ public SimpleProtocolReportBuilder(IReportGenerator reportGenerator)
       protected override void FillUpReport(SimpleProtocol simpleProtocol, ReportPart reportPart)
       {
          reportPart.Title = PKSimConstants.UI.SimpleProtocolMode;
-         reportPart.AddToContent(simpleProtocol.ApplicationType.DisplayName);
-         reportPart.AddToContent(PKSimConstants.UI.ReportIs(PKSimConstants.UI.DosingInterval, simpleProtocol.DosingInterval.DisplayName));
+         reportPart.AddToContent(simpleProtocol.ApplicationType?.DisplayName);
+         reportPart.AddToContent(PKSimConstants.UI.ReportIs(PKSimConstants.UI.DosingInterval, simpleProtocol.DosingInterval?.DisplayName));
 
          simpleProtocol.AllParameters().Where(simpleProtocol.ParameterShouldBeExported)
             .Each(x => reportPart.AddToContent(_reportGenerator.ReportFor(x)));

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.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.Presentation/DTO/Parameters/ParameterDTO.cs b/src/PKSim.Presentation/DTO/Parameters/ParameterDTO.cs
@@ -78,9 +78,9 @@ public virtual double Value
       {
          get
          {
-            var success = Parameter.TryGetValueInDisplayUnit(out var result);
+            var (result,_) = Parameter.TryGetValueInDisplayUnit();
             //Permeability cannot be read in compound as references cannot be resolved
-            return success ? result : double.NaN;
+            return result;
 
          }
          set

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.27" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.27" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.Presentation/Presenters/Events/EventSettingsPresenter.cs b/src/PKSim.Presentation/Presenters/Events/EventSettingsPresenter.cs
@@ -82,7 +82,7 @@ public override void ReleaseFrom(IEventPublisher eventPublisher)
 
       public IEnumerable<IEventGroupBuilder> AllTemplates()
       {
-         return _eventGroupRepository.AllForCreationByUser();
+         return _eventGroupRepository.All();
       }
 
       public string DisplayNameFor(IEventGroupBuilder eventTemplate)

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.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" 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" />

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.27" />
-    <PackageReference Include="OSPSuite.UI" Version="11.0.27" />
-    <PackageReference Include="OSPSuite.Core" Version="11.0.27" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.UI" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
   </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.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" 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="11.0.27" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.40" 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.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" 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" />

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.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" 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" />

diff --git a/tests/PKSim.Tests/CoreConstantsForSpecs.cs b/tests/PKSim.Tests/CoreConstantsForSpecs.cs
@@ -34,6 +34,10 @@ public static class Process
          public static readonly string LIVERMICROSOMERES = "LiverMicrosomeRes";
       }
 
+      public static class Events
+      {
+         public const string URINARY_BLADDER_EMPTYING = "Urinary bladder emptying";
+      }
       public static class Parameters
       {
          public const string KINACT = "kinact";

diff --git a/tests/PKSim.Tests/IntegrationTests/SimulationsWithEventsSpecs.cs b/tests/PKSim.Tests/IntegrationTests/SimulationsWithEventsSpecs.cs
@@ -0,0 +1,43 @@
+using FakeItEasy;
+using OSPSuite.BDDHelper;
+using OSPSuite.BDDHelper.Extensions;
+using OSPSuite.Core.Domain;
+using OSPSuite.Core.Domain.Builder;
+using OSPSuite.Utility.Container;
+using OSPSuite.Utility.Extensions;
+using PKSim.Core.Model;
+using PKSim.Core.Repositories;
+using PKSim.Infrastructure;
+using IContainer = OSPSuite.Core.Domain.IContainer;
+
+namespace PKSim.IntegrationTests
+{
+   public abstract class concern_for_SimulationsWithEvents : concern_for_IndividualSimulation
+   {
+
+      public override void GlobalContext()
+      {
+         base.GlobalContext();
+         var eventMappingFactory = IoC.Resolve<IEventMappingFactory>();
+         var eventFactory = IoC.Resolve<IEventFactory>();
+
+         _simulation = DomainFactoryForSpecs.CreateModelLessSimulationWith(_individual, _compound, _protocol).DowncastTo<IndividualSimulation>() ;
+         var pksimEvent = eventFactory.Create(CoreConstantsForSpecs.Events.URINARY_BLADDER_EMPTYING).WithName("Event");
+         var eventMapping = eventMappingFactory.Create(pksimEvent);
+         eventMapping.StartTime.ValueInDisplayUnit = 2;
+         _simulation.AddUsedBuildingBlock(new UsedBuildingBlock(pksimEvent.Id, PKSimBuildingBlockType.Event){BuildingBlock = pksimEvent});
+         _simulation.EventProperties.AddEventMapping(eventMapping);
+      }
+   }
+
+   public class When_creating_a_simulation_with_the_urine_emptying_event : concern_for_SimulationsWithEvents
+   {
+      [Observation]
+      public void should_be_able_to_create_a_simulation()
+      {
+         DomainFactoryForSpecs.AddModelToSimulation(_simulation);
+         var simEvent = _simulation.Model.Root.EntityAt<IContainer>(Constants.EVENTS, "Event");
+         simEvent.ShouldNotBeNull();
+      }
+   }
+}
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.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" 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" />

diff --git a/tests/PKSim.Tests/Presentation/EventSettingsPresenterSpecs.cs b/tests/PKSim.Tests/Presentation/EventSettingsPresenterSpecs.cs
@@ -88,7 +88,6 @@ protected override void Context()
          _temp2 = new EventGroupBuilder();
          _allTemplates = new List<IEventGroupBuilder> {_temp1, _temp2};
          A.CallTo(() => _eventGroupRepository.All()).Returns(_allTemplates);
-         A.CallTo(() => _eventGroupRepository.AllForCreationByUser()).Returns(_allTemplates);
       }
 
       [Observation]

diff --git a/tests/PKSim.Tests/Presentation/ParameterDTOSpecs.cs b/tests/PKSim.Tests/Presentation/ParameterDTOSpecs.cs
@@ -141,10 +141,8 @@ protected override void Context()
          base.Context();
          _parameter.Value = 20;
          _convertedValue = 30;
-         double res;
-         A.CallTo(() => _parameter.TryGetValueInDisplayUnit(out res))
-            .Returns(true)
-            .AssignsOutAndRefParameters(_convertedValue);
+         A.CallTo(() => _parameter.TryGetValueInDisplayUnit())
+            .Returns((_convertedValue, true));
       }
 
       [Observation]

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.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" 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="11.0.27" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.40" 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.27" />
-    <PackageReference Include="OSPSuite.UI" Version="11.0.27" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.40" />
+    <PackageReference Include="OSPSuite.UI" Version="11.0.40" />
   </ItemGroup>
 
   <ItemGroup>