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

2181 project conversion issue #2182

Merged
merged 2 commits into from
Apr 6, 2022
Merged

2181 project conversion issue #2182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dc5cb5
Fixes #2181 wrong test cases
msevestre Apr 6, 2022
abfff7b
Fixes #2181 project conversion issue
msevestre Apr 6, 2022
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="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>
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="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>
Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.BatchTool/PKSim.BatchTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -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>
Expand Down
4 changes: 2 additions & 2 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,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" />
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 @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.Infrastructure/ORM/DAS/DAS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
16 changes: 8 additions & 8 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,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>

Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.Infrastructure/Services/GeneExpressionQueries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.Matlab/PKSim.Matlab.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Presentation/PKSim.Presentation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.R/PKSim.R.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.UI/PKSim.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim/PKSim.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -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" />
Expand Down
13 changes: 4 additions & 9 deletions tests/PKSim.Tests/IntegrationTests/RenameBuildingBlockTaskSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
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="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" />
Expand Down
4 changes: 2 additions & 2 deletions tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 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 @@ -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>
Expand Down