Skip to content

Commit

Permalink
Version 10.0.122
Browse files Browse the repository at this point in the history
Version 10.0.122
  • Loading branch information
msevestre authored Oct 19, 2021
2 parents 599efa4 + 9ec2b06 commit 0519e09
Show file tree
Hide file tree
Showing 295 changed files with 20,395 additions and 22,771 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -254,5 +254,6 @@ paket-files/
setup/deploy
setup/MoBi*
setup/*.zip
src/**/licenses.licx

*.ncrunchproject
23 changes: 12 additions & 11 deletions MoBi.sln
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.16
# Visual Studio Version 16
VisualStudioVersion = 16.0.31019.35
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoBi", "src\MoBi\MoBi.csproj", "{B831E5E2-431A-4627-B58C-3CE3F5002E42}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi", "src\MoBi\MoBi.csproj", "{B831E5E2-431A-4627-B58C-3CE3F5002E42}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoBi.Core", "src\MoBi.Core\MoBi.Core.csproj", "{2DBF50BE-A749-421C-B526-8BDA31CFE7B3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.Core", "src\MoBi.Core\MoBi.Core.csproj", "{2DBF50BE-A749-421C-B526-8BDA31CFE7B3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoBi.Presentation", "src\MoBi.Presentation\MoBi.Presentation.csproj", "{B4C86DCA-8877-4400-8088-2401EE65B403}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.Presentation", "src\MoBi.Presentation\MoBi.Presentation.csproj", "{B4C86DCA-8877-4400-8088-2401EE65B403}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoBi.Assets", "src\MoBi.Assets\MoBi.Assets.csproj", "{3C65FFC2-D9EC-4951-8C35-04854AD34E52}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.Assets", "src\MoBi.Assets\MoBi.Assets.csproj", "{3C65FFC2-D9EC-4951-8C35-04854AD34E52}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoBi.Tests", "Tests\MoBi.Tests\MoBi.Tests.csproj", "{9DFDB6C9-FB74-4578-AAAF-F89C07BD4414}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.Tests", "Tests\MoBi.Tests\MoBi.Tests.csproj", "{9DFDB6C9-FB74-4578-AAAF-F89C07BD4414}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoBi.UI", "src\MoBi.UI\MoBi.UI.csproj", "{DE743812-F444-42E2-B72D-CF298933E2BA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.UI", "src\MoBi.UI\MoBi.UI.csproj", "{DE743812-F444-42E2-B72D-CF298933E2BA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoBi.BatchTool", "src\MoBi.BatchTool\MoBi.BatchTool.csproj", "{881D23DB-4A9F-45C8-BA67-58B790537634}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.BatchTool", "src\MoBi.BatchTool\MoBi.BatchTool.csproj", "{881D23DB-4A9F-45C8-BA67-58B790537634}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B29CBF46-FC2E-4201-BBEC-940B5601A773}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
appveyor-coverage.yml = appveyor-coverage.yml
appveyor-nightly.yml = appveyor-nightly.yml
appveyor.yml = appveyor.yml
Expand All @@ -29,9 +30,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
SolutionInfo.cs = SolutionInfo.cs
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoBi.UI.Tests", "tests\MoBi.UI.Tests\MoBi.UI.Tests.csproj", "{2710573C-9216-4817-AD81-97099597A780}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.UI.Tests", "tests\MoBi.UI.Tests\MoBi.UI.Tests.csproj", "{2710573C-9216-4817-AD81-97099597A780}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoBi.Engine", "src\MoBi.Engine\MoBi.Engine.csproj", "{15ED932C-EDEC-407B-91D9-7BCB8E7F95F5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoBi.Engine", "src\MoBi.Engine\MoBi.Engine.csproj", "{15ED932C-EDEC-407B-91D9-7BCB8E7F95F5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
2 changes: 1 addition & 1 deletion SolutionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[assembly: AssemblyCompany("Open Systems Pharmacology")]
[assembly: AssemblyProduct("MoBi")]
[assembly: AssemblyCopyright("Copyright © 2002-2019 - Open Systems Pharmacology Community")]
[assembly: AssemblyCopyright("Copyright © 2002-2020 - Open Systems Pharmacology Community")]
[assembly: ComVisible(false)]

[assembly: InternalsVisibleTo("MoBi.Tests")]
Expand Down
26 changes: 12 additions & 14 deletions appveyor-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,27 @@ 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
- 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')
Expand All @@ -44,9 +47,4 @@ build:
project: MoBi.sln

test_script:
- rake cover

notifications:
- provider: Slack
incoming_webhook:
secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyFEAs8X080yIO8g1FLt3tNfBN4OpeBnkgrXzf7AqNKV5561x7Coux3ByGrHmsL1sCo=
- rake cover
139 changes: 64 additions & 75 deletions appveyor-nightly.yml
Original file line number Diff line number Diff line change
@@ -1,75 +1,64 @@
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
MIK_TEX_INSTALL_DIR: 'C:\MikTex\'

version: '$(app_version).{build}'

dotnet_csproj:
patch: true
file: '**\*.csproj'
assembly_version: "$(app_version).$(build_number)"
file_version: "$(app_version).$(build_number)"
informational_version: "$(app_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://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
- 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
- nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
- nuget sources add -name serializer -source https://ci.appveyor.com/nuget/ospsuite-serializer
- nuget sources add -name texreporting -source https://ci.appveyor.com/nuget/ospsuite-texreporting
- nuget sources add -name databinding -source https://ci.appveyor.com/nuget/ospsuite-databinding
- nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress
- nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser
- 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 restore
- 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]"
- 7z a setup.zip %APPVEYOR_BUILD_FOLDER%\setup\deploy\*.msi
- rake "create_portable_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%, mobi-portable-setup.zip]"

build:
verbosity: minimal
project: MoBi.sln

test:
assemblies:
- MoBi.Tests.dll
- MoBi.UI.Tests.dll

on_finish:
- ps: Get-ChildItem setup.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
- ps: Get-ChildItem .\setup\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }

skip_commits:
files:
- '*.md'

notifications:
- provider: Slack
incoming_webhook:
secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyFEAs8X080yIO8g1FLt3tNfBN4OpeBnkgrXzf7AqNKV5561x7Coux3ByGrHmsL1sCo=
configuration: Debug
image: Visual Studio 2019

version: '{build}'

init:
- ps: Update-AppveyorBuild -Version "$($env:ospsuite_version).$($env:appveyor_build_version)"

environment:
MIK_TEX_INSTALL_DIR: 'C:\MikTex\'

dotnet_csproj:
patch: true
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:\Ruby25\bin;%PATH%
- gem install xml-simple
- 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
before_build:
- nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper
- nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
- nuget sources add -name serializer -source https://ci.appveyor.com/nuget/ospsuite-serializer
- nuget sources add -name texreporting -source https://ci.appveyor.com/nuget/ospsuite-texreporting
- nuget sources add -name databinding -source https://ci.appveyor.com/nuget/ospsuite-databinding
- nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress
- nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser
- 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 restore
- rake "update_go_license[ApplicationStartup.cs, %GO_DIAGRAM_KEY%]"

after_build:
- 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%, mobi-portable-setup.zip]"

build:
verbosity: minimal
project: MoBi.sln

test:
assemblies:
- MoBi.Tests.dll
- MoBi.UI.Tests.dll

on_finish:
- ps: Get-ChildItem setup.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
- ps: Get-ChildItem .\setup\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }

skip_commits:
files:
- '*.md'
131 changes: 59 additions & 72 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,72 +1,59 @@
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: '$(app_version).{build}'

clone_depth: 1

install:
- git submodule update --init --recursive

dotnet_csproj:
patch: true
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
- nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
- nuget sources add -name serializer -source https://ci.appveyor.com/nuget/ospsuite-serializer
- nuget sources add -name texreporting -source https://ci.appveyor.com/nuget/ospsuite-texreporting
- nuget sources add -name databinding -source https://ci.appveyor.com/nuget/ospsuite-databinding
- nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress
- nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser
- 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 restore

build:
verbosity: minimal
project: MoBi.sln

test:
assemblies:
- MoBi.Tests.dll
- MoBi.UI.Tests.dll

categories:
except:
- IntegrationTests

skip_commits:
files:
- '*.md'

skip_branch_with_pr: true

skip_tags: true

branches:
only:
- develop
- hotfix/v9.1

pull_requests:
do_not_increment_build_number: true


notifications:
- provider: Slack
incoming_webhook:
secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyFEAs8X080yIO8g1FLt3tNfBN4OpeBnkgrXzf7AqNKV5561x7Coux3ByGrHmsL1sCo=
configuration: Debug
image: Visual Studio 2019

version: '{build}'

init:
- ps: Update-AppveyorBuild -Version "$($env:ospsuite_version).$($env:appveyor_build_version)"

clone_depth: 1

dotnet_csproj:
patch: true
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)'

before_build:
- nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper
- nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
- nuget sources add -name serializer -source https://ci.appveyor.com/nuget/ospsuite-serializer
- nuget sources add -name texreporting -source https://ci.appveyor.com/nuget/ospsuite-texreporting
- nuget sources add -name databinding -source https://ci.appveyor.com/nuget/ospsuite-databinding
- nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress
- nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser
- 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 restore

build:
verbosity: minimal
project: MoBi.sln

test:
assemblies:
- MoBi.Tests.dll
- MoBi.UI.Tests.dll

categories:
except:
- IntegrationTests

skip_commits:
files:
- '*.md'

skip_branch_with_pr: true

skip_tags: true

branches:
only:
- develop
- hotfix/v9.1

pull_requests:
do_not_increment_build_number: true
Binary file modified pre/libsbmlcs.dll
Binary file not shown.
Binary file modified pre/libsbmlcsP.dll
Binary file not shown.
Loading

0 comments on commit 0519e09

Please sign in to comment.