Skip to content

Commit

Permalink
update core (#3000)
Browse files Browse the repository at this point in the history
  • Loading branch information
rwmcintosh authored Nov 4, 2024
1 parent 8a8e35a commit 4241446
Show file tree
Hide file tree
Showing 16 changed files with 48 additions and 48 deletions.
4 changes: 2 additions & 2 deletions src/PKSim.Assets.Images/PKSim.Assets.Images.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="12.0.332" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.335" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.Assets/PKSim.Assets.csproj
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.332" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.335" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.59" GeneratePathProperty="true" />
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
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.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.Utility" Version="4.1.0.6" />
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.CLI/PKSim.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,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.332" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.335" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.Utility" Version="4.1.0.6" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.59" GeneratePathProperty="true" />
Expand Down
8 changes: 4 additions & 4 deletions src/PKSim.Core/PKSim.Core.csproj
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.1.0.6" />
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.332" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.332" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.0.335" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.335" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
</ItemGroup>

Expand Down
18 changes: 9 additions & 9 deletions src/PKSim.Infrastructure/PKSim.Infrastructure.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,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.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.0.332" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="12.0.332" />
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="12.0.332" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.332" />
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="12.0.332" />
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="12.0.332" />
<PackageReference Include="OSPSuite.Presentation.Serialization" Version="12.0.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.0.335" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="12.0.335" />
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="12.0.335" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.335" />
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="12.0.335" />
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="12.0.335" />
<PackageReference Include="OSPSuite.Presentation.Serialization" Version="12.0.335" />
<PackageReference Include="OSPSuite.Utility" Version="4.1.0.6" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="12.0.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.5" />
<PackageReference Include="OSPSuite.Utility" Version="4.1.0.6" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.335" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
</ItemGroup>

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


<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="12.0.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.Utility" Version="4.1.0.6" />
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.9" GeneratePathProperty="true" />
Expand Down
8 changes: 4 additions & 4 deletions src/PKSim.UI.Starter/PKSim.UI.Starter.csproj
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.332" />
<PackageReference Include="OSPSuite.UI" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.0.332" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.335" />
<PackageReference Include="OSPSuite.UI" Version="12.0.335" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.0.335" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/PKSim.UI/PKSim.UI.csproj
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.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<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.1.0.6" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.332" />
<PackageReference Include="OSPSuite.UI" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.335" />
<PackageReference Include="OSPSuite.UI" Version="12.0.335" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
<PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.9" GeneratePathProperty="true" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.332" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.Presentation" Version="12.0.335" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.5" GeneratePathProperty="true" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OSPSuite.FuncParser.Ubuntu22" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.R" Version="12.0.332" />
<PackageReference Include="OSPSuite.R" Version="12.0.335" />
<PackageReference Include="OSPSuite.SimModel.Ubuntu22" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES.Ubuntu22" Version="4.1.0.9" GeneratePathProperty="true" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/PKSim.R.Tests/PKSim.R.Tests.csproj
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.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.9" GeneratePathProperty="true" />
Expand Down
2 changes: 1 addition & 1 deletion tests/PKSim.Tests/PKSim.Tests.csproj
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.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.9" GeneratePathProperty="true" />
Expand Down
6 changes: 3 additions & 3 deletions tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
</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.332" />
<PackageReference Include="OSPSuite.Assets" Version="12.0.335" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.Core" Version="12.0.332" />
<PackageReference Include="OSPSuite.Core" Version="12.0.335" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.59" />
<PackageReference Include="OSPSuite.UI" Version="12.0.332" />
<PackageReference Include="OSPSuite.UI" Version="12.0.335" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.59" GeneratePathProperty="true" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" GeneratePathProperty="true" />
<None Include="..\..\src\Db\PKSimDB.sqlite" Link="PKSimDB.sqlite">
Expand Down

0 comments on commit 4241446

Please sign in to comment.