Skip to content

Commit

Permalink
Fixes #1109 unable to open PI
Browse files Browse the repository at this point in the history
  • Loading branch information
@msevestre
msevestre committed Feb 10, 2020
1 parent a266c41 commit e6f64df
Show file tree
Hide file tree
Showing 18 changed files with 38 additions and 40 deletions.
4 changes: 2 additions & 2 deletions src/PKSim.Assets.Images/PKSim.Assets.Images.csproj
View file
Expand Up @@ -26,8 +26,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="9.0.79" />
<PackageReference Include="OSPSuite.Assets.Images" Version="9.0.79" />
<PackageReference Include="OSPSuite.Assets" Version="9.0.81" />
<PackageReference Include="OSPSuite.Assets.Images" Version="9.0.81" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Assets/PKSim.Assets.csproj
View file
Expand Up @@ -26,8 +26,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="9.0.79" />
<PackageReference Include="OSPSuite.Assets.Images" Version="9.0.79" />
<PackageReference Include="OSPSuite.Assets" Version="9.0.81" />
<PackageReference Include="OSPSuite.Assets.Images" Version="9.0.81" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/PKSim.Assets/PKSimConstants.cs
View file
Expand Up @@ -1169,8 +1169,6 @@ public static class MenuNames
public static readonly string ExportSnapshot = "Save Snapshot...";
public static readonly string LoadFromSnapshot = "Load from Snapshot...";
public static readonly string RemoveUnusedContent = "Remove Unused Content";
public static readonly string ExportODEForMatlab = AsDeveloperOnly("Export Simulation to Matlab® Differential Equations...");
public static readonly string ExportODEForR = AsDeveloperOnly("Export Simulation to R Differential Equations");

public static string CompareBuildingBlocks(string buildingBlockType)
{
Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.BatchTool/PKSim.BatchTool.csproj
View file
Expand Up @@ -63,7 +63,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
<PackageReference Include="OSPSuite.DevExpress" Version="19.2.4.1" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.44" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.33" GeneratePathProperty="true" />
Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
View file
Expand Up @@ -28,7 +28,7 @@

<ItemGroup>
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.CLI/PKSim.CLI.csproj
View file
Expand Up @@ -62,8 +62,8 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.7.82" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Presentation" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
<PackageReference Include="OSPSuite.Presentation" Version="9.0.81" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.44" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.33" GeneratePathProperty="true" />
Expand Down
8 changes: 4 additions & 4 deletions src/PKSim.Core/PKSim.Core.csproj
View file
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="9.0.79" />
<PackageReference Include="OSPSuite.Assets" Version="9.0.79" />
<PackageReference Include="OSPSuite.Assets.Images" Version="9.0.79" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
<PackageReference Include="OSPSuite.Assets" Version="9.0.81" />
<PackageReference Include="OSPSuite.Assets.Images" Version="9.0.81" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="9.0.81" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
</ItemGroup>

Expand Down
16 changes: 8 additions & 8 deletions src/PKSim.Infrastructure/PKSim.Infrastructure.csproj
View file
Expand Up @@ -39,14 +39,14 @@
<PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.13" />
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Infrastructure" Version="9.0.79" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="9.0.79" />
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="9.0.79" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="9.0.79" />
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="9.0.79" />
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="9.0.79" />
<PackageReference Include="OSPSuite.Presentation.Serialization" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
<PackageReference Include="OSPSuite.Infrastructure" Version="9.0.81" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="9.0.81" />
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="9.0.81" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="9.0.81" />
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="9.0.81" />
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="9.0.81" />
<PackageReference Include="OSPSuite.Presentation.Serialization" Version="9.0.81" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.Matlab/PKSim.Matlab.csproj
View file
Expand Up @@ -27,7 +27,7 @@

<ItemGroup>
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.Presentation/PKSim.Presentation.csproj
View file
Expand Up @@ -27,11 +27,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Presentation" Version="9.0.79" />
<PackageReference Include="OSPSuite.Presentation.Importer" Version="9.0.79" />
<PackageReference Include="OSPSuite.Presentation" Version="9.0.81" />
<PackageReference Include="OSPSuite.Presentation.Importer" Version="9.0.81" />
<PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Presentation/Presenters/ContextMenus/SimulationContextMenu.cs
View file
Expand Up @@ -54,15 +54,15 @@ protected IMenuBarItem ExportSimulationToCppMenuItem(TSimulation simulation)

protected IMenuBarItem ExportODEForMatlabMenuItem(TSimulation simulation)
{
return CreateMenuButton.WithCaption(PKSimConstants.MenuNames.ExportODEForMatlab)
return CreateMenuButton.WithCaption(MenuNames.AsDeveloperOnly(MenuNames.ExportODEForMatlab))
.WithCommandFor<ExportODEForMatlabUICommand, Simulation>(simulation)
.WithIcon(ApplicationIcons.Matlab)
.ForDeveloper();
}

protected IMenuBarItem ExportODEForRMenuItem(TSimulation simulation)
{
return CreateMenuButton.WithCaption(PKSimConstants.MenuNames.ExportODEForR)
return CreateMenuButton.WithCaption(MenuNames.AsDeveloperOnly(MenuNames.ExportODEForR))
.WithCommandFor<ExportODEForRUICommand, Simulation>(simulation)
.WithIcon(ApplicationIcons.R)
.ForDeveloper();
Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.R/PKSim.R.csproj
View file
Expand Up @@ -49,7 +49,7 @@

<ItemGroup>
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.44" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.33" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.7" GeneratePathProperty="true" />
Expand Down
8 changes: 4 additions & 4 deletions src/PKSim.UI/PKSim.UI.csproj
View file
Expand Up @@ -41,11 +41,11 @@
<PackageReference Include="OSPSuite.DataBinding" Version="3.0.0.4" />
<PackageReference Include="OSPSuite.DataBinding.DevExpress" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.DevExpress" Version="19.2.4.1" />
<PackageReference Include="OSPSuite.Presentation" Version="9.0.79" />
<PackageReference Include="OSPSuite.UI" Version="9.0.79" />
<PackageReference Include="OSPSuite.UI.Importer" Version="9.0.79" />
<PackageReference Include="OSPSuite.Presentation" Version="9.0.81" />
<PackageReference Include="OSPSuite.UI" Version="9.0.81" />
<PackageReference Include="OSPSuite.UI.Importer" Version="9.0.81" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim/PKSim.csproj
View file
Expand Up @@ -73,13 +73,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
<PackageReference Include="OSPSuite.DevExpress" Version="19.2.4.1" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.44" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.33" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.7" GeneratePathProperty="true" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.Presentation" Version="9.0.79" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.Presentation" Version="9.0.81" 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
Expand Up @@ -23,7 +23,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.44" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.33" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.7" GeneratePathProperty="true" />
Expand Down
2 changes: 1 addition & 1 deletion tests/PKSim.R.Tests/PKSim.R.Tests.csproj
View file
Expand Up @@ -23,7 +23,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.44" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.33" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.7" GeneratePathProperty="true" />
Expand Down
2 changes: 1 addition & 1 deletion tests/PKSim.Tests/PKSim.Tests.csproj
View file
Expand Up @@ -21,7 +21,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.44" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.33" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.7" GeneratePathProperty="true" />
Expand Down
4 changes: 2 additions & 2 deletions tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj
View file
Expand Up @@ -18,8 +18,8 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
<PackageReference Include="OSPSuite.Core" Version="9.0.79" />
<PackageReference Include="OSPSuite.UI" Version="9.0.79" />
<PackageReference Include="OSPSuite.Core" Version="9.0.81" />
<PackageReference Include="OSPSuite.UI" Version="9.0.81" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit e6f64df

Please sign in to comment.