Merge pull request #1304 from Open-Systems-Pharmacology/hotfix/11.3

Hotfix/11.3
Open-Systems-Pharmacology · Apr 10, 2024 · e8c43ab · e8c43ab
2 parents df173a8 + 6b5d9e5
commit e8c43ab
Show file tree

Hide file tree

Showing 12 changed files with 186 additions and 186 deletions.
diff --git 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'
diff --git 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
@@ -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
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>11.1.0</Version>
-    <PackageVersion>11.1.0</PackageVersion>
-    <AssemblyVersion>11.1.0</AssemblyVersion>
-    <FileVersion>11.1.0</FileVersion>
-    <InformationalVersion>11.1.0</InformationalVersion>
+    <Version>11.3.0</Version>
+    <PackageVersion>11.3.0</PackageVersion>
+    <AssemblyVersion>11.3.0</AssemblyVersion>
+    <FileVersion>11.3.0</FileVersion>
+    <InformationalVersion>11.3.0</InformationalVersion>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
@@ -26,9 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.2.155" />
-    <PackageReference Include="OSPSuite.Core" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.3.272" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.3.272" />
+    <PackageReference Include="OSPSuite.Core" Version="11.3.272" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <Version>11.1.0</Version>
-    <PackageVersion>11.1.0</PackageVersion>
-    <AssemblyVersion>11.1.0</AssemblyVersion>
-    <FileVersion>11.1.0</FileVersion>
-    <InformationalVersion>11.1.0</InformationalVersion>
+    <Version>11.3.0</Version>
+    <PackageVersion>11.3.0</PackageVersion>
+    <AssemblyVersion>11.3.0</AssemblyVersion>
+    <FileVersion>11.3.0</FileVersion>
+    <InformationalVersion>11.3.0</InformationalVersion>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <Authors>Open-Systems-Pharmacology</Authors>
@@ -60,7 +60,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Core" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Core" Version="11.3.272" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />

diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <Version>11.1.0</Version>
-    <PackageVersion>11.1.0</PackageVersion>
-    <AssemblyVersion>11.1.0</AssemblyVersion>
-    <FileVersion>11.1.0</FileVersion>
-    <InformationalVersion>11.1.0</InformationalVersion>
+    <Version>11.3.0</Version>
+    <PackageVersion>11.3.0</PackageVersion>
+    <AssemblyVersion>11.3.0</AssemblyVersion>
+    <FileVersion>11.3.0</FileVersion>
+    <InformationalVersion>11.3.0</InformationalVersion>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
@@ -32,13 +32,13 @@
     <PackageReference Include="FluentNHibernate" Version="2.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.2.155" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.2.155" />
-    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.2.155" />
-    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.2.155" />
-    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.2.155" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Core" Version="11.3.272" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.3.272" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.3.272" />
+    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.3.272" />
+    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.3.272" />
+    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.3.272" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.3.272" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/src/MoBi.Engine/MoBi.Engine.csproj b/src/MoBi.Engine/MoBi.Engine.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <Version>11.1.0</Version>
-    <PackageVersion>11.1.0</PackageVersion>
-    <AssemblyVersion>11.1.0</AssemblyVersion>
-    <FileVersion>11.1.0</FileVersion>
-    <InformationalVersion>11.1.0</InformationalVersion>
+    <Version>11.3.0</Version>
+    <PackageVersion>11.3.0</PackageVersion>
+    <AssemblyVersion>11.3.0</AssemblyVersion>
+    <FileVersion>11.3.0</FileVersion>
+    <InformationalVersion>11.3.0</InformationalVersion>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Core" Version="11.2.155" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Core" Version="11.3.272" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.3.272" />
   </ItemGroup>
 
   <ItemGroup>