Version 9.0

Version 9.0 delivered with OSPSuite Version 9

.gitmodules

@@ -16,6 +16,3 @@
 [submodule "examples/ManualModel"]
 	path = examples/ManualModel
 	url = https://github.com/Open-Systems-Pharmacology/Example_ManualModel.git
-[submodule "simmodel.schema"]
-	path = simmodel.schema
-	url = https://github.com/Open-Systems-Pharmacology/OSPSuite.SimModel.Schema.git

SolutionInfo.cs

@@ -6,9 +6,6 @@
 [assembly: AssemblyProduct("MoBi")]
 [assembly: AssemblyCopyright("Copyright © 2002-2019 - Open Systems Pharmacology Community")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("8.0.0")]
-[assembly: AssemblyFileVersion("8.0.0")]
-[assembly: AssemblyInformationalVersion("8.0.0")]
 
 [assembly: InternalsVisibleTo("MoBi.Tests")]
 [assembly: InternalsVisibleTo("MoBi.UI.Tests")]

appveyor-coverage.yml

@@ -1,9 +1,10 @@
 configuration: Debug
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 environment:
+  app_version: '9.0'
   MIK_TEX_INSTALL_DIR: 'C:\MikTex\'
-  app_version: '8.0'
+  APPVEYOR_BLOCK_DOTNETCORE_TESTS_AUTORUN: true
 
 version: '$(app_version).{build}'
 
@@ -15,17 +16,14 @@ assembly_info:
 
 clone_depth: 1
 
-cache:
-  packages -> **\packages.config 
-
 install:
-- set PATH=C:\Ruby22\bin;C:\\Python34;C:\\Python34\\Scripts;%PATH%"
-- pip install codecov
-- git submodule update --init --recursive
-- ps: >-
-    (new-object net.webclient).DownloadFile('https://github.com/Open-Systems-Pharmacology/MiKTeX/releases/download/v2.9.3/MikTex.2.9.3.msi', 'C:\\MikTex.msi')
+  - set PATH=C:\Ruby22\bin;C:\\Python34;C:\\Python34\\Scripts;%PATH%"
+  - pip install codecov
+  - git submodule update --init --recursive
+  - ps: >-
+     (new-object net.webclient).DownloadFile('https://github.com/Open-Systems-Pharmacology/MiKTeX/releases/download/v2.9.3/MikTex.2.9.3.msi', 'C:\\MikTex.msi')
 
-    Start-Process msiexec.exe -ArgumentList /i, C:\MikTex.msi, /quiet, /qn, /norestart, INSTALLDIR=$env:MIK_TEX_INSTALL_DIR -Wait
+     Start-Process msiexec.exe -ArgumentList /i, C:\MikTex.msi, /quiet, /qn, /norestart, INSTALLDIR=$env:MIK_TEX_INSTALL_DIR -Wait
 
 before_build:
   - nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper 
@@ -38,6 +36,7 @@ before_build:
   - nuget sources add -name simmodel -source https://ci.appveyor.com/nuget/ospsuite-simmodel
   - nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes
   - nuget sources add -name core -source https://ci.appveyor.com/nuget/ospsuite-core
+  - nuget install opencover -OutputDirectory packages
   - nuget restore
 
 build:

appveyor-nightly.yml

@@ -1,23 +1,26 @@
 configuration: Debug
-image: Visual Studio 2017
+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: '8.0'
+  app_version: '9.0'
+  APPVEYOR_BLOCK_DOTNETCORE_TESTS_AUTORUN: true
   MIK_TEX_INSTALL_DIR: 'C:\MikTex\'
 
 version: '$(app_version).{build}'
 
-assembly_info:
+dotnet_csproj:
   patch: true
-  file: SolutionInfo.*
-  assembly_version: "{version}"
-  assembly_file_version: "{version}"
-  assembly_informational_version: "{version}"
+  file: '**\*.csproj'
+  assembly_version: "$(app_version).$(build_number)"
+  file_version: "$(app_version).$(build_number)"
+  informational_version: "$(app_version).$(build_number)"
 
-clone_depth: 1
 
-cache:
-  packages -> **\packages.config 
+clone_depth: 1
 
 install:
 - set PATH=C:\Ruby25\bin;%PATH%

appveyor.yml

@@ -1,8 +1,13 @@
 configuration: Debug
-image: Visual Studio 2017
+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: '8.0'
+  app_version: '9.0'
+  APPVEYOR_BLOCK_DOTNETCORE_TESTS_AUTORUN: true
 
 version: '$(app_version).{build}'
 
@@ -11,14 +16,12 @@ clone_depth: 1
 install:
   - git submodule update --init --recursive
 
-assembly_info:
+dotnet_csproj:
   patch: true
-  file: SolutionInfo.*	
-  assembly_version: "{version}"
-  assembly_file_version: "{version}"	
-
-cache:
-  packages -> **\packages.config  # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
+  file: '**\*.csproj'
+  assembly_version: "$(app_version).$(build_number)"
+  file_version: "$(app_version).$(build_number)"
+  informational_version: "$(app_version).$(build_number)"
 
 before_build:
   - nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper 

rakefile.rb

@@ -9,23 +9,29 @@
 	filter << "+[MoBi.Assets]*"
 	filter << "+[MoBi.Presentation]*"
 
-	Coverage.cover(filter , "MoBi.Tests.csproj")
+	 targetProjects = [
+		"MoBi.Tests.csproj",
+		"MoBi.UI.Tests.csproj",
+	];
+
+	Coverage.cover(filter , targetProjects)
 end
 
 task :create_setup, [:product_version, :configuration, :smart_xls_package, :smart_xls_version] do |t, args|
 	update_smart_xls args
 
+	src_dir = src_dir_for(args.configuration)
+	relative_src_dir = relative_src_dir_for(args.configuration)
+
 	#Ignore files from automatic harvesting that will be installed specifically
 	harvest_ignored_files = [
-		'MoBi.exe',
-		'Standard Molecule.pkml'
+    'MoBi.exe'
 	]
 
 	#Files required for setup creation only
 	setup_files	 = [
-		'packages/**/OSPSuite.Core/**/*.xml',
-		'packages/**/OSPSuite.Presentation/**/*.{wxs,xml}',
-		'packages/**/OSPSuite.TeXReporting/**/*.*',
+		"#{relative_src_dir}/ChartLayouts/**/*.{wxs,xml}",
+		"#{relative_src_dir}/TeXTemplates/**/*.*",
 		'examples/**/*.{wxs,pkml,mbp3}',
 		'src/Data/**/*.*',
 		'src/MoBi.Assets/Resources/*.ico',
@@ -39,7 +45,7 @@
 
 	Rake::Task['setup:create'].execute(OpenStruct.new(
 		solution_dir: solution_dir,
-		src_dir: src_dir_for(args.configuration),  
+		src_dir: src_dir,  
 		setup_dir: setup_dir,  
 		product_name: product_name, 
 		product_version: args.product_version,
@@ -51,25 +57,28 @@
 end
 
 task :create_portable_setup, [:product_version, :configuration, :package_name] do |t, args|
+	src_dir = src_dir_for(args.configuration)
+	relative_src_dir = relative_src_dir_for(args.configuration)
+
+	copy_templates_files src_dir
+
 	#Files required for setup creation only and that will not be harvested automatically
 	setup_files	 = [
 		'Open Systems Pharmacology Suite License.pdf',
 		'documentation/*.pdf',
 		'dimensions/*.xml',
 		'pkparameters/*.xml',
-		'src/Data/*.xml',
+		'src/Data/**/*.*',
 		'setup/**/*.{rtf}',
 	]
 
 	setup_folders = [
+		"#{setup_temp_dir}/**/*.*",
 		'examples/**/*.{pkml,mbp3}',
-		'packages/**/OSPSuite.Presentation/**/*.{xml}',
-		'packages/**/OSPSuite.TeXReporting/**/*.{json,sty,tex}',
 	]
-
 	Rake::Task['setup:create_portable'].execute(OpenStruct.new(
 		solution_dir: solution_dir,
-		src_dir: src_dir_for(args.configuration), 
+		src_dir: src_dir, 
 		setup_dir: setup_dir,  
 		product_name: product_name, 
 		product_version: args.product_version,
@@ -85,8 +94,18 @@
 	Utils.update_go_diagram_license args.file_path, args.license
 end	
 
+def copy_templates_files(source_dir)
+	FileUtils.mkdir_p setup_temp_dir
+	FileUtils.copy_entry File.join(source_dir, 'TeXTemplates'), File.join(setup_temp_dir, 'TeXTemplates')
+	FileUtils.copy_entry File.join(source_dir, 'ChartLayouts'), File.join(setup_temp_dir, 'ChartLayouts')
+end
+
+def relative_src_dir_for(configuration)
+	File.join('src', 'MoBi', 'bin', configuration, 'net472')
+end
+
 def src_dir_for(configuration)
-	File.join(solution_dir, 'src', 'MoBi', 'bin', configuration)
+	File.join(solution_dir, relative_src_dir_for(configuration))
 end
 
 def update_smart_xls(args) 
@@ -101,27 +120,27 @@ def update_smart_xls(args)
 end
 
 task :postclean do |t, args| 
-	packages_dir =  File.join(solution_dir, 'packages')
+	packages_dir =  src_dir_for("Debug")
 
 	all_users_dir = ENV['ALLUSERSPROFILE']
-	all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '8.0')
+	all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '9.0')
 
-	copy_depdencies solution_dir,  all_users_application_dir do
+	copy_dependencies solution_dir,  all_users_application_dir do
 		copy_files 'Data', ['xml', 'mbdt']
 		copy_file 'src/Data/AllCalculationMethods.pkml'
 		copy_dimensions_xml
 		copy_pkparameters_xml
 	end
 
-	copy_depdencies solution_dir,  File.join(all_users_application_dir, 'Templates') do
+	copy_dependencies solution_dir,  File.join(all_users_application_dir, 'Templates') do
 		copy_templates_pkml
 	end
 
-	copy_depdencies packages_dir,   File.join(all_users_application_dir, 'ChartLayouts') do
-		copy_files 'OSPSuite.Presentation', 'xml'
+	copy_dependencies packages_dir,   File.join(all_users_application_dir, 'ChartLayouts') do
+		copy_files 'ChartLayouts', 'xml'
 	end
 
-	copy_depdencies packages_dir,   File.join(all_users_application_dir, 'TeXTemplates', 'StandardTemplate') do
+	copy_dependencies packages_dir,   File.join(all_users_application_dir, 'TeXTemplates', 'StandardTemplate') do
 		copy_files 'StandardTemplate', '*'
 	end
 end
@@ -146,4 +165,8 @@ def suite_name
 
 def setup_dir
 	File.join(solution_dir, 'setup')
+end
+
+def setup_temp_dir
+	File.join(setup_dir, 'temp')
 end