diff --git a/appveyor-nightly.yml b/appveyor-nightly.yml index 753615003..759f0c943 100644 --- a/appveyor-nightly.yml +++ b/appveyor-nightly.yml @@ -1,64 +1,64 @@ -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: +configuration: Debug +image: Visual Studio 2019 + +version: '{build}' + +init: +- ps: Update-AppveyorBuild -Version "$($env:ospsuite_nightly_version).$($env:appveyor_build_version)" + +environment: + MIK_TEX_INSTALL_DIR: 'C:\MikTex\' + +dotnet_csproj: + patch: true + file: '**\*.csproj' + version: '$(ospsuite_nightly_version).$(build_number)' + assembly_version: '$(ospsuite_nightly_version).$(build_number)' + file_version: '$(ospsuite_nightly_version).$(build_number)' + informational_version: '$(ospsuite_nightly_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' \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index bca2aa5fc..72707856c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,58 +1,58 @@ -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 - -pull_requests: - do_not_increment_build_number: true +configuration: Debug +image: Visual Studio 2019 + +version: '{build}' + +init: +- ps: Update-AppveyorBuild -Version "$($env:ospsuite_nightly_version).$($env:appveyor_build_version)" + +clone_depth: 1 + +dotnet_csproj: + patch: true + file: '**\*.csproj' + version: '$(ospsuite_nightly_version).$(build_number)' + assembly_version: '$(ospsuite_nightly_version).$(build_number)' + file_version: '$(ospsuite_nightly_version).$(build_number)' + informational_version: '$(ospsuite_nightly_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: + - hotfix/11.3 + +pull_requests: + do_not_increment_build_number: true diff --git a/rakefile.rb b/rakefile.rb index 106ab6b14..c24946cb3 100644 --- a/rakefile.rb +++ b/rakefile.rb @@ -112,7 +112,7 @@ def src_dir_for(configuration) packages_dir = src_dir_for("Debug") all_users_dir = ENV['ALLUSERSPROFILE'] - all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '11.1') + all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '11.3') copy_dependencies solution_dir, all_users_application_dir do copy_files 'Data', ['xml', 'mbdt'] diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index 6269b6c0b..48a16ea13 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -2,11 +2,11 @@ netstandard2.0 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 false false open-systems-pharmacology, ospsuite-components @@ -26,9 +26,9 @@ - - - + + + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index 855f83a83..73cdb41de 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -3,11 +3,11 @@ net472 WinExe - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 false false Open-Systems-Pharmacology @@ -60,7 +60,7 @@ - + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 0bd8b4f26..fdc1bad66 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -2,11 +2,11 @@ net472 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 false false open-systems-pharmacology, ospsuite-components @@ -32,13 +32,13 @@ - - - - - - - + + + + + + + diff --git a/src/MoBi.Engine/MoBi.Engine.csproj b/src/MoBi.Engine/MoBi.Engine.csproj index 16622ee41..0dceccd54 100644 --- a/src/MoBi.Engine/MoBi.Engine.csproj +++ b/src/MoBi.Engine/MoBi.Engine.csproj @@ -2,11 +2,11 @@ net472 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 false false open-systems-pharmacology, ospsuite-components @@ -32,8 +32,8 @@ - - + + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 1884eccdd..80e6c3388 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -2,11 +2,11 @@ net472 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 false false Open-Systems-Pharmacology @@ -28,9 +28,9 @@ - - - + + + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 92b9022b3..8e551572c 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -2,11 +2,11 @@ net472 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 false false LICENSE @@ -27,11 +27,11 @@ - - - - - + + + + + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index 2658d889c..820d82e48 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -3,11 +3,11 @@ net472 WinExe - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 + 11.3.0 false false Open-Systems-Pharmacology @@ -71,13 +71,13 @@ - + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 1791f9650..7a5546cfb 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -45,10 +45,10 @@ - - - - + + + + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index bd8cedb1c..eb48bd38d 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -17,8 +17,8 @@ - - + +