Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to core 12.0.170 #2604

Merged
merged 1 commit into from
Apr 25, 2023
Merged

update to core 12.0.170 #2604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/PKSim.Assets.Images/PKSim.Assets.Images.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.170" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Assets/PKSim.Assets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.170" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.BatchTool/PKSim.BatchTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<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.53" GeneratePathProperty="true" />
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.CLI/PKSim.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.170" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<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.53" GeneratePathProperty="true" />
Expand Down
8 changes: 4 additions & 4 deletions src/PKSim.Core/PKSim.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.166" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.170" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.170" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.Core/Services/ReactionBuildingBlockCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ public ReactionBuildingBlock CreateFor(Simulation simulation)
var simulationConfiguration = new SimulationConfiguration();
var module = new Module
{
PassiveTransports = new PassiveTransportBuildingBlock()
new PassiveTransportBuildingBlock()
};

var (molecules, reactions) = _moleculesAndReactionsCreator.CreateFor(module, simulation);
module.Molecules = molecules;
module.Reactions = reactions;
module.Add(molecules);
module.Add(reactions);

simulationConfiguration.AddModuleConfiguration(new ModuleConfiguration(module));
return module.Reactions;
Expand Down
16 changes: 8 additions & 8 deletions src/PKSim.Core/Services/SimulationConfigurationTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public SimulationConfiguration CreateFor(Simulation simulation, bool shouldValid
var moduleConfiguration = new ModuleConfiguration(module);
simulationConfiguration.AddModuleConfiguration(moduleConfiguration);
//STEP1: Create spatial structure
module.SpatialStructure = _spatialStructureFactory.CreateFor(individual, simulation);
module.Add(_spatialStructureFactory.CreateFor(individual, simulation));

//STEP2: add used calculation method to the build configuration
_moleculeCalculationRetriever.AllMoleculeCalculationMethodsUsedBy(simulation).Each(simulationConfiguration.AddCalculationMethod);
Expand All @@ -93,25 +93,25 @@ public SimulationConfiguration CreateFor(Simulation simulation, bool shouldValid
individual.AllExpressionProfiles().MapAllUsing(_expressionProfileBuildingBlockMapper).Each(simulationConfiguration.AddExpressionProfile);

//STEP5: Add Passive Transports
module.PassiveTransports = _modelPassiveTransportQuery.AllPassiveTransportsFor(simulation);
module.Add(_modelPassiveTransportQuery.AllPassiveTransportsFor(simulation));

//STEP6 : Molecules, and Molecule Start and reactions are generated in one go from the molecule and reaction creator
var (molecules, reactions) = _moleculesAndReactionsCreator.CreateFor(module, simulation);
module.Molecules = molecules;
module.Reactions = reactions;
module.Add(molecules);
module.Add(reactions);

//STEP7 Add Application, Formulation and events
module.EventGroups = _eventBuildingBlockCreator.CreateFor(simulation);
module.Add(_eventBuildingBlockCreator.CreateFor(simulation));

//STEP8: Add Observers
module.Observers = _modelObserverQuery.AllObserversFor(module.Molecules, simulation);
module.Add(_modelObserverQuery.AllObserversFor(module.Molecules, simulation));

//STEP9 once all building blocks have been created, we need to create the default parameter and molecule values values
var moleculeStartValues = _moleculeStartValuesCreator.CreateFor(module, simulation);
module.AddMoleculeStartValueBlock(moleculeStartValues);
module.Add(moleculeStartValues);

var parameterStartValues = _parameterStartValuesCreator.CreateFor(simulation);
module.AddParameterStartValueBlock(parameterStartValues);
module.Add(parameterStartValues);

moduleConfiguration.SelectedParameterStartValues = parameterStartValues;
moduleConfiguration.SelectedMoleculeStartValues = moleculeStartValues;
Expand Down
18 changes: 9 additions & 9 deletions src/PKSim.Infrastructure/PKSim.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
<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.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.0.166" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="12.0.166" />
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="12.0.166" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.166" />
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="12.0.166" />
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="12.0.166" />
<PackageReference Include="OSPSuite.Presentation.Serialization" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.0.170" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="12.0.170" />
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="12.0.170" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.170" />
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="12.0.170" />
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="12.0.170" />
<PackageReference Include="OSPSuite.Presentation.Serialization" Version="12.0.170" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Matlab/PKSim.Matlab.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.Presentation/PKSim.Presentation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.170" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.R/PKSim.R.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@


<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
Expand Down
8 changes: 4 additions & 4 deletions src/PKSim.UI.Starter/PKSim.UI.Starter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Presentation" Version="12.0.166" />
<PackageReference Include="OSPSuite.UI" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.0.166" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.170" />
<PackageReference Include="OSPSuite.UI" Version="12.0.170" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.0.170" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/PKSim.UI/PKSim.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.DataBinding" Version="3.0.0.4" />
<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="12.0.166" />
<PackageReference Include="OSPSuite.UI" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.170" />
<PackageReference Include="OSPSuite.UI" Version="12.0.170" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim/PKSim.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
<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.53" 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="12.0.166" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.170" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
Expand Down
4 changes: 2 additions & 2 deletions tests/PKSim.R.Tests/PKSim.R.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
Expand Down
2 changes: 1 addition & 1 deletion tests/PKSim.Tests/PKSim.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
Expand Down
6 changes: 3 additions & 3 deletions tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="nunit" Version="3.13.2" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.166" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.170" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.Core" Version="12.0.166" />
<PackageReference Include="OSPSuite.UI" Version="12.0.166" />
<PackageReference Include="OSPSuite.Core" Version="12.0.170" />
<PackageReference Include="OSPSuite.UI" Version="12.0.170" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" GeneratePathProperty="true" />
<None Include="..\..\src\Db\PKSimDB.sqlite" Link="PKSimDB.sqlite">
Expand Down