Skip to content

Commit

Permalink
Fixes Open-Systems-Pharmacology#540 CSV import export (Open-Systems-P…
Browse files Browse the repository at this point in the history 
…harmacology#595)

* Fixes  Open-Systems-Pharmacology#540 CSV import export

* Update package references bloated for nothing

* Update file that did not conform to new format
  • Loading branch information
@msevestre
msevestre committed Apr 4, 2018
1 parent 4f5a133 commit 4f03f41
Show file tree
Hide file tree
Showing 81 changed files with 1,517,824 additions and 1,517,947 deletions.
8 changes: 4 additions & 4 deletions src/PKSim.Assets/PKSim.Assets.csproj
View file
Expand Up @@ -68,11 +68,11 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="OSPSuite.Assets, Version=7.3.0.46, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Assets.7.3.0.46\lib\net462\OSPSuite.Assets.dll</HintPath>
<Reference Include="OSPSuite.Assets, Version=7.3.0.47, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Assets.7.3.0.47\lib\net462\OSPSuite.Assets.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.Utility, Version=3.0.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll</HintPath>
<Reference Include="OSPSuite.Utility, Version=3.0.0.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.Assets/PKSimConstants.cs
View file
Expand Up @@ -16,7 +16,7 @@ public static class Warning
public const string ThisItNotATemplateBuildingBlock = "This is not the template building block!";
public const string FractionAbsorbedAndEHC = "Please note that, e.g. in the case of enterohepatic circulation, the calculated fraction of dose absorbed may exceed 1";
public const string BioAvailabilityAndFractionAbsorbed = "For proper calculation of the AUCinf (PO) it is recommended to simulate as long as total gastrointestinal transit takes.";
public const string PopulationFileIsUsingOldFormatAndWontBeSupportedInTheNextVersion = "Population file is using an old format that will not be supported in future version";
public const string PopulationFileFormatIsNotSupported = "Population file format is not supported.";
public const string InhibitorClearanceMustBeDefinedSeparately = "Please note that for the mechanism-based inactivator no clearance process is defined via the inactivation process by default. In theory, for every inactivated target molecule, also one inactivator molecule is cleared; this must be separately defined by the user in form of additional clearance processes for the inhibitor.";
public const string FractionAbsorbedSmallerThanOne = "Absorption seems to be incomplete or absorption process is not finished. Vd, Vss (or Vd/F and Vss/F), t1/2, MRT and AUC_inf should be compared with respective PK-parameters from an IV simulation.";

Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Assets/packages.config
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OSPSuite.Assets" version="7.3.0.46" targetFramework="net462" />
<package id="OSPSuite.Utility" version="3.0.0.1" targetFramework="net462" />
<package id="OSPSuite.Assets" version="7.3.0.47" targetFramework="net462" />
<package id="OSPSuite.Utility" version="3.0.0.3" targetFramework="net462" />
</packages>
35 changes: 16 additions & 19 deletions src/PKSim.BatchTool/PKSim.BatchTool.csproj
View file
Expand Up @@ -203,23 +203,23 @@
<Reference Include="Northwoods.Go.Xml, Version=5.2.0.46, Culture=neutral, PublicKeyToken=a4e3b7b70161cfe8, processorArchitecture=MSIL">
<HintPath>..\..\packages\Northwoods.GoWin.5.2.0\lib\net46\Northwoods.Go.Xml.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.Assets, Version=7.3.0.46, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Assets.7.3.0.46\lib\net462\OSPSuite.Assets.dll</HintPath>
<Reference Include="OSPSuite.Assets, Version=7.3.0.47, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Assets.7.3.0.47\lib\net462\OSPSuite.Assets.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.Core, Version=7.3.0.46, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Core.7.3.0.46\lib\net462\OSPSuite.Core.dll</HintPath>
<Reference Include="OSPSuite.Core, Version=7.3.0.47, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Core.7.3.0.47\lib\net462\OSPSuite.Core.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.DataBinding, Version=2.2.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll</HintPath>
<Reference Include="OSPSuite.DataBinding, Version=2.2.0.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.DataBinding.DevExpress, Version=2.2.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.DataBinding.DevExpress.2.2.0.1\lib\net462\OSPSuite.DataBinding.DevExpress.dll</HintPath>
<Reference Include="OSPSuite.DataBinding.DevExpress, Version=2.2.0.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.DataBinding.DevExpress.2.2.0.2\lib\net462\OSPSuite.DataBinding.DevExpress.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.FuncParser, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.Presentation, Version=7.3.0.46, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Presentation.7.3.0.46\lib\net462\OSPSuite.Presentation.dll</HintPath>
<Reference Include="OSPSuite.Presentation, Version=7.3.0.47, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Presentation.7.3.0.47\lib\net462\OSPSuite.Presentation.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.Serializer">
<HintPath>..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll</HintPath>
Expand All @@ -230,21 +230,18 @@
<Reference Include="OSPSuite.TeXReporting, Version=2.0.1.7, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.UI, Version=7.3.0.46, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.UI.7.3.0.46\lib\net462\OSPSuite.UI.dll</HintPath>
<Reference Include="OSPSuite.UI, Version=7.3.0.47, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.UI.7.3.0.47\lib\net462\OSPSuite.UI.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.Utility, Version=3.0.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll</HintPath>
<Reference Include="OSPSuite.Utility, Version=3.0.0.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="SX, Version=2.6.6.4, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll</HintPath>
<Reference Include="SX, Version=2.6.7.1, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.BatchTool/app.config
View file
Expand Up @@ -83,7 +83,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="SX" publicKeyToken="882b9c044052e7f6" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.6.4" newVersion="2.6.6.4" />
<bindingRedirect oldVersion="0.0.0.0-2.6.7.1" newVersion="2.6.7.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DevExpress.XtraRichEdit.v17.1.Extensions" publicKeyToken="b88d1754d700e49a" culture="neutral" />
Expand Down
17 changes: 8 additions & 9 deletions src/PKSim.BatchTool/packages.config
View file
Expand Up @@ -9,21 +9,20 @@
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
<package id="Northwoods.GoWin" version="5.2.0" targetFramework="net462" />
<package id="OSPSuite.Assets" version="7.3.0.46" targetFramework="net462" />
<package id="OSPSuite.Core" version="7.3.0.46" targetFramework="net462" />
<package id="OSPSuite.DataBinding" version="2.2.0.1" targetFramework="net462" />
<package id="OSPSuite.DataBinding.DevExpress" version="2.2.0.1" targetFramework="net462" />
<package id="OSPSuite.Assets" version="7.3.0.47" targetFramework="net462" />
<package id="OSPSuite.Core" version="7.3.0.47" targetFramework="net462" />
<package id="OSPSuite.DataBinding" version="2.2.0.2" targetFramework="net462" />
<package id="OSPSuite.DataBinding.DevExpress" version="2.2.0.2" targetFramework="net462" />
<package id="OSPSuite.DevExpress" version="17.1.5" targetFramework="net462" />
<package id="OSPSuite.DevExpress.Presentation" version="17.1.5" targetFramework="net462" />
<package id="OSPSuite.FuncParser" version="2.0.0.1" targetFramework="net462" />
<package id="OSPSuite.Presentation" version="7.3.0.46" targetFramework="net462" />
<package id="OSPSuite.Presentation" version="7.3.0.47" targetFramework="net462" />
<package id="OSPSuite.Serializer" version="2.0.1.4" targetFramework="net462" />
<package id="OSPSuite.SimModel" version="2.2.0.6" targetFramework="net462" />
<package id="OSPSuite.SmartXLS" version="2.6.6.4" targetFramework="net462" />
<package id="OSPSuite.SmartXLS" version="2.6.7.1" targetFramework="net462" />
<package id="OSPSuite.TeXReporting" version="2.0.1.7" targetFramework="net462" />
<package id="OSPSuite.UI" version="7.3.0.46" targetFramework="net462" />
<package id="OSPSuite.Utility" version="3.0.0.1" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net462" />
<package id="OSPSuite.UI" version="7.3.0.47" targetFramework="net462" />
<package id="OSPSuite.Utility" version="3.0.0.3" targetFramework="net462" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net462" />
<package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net462" />
<package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net462" />
Expand Down
20 changes: 10 additions & 10 deletions src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
View file
Expand Up @@ -53,17 +53,17 @@
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.Assets, Version=7.3.0.46, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Assets.7.3.0.46\lib\net462\OSPSuite.Assets.dll</HintPath>
<Reference Include="OSPSuite.Assets, Version=7.3.0.47, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Assets.7.3.0.47\lib\net462\OSPSuite.Assets.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.Core, Version=7.3.0.46, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Core.7.3.0.46\lib\net462\OSPSuite.Core.dll</HintPath>
<Reference Include="OSPSuite.Core, Version=7.3.0.47, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Core.7.3.0.47\lib\net462\OSPSuite.Core.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.FuncParser, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.Presentation, Version=7.3.0.46, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Presentation.7.3.0.46\lib\net462\OSPSuite.Presentation.dll</HintPath>
<Reference Include="OSPSuite.Presentation, Version=7.3.0.47, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.Presentation.7.3.0.47\lib\net462\OSPSuite.Presentation.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.Serializer">
<HintPath>..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll</HintPath>
Expand All @@ -74,11 +74,11 @@
<Reference Include="OSPSuite.TeXReporting, Version=2.0.1.7, Culture=neutral, processorArchitecture=x86">
<HintPath>..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll</HintPath>
</Reference>
<Reference Include="OSPSuite.Utility, Version=3.0.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll</HintPath>
<Reference Include="OSPSuite.Utility, Version=3.0.0.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll</HintPath>
</Reference>
<Reference Include="SX, Version=2.6.6.4, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll</HintPath>
<Reference Include="SX, Version=2.6.7.1, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
<HintPath>..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.CLI.Core/app.config
View file
Expand Up @@ -12,7 +12,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="SX" publicKeyToken="882b9c044052e7f6" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.6.0" newVersion="2.6.6.0" />
<bindingRedirect oldVersion="0.0.0.0-2.6.7.1" newVersion="2.6.7.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
10 changes: 5 additions & 5 deletions src/PKSim.CLI.Core/packages.config
View file
Expand Up @@ -4,15 +4,15 @@
<package id="MathNet.Numerics" version="3.20.0" targetFramework="net462" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="2.0.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
<package id="OSPSuite.Assets" version="7.3.0.46" targetFramework="net462" />
<package id="OSPSuite.Core" version="7.3.0.46" targetFramework="net462" />
<package id="OSPSuite.Assets" version="7.3.0.47" targetFramework="net462" />
<package id="OSPSuite.Core" version="7.3.0.47" targetFramework="net462" />
<package id="OSPSuite.DevExpress.Presentation" version="17.1.5" targetFramework="net462" />
<package id="OSPSuite.FuncParser" version="2.0.0.1" targetFramework="net462" />
<package id="OSPSuite.Presentation" version="7.3.0.46" targetFramework="net462" />
<package id="OSPSuite.Presentation" version="7.3.0.47" targetFramework="net462" />
<package id="OSPSuite.Serializer" version="2.0.1.4" targetFramework="net462" />
<package id="OSPSuite.SimModel" version="2.2.0.6" targetFramework="net462" />
<package id="OSPSuite.SmartXLS" version="2.6.6.4" targetFramework="net462" />
<package id="OSPSuite.SmartXLS" version="2.6.7.1" targetFramework="net462" />
<package id="OSPSuite.TeXReporting" version="2.0.1.7" targetFramework="net462" />
<package id="OSPSuite.Utility" version="3.0.0.1" targetFramework="net462" />
<package id="OSPSuite.Utility" version="3.0.0.3" targetFramework="net462" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net462" />
</packages>
2 changes: 1 addition & 1 deletion src/PKSim.CLI/App.config
View file
Expand Up @@ -19,7 +19,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="SX" publicKeyToken="882b9c044052e7f6" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.6.0" newVersion="2.6.6.0" />
<bindingRedirect oldVersion="0.0.0.0-2.6.7.1" newVersion="2.6.7.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down

0 comments on commit 4f03f41

Please sign in to comment.