Version 10.0.256

Version 10.0.256

.gitignore

@@ -254,6 +254,7 @@ paket-files/
 # JetBrains Rider
 .idea/
 *.sln.iml
+*pksim.lock
 /7.1_PKSim.exe.lnk
 /src/Db/PKSimDB - Kopie.mdb
 /src/Db/Transfer.mdb
@@ -266,3 +267,5 @@ paket-files/
 /src/Db/7.2_PregnantWoman.xlsx
 /src/Db/PKSimDB.ldb
 /src/Db/**/*.develop.sqlite
+/src/**/licenses.licx
+/src/**/launchSettings.json

PKSim.sln

@@ -55,6 +55,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PKSim.R", "src\PKSim.R\PKSi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PKSim.R.Tests", "tests\PKSim.R.Tests\PKSim.R.Tests.csproj", "{4E310F99-4604-4502-8F0B-A4E4F27B062B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PKSim.UI.Starter", "tests\PKSim.UI.Starter\PKSim.UI.Starter.csproj", "{795B1096-E236-4A0B-AB67-590F264F9F8E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -125,13 +127,17 @@ Global
 		{4E310F99-4604-4502-8F0B-A4E4F27B062B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4E310F99-4604-4502-8F0B-A4E4F27B062B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4E310F99-4604-4502-8F0B-A4E4F27B062B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{795B1096-E236-4A0B-AB67-590F264F9F8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{795B1096-E236-4A0B-AB67-590F264F9F8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{795B1096-E236-4A0B-AB67-590F264F9F8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{795B1096-E236-4A0B-AB67-590F264F9F8E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		VisualSVNWorkingCopyRoot = 
 		SolutionGuid = {13620E23-1993-42C6-A4AB-468E29DD24DE}
+		VisualSVNWorkingCopyRoot = 
 	EndGlobalSection
 	GlobalSection(NDepend) = preSolution
 		Project = ".\PKSim.ndproj"

PKSim.v3.ncrunchsolution

@@ -5,15 +5,9 @@
   </Settings>
   <EngineModes>
     <EngineMode>
-      <Name>No Nighlty Tests</Name>
+      <Name>No Nightly</Name>
       <Settings>
-        <TestsToExecuteAutomatically>(DoesNotHaveCategory 'ProjectConverter' AND DoesNotHaveCategory 'Reporting' AND DoesNotHaveCategory 'LocalOnly' AND DoesNotHaveCategory 'NightlyOnly')</TestsToExecuteAutomatically>
-      </Settings>
-    </EngineMode>
-    <EngineMode>
-      <Name>No Integration Tests</Name>
-      <Settings>
-        <TestsToExecuteAutomatically>DoesNotHaveCategory 'IntegrationTests'</TestsToExecuteAutomatically>
+        <TestsToExecuteAutomatically>(DoesNotHaveCategory 'NightlyOnly' AND DoesNotHaveCategory 'LocalOnly' AND DoesNotHaveCategory 'Reporting' AND DoesNotHaveCategory 'ProjectConverter')</TestsToExecuteAutomatically>
       </Settings>
     </EngineMode>
   </EngineModes>

SolutionInfo.cs

@@ -3,7 +3,7 @@
 using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Open Systems Pharmacology")]
 [assembly: AssemblyProduct("PK-Sim")]
-[assembly: AssemblyCopyright("Copyright © 2002-2019 - Open Systems Pharmacology Community")]
+[assembly: AssemblyCopyright("Copyright © 2002-2020 - Open Systems Pharmacology Community")]
 [assembly: ComVisible(false)]
 
 [assembly: InternalsVisibleTo("PKSim.Tests")]

appveyor-coverage.yml

@@ -2,24 +2,26 @@ configuration: Debug
 image: Visual Studio 2019
 
 environment:
-  app_version: "9.0"
   MIK_TEX_INSTALL_DIR: 'C:\MikTex\'
-  APPVEYOR_BLOCK_DOTNETCORE_TESTS_AUTORUN: true
 
-version: "$(app_version).{build}"
+version: '{build}'
 
-assembly_info:
+init:
+- ps: Update-AppveyorBuild -Version "$($env:ospsuite_version).$($env:appveyor_build_version)"
+
+dotnet_csproj:
   patch: true
-  file: SolutionInfo.*
-  assembly_version: "{version}"
-  assembly_file_version: "{version}"
+  file: '**\*.csproj'
+  version: '$(ospsuite_version).$(build_number)'
+  assembly_version: '$(ospsuite_version).$(build_number)'
+  file_version: '$(ospsuite_version).$(build_number)'
+  informational_version: '$(ospsuite_version).$(build_number)'
 
 clone_depth: 1
 
 install:
   - set PATH=C:\Ruby22\bin;C:\\Python34;C:\\Python34\\Scripts;%PATH%"
   - pip install codecov
-  - cmd: git submodule update --init --recursive
   - ps: >-
       (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi', 'C:\\msxml.msi')
 
@@ -48,10 +50,6 @@ build:
   verbosity: minimal
   project: PKSim.sln
 
-notifications:
-  - provider: Slack
-    incoming_webhook:
-      secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyFEAs8X080yIO8g1FLt3tNfBN4OpeBnkgrXzf7AqNKV5561x7Coux3ByGrHmsL1sCo=
 
 test_script:
   - rake cover

appveyor-nightly.yml

@@ -1,35 +1,29 @@
 configuration: Debug
 image: Visual Studio 2019
 
-# hack until donet patching works with PR
-init:
-  - cmd: if DEFINED APPVEYOR_PULL_REQUEST_NUMBER (Set build_number=1) ELSE (Set build_number=%APPVEYOR_BUILD_NUMBER%)
-
-environment:
-  app_version: "9.1"
-  APPVEYOR_BLOCK_DOTNETCORE_TESTS_AUTORUN: true
+version: '{build}'
 
-version: "$(app_version).{build}"
+init:
+- ps: Update-AppveyorBuild -Version "$($env:ospsuite_version).$($env:appveyor_build_version)"
 
 dotnet_csproj:
   patch: true
   file: '**\*.csproj'
-  assembly_version: "$(app_version).$(build_number)"
-  file_version: "$(app_version).$(build_number)"
-  informational_version: "$(app_version).$(build_number)"
+  version: '$(ospsuite_version).$(build_number)'
+  assembly_version: '$(ospsuite_version).$(build_number)'
+  file_version: '$(ospsuite_version).$(build_number)'
+  informational_version: '$(ospsuite_version).$(build_number)'
+
 
 clone_depth: 1
 
 install:
   - set PATH=C:\Ruby25\bin;%PATH%
-  - git submodule update --init --recursive
   - gem install xml-simple
   - ps: >-
       (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi', 'C:\msxml.msi')
 
       Start-Process msiexec.exe -ArgumentList /i, C:\msxml.msi, /quiet, /qn, /norestart -Wait
-  - ps: >-
-      (new-object net.webclient).DownloadFile('https://ci.appveyor.com/api/projects/Open-Systems-Pharmacology-ci/smartxls/artifacts/OSPSuite.SmartXLS.2.6.4.1.nupkg', 'C:\smartxls.zip')
 
 before_build:
   - nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper
@@ -46,18 +40,14 @@ before_build:
   - rake "update_go_license[ApplicationStartup.cs, %GO_DIAGRAM_KEY%]"
 
 after_build:
-  - rake "create_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%, C:/smartxls.zip, 2.6.4.1]"
+  - rake "create_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%]"
   - 7z a setup.zip %APPVEYOR_BUILD_FOLDER%\setup\deploy\*.msi
   - rake "create_portable_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%, pk-sim-portable-setup.zip]"
 
 build:
   verbosity: minimal
   project: PKSim.sln
 
-notifications:
-  - provider: Slack
-    incoming_webhook:
-      secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyFEAs8X080yIO8g1FLt3tNfBN4OpeBnkgrXzf7AqNKV5561x7Coux3ByGrHmsL1sCo=
 
 on_finish:
   - ps: Get-ChildItem setup.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }

appveyor.yml

@@ -1,24 +1,20 @@
 configuration: Debug
 image: Visual Studio 2019
 
-# hack until donet patching works with PR
-init:
-  - cmd: if DEFINED APPVEYOR_PULL_REQUEST_NUMBER (Set build_number=1) ELSE (Set build_number=%APPVEYOR_BUILD_NUMBER%)
-
-environment:
-  app_version: "9.1"
-  APPVEYOR_BLOCK_DOTNETCORE_TESTS_AUTORUN: true
+version: '{build}'
 
-version: "$(app_version).{build}"
+init:
+- ps: Update-AppveyorBuild -Version "$($env:ospsuite_version).$($env:appveyor_build_version)"
 
 clone_depth: 1
 
 dotnet_csproj:
   patch: true
   file: '**\*.csproj'
-  assembly_version: "$(app_version).$(build_number)"
-  file_version: "$(app_version).$(build_number)"
-  informational_version: "$(app_version).$(build_number)"
+  version: '$(ospsuite_version).$(build_number)'
+  assembly_version: '$(ospsuite_version).$(build_number)'
+  file_version: '$(ospsuite_version).$(build_number)'
+  informational_version: '$(ospsuite_version).$(build_number)'
 
 skip_branch_with_pr: true
 
@@ -61,13 +57,7 @@ test:
       - ProjectConverter
       - NightlyOnly
 
-notifications:
-  - provider: Slack
-    incoming_webhook:
-      secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyFEAs8X080yIO8g1FLt3tNfBN4OpeBnkgrXzf7AqNKV5561x7Coux3ByGrHmsL1sCo=
-
-install:
-  - cmd: git submodule update --init --recursive
+install: 
   - ps: >-
       (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi', 'C:\\msxml.msi')
 

rakefile.rb

@@ -26,9 +26,7 @@
   Coverage.cover(filter, targetProjects)
 end
 
-task :create_setup, [:product_version, :configuration, :smart_xls_package, :smart_xls_version] do |t, args|
-	update_smart_xls(args)
-
+task :create_setup, [:product_version, :configuration] do |t, args|
 	src_dir = src_dir_for(args.configuration)
 	relative_src_dir = relative_src_dir_for(args.configuration)
 
@@ -113,7 +111,7 @@
 	packages_dir =  src_dir_for("Debug")
 
 	all_users_dir = ENV['ALLUSERSPROFILE']
-	all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '9.0')
+	all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '10.0')
 
 	copy_dependencies solution_dir,  all_users_application_dir do
 		copy_dimensions_xml
@@ -141,15 +139,6 @@
 
 private
 
-def update_smart_xls(args) 
-	require_relative 'scripts/smartxls'
-	if (!args.smart_xls_package || !args.smart_xls_version)
-		return
-	end
-	src_dir = src_dir_for(args.configuration)
-	SmartXls.update_smart_xls src_dir, args.smart_xls_package, args.smart_xls_version
-end
-
 def relative_src_dir_for(configuration)
 	File.join( 'src', 'PKSim', 'bin', configuration, 'net472')
 end