Skip to content

Commit e8c43ab

Browse files
Yuri05Yuri05
authored
Merge pull request #1304 from Open-Systems-Pharmacology/hotfix/11.3
Hotfix/11.3
2 parents df173a8 + 6b5d9e5 commit e8c43ab

File tree

12 files changed

+186
-186
lines changed

12 files changed

+186
-186
lines changed

‎appveyor-nightly.yml‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
1-
configuration: Debug
2-
image: Visual Studio 2019
3-
4-
version: '{build}'
5-
6-
init:
7-
- ps: Update-AppveyorBuild -Version "$($env:ospsuite_version).$($env:appveyor_build_version)"
8-
9-
environment:
10-
MIK_TEX_INSTALL_DIR: 'C:\MikTex\'
11-
12-
dotnet_csproj:
13-
patch: true
14-
file: '**\*.csproj'
15-
version: '$(ospsuite_version).$(build_number)'
16-
assembly_version: '$(ospsuite_version).$(build_number)'
17-
file_version: '$(ospsuite_version).$(build_number)'
18-
informational_version: '$(ospsuite_version).$(build_number)'
19-
20-
clone_depth: 1
21-
22-
install:
23-
- set PATH=C:\Ruby25\bin;%PATH%
24-
- gem install xml-simple
25-
- ps: >-
26-
(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')
27-
28-
Start-Process msiexec.exe -ArgumentList /i, C:\MikTex.msi, /quiet, /qn, /norestart, INSTALLDIR=$env:MIK_TEX_INSTALL_DIR -Wait
29-
30-
before_build:
31-
- nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper
32-
- nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
33-
- nuget sources add -name serializer -source https://ci.appveyor.com/nuget/ospsuite-serializer
34-
- nuget sources add -name texreporting -source https://ci.appveyor.com/nuget/ospsuite-texreporting
35-
- nuget sources add -name databinding -source https://ci.appveyor.com/nuget/ospsuite-databinding
36-
- nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress
37-
- nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser
38-
- nuget sources add -name simmodel -source https://ci.appveyor.com/nuget/ospsuite-simmodel
39-
- nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes
40-
- nuget sources add -name core -source https://ci.appveyor.com/nuget/ospsuite-core
41-
- nuget restore
42-
- rake "update_go_license[ApplicationStartup.cs, %GO_DIAGRAM_KEY%]"
43-
44-
after_build:
45-
- rake "create_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%]"
46-
- 7z a setup.zip %APPVEYOR_BUILD_FOLDER%\setup\deploy\*.msi
47-
- rake "create_portable_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%, mobi-portable-setup.zip]"
48-
49-
build:
50-
verbosity: minimal
51-
project: MoBi.sln
52-
53-
test:
54-
assemblies:
55-
- MoBi.Tests.dll
56-
- MoBi.UI.Tests.dll
57-
58-
on_finish:
59-
- ps: Get-ChildItem setup.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
60-
- ps: Get-ChildItem .\setup\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
61-
62-
skip_commits:
63-
files:
1+
configuration: Debug
2+
image: Visual Studio 2019
3+
4+
version: '{build}'
5+
6+
init:
7+
- ps: Update-AppveyorBuild -Version "$($env:ospsuite_nightly_version).$($env:appveyor_build_version)"
8+
9+
environment:
10+
MIK_TEX_INSTALL_DIR: 'C:\MikTex\'
11+
12+
dotnet_csproj:
13+
patch: true
14+
file: '**\*.csproj'
15+
version: '$(ospsuite_nightly_version).$(build_number)'
16+
assembly_version: '$(ospsuite_nightly_version).$(build_number)'
17+
file_version: '$(ospsuite_nightly_version).$(build_number)'
18+
informational_version: '$(ospsuite_nightly_version).$(build_number)'
19+
20+
clone_depth: 1
21+
22+
install:
23+
- set PATH=C:\Ruby25\bin;%PATH%
24+
- gem install xml-simple
25+
- ps: >-
26+
(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')
27+
28+
Start-Process msiexec.exe -ArgumentList /i, C:\MikTex.msi, /quiet, /qn, /norestart, INSTALLDIR=$env:MIK_TEX_INSTALL_DIR -Wait
29+
30+
before_build:
31+
- nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper
32+
- nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
33+
- nuget sources add -name serializer -source https://ci.appveyor.com/nuget/ospsuite-serializer
34+
- nuget sources add -name texreporting -source https://ci.appveyor.com/nuget/ospsuite-texreporting
35+
- nuget sources add -name databinding -source https://ci.appveyor.com/nuget/ospsuite-databinding
36+
- nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress
37+
- nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser
38+
- nuget sources add -name simmodel -source https://ci.appveyor.com/nuget/ospsuite-simmodel
39+
- nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes
40+
- nuget sources add -name core -source https://ci.appveyor.com/nuget/ospsuite-core
41+
- nuget restore
42+
- rake "update_go_license[ApplicationStartup.cs, %GO_DIAGRAM_KEY%]"
43+
44+
after_build:
45+
- rake "create_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%]"
46+
- 7z a setup.zip %APPVEYOR_BUILD_FOLDER%\setup\deploy\*.msi
47+
- rake "create_portable_setup[%APPVEYOR_BUILD_VERSION%, %CONFIGURATION%, mobi-portable-setup.zip]"
48+
49+
build:
50+
verbosity: minimal
51+
project: MoBi.sln
52+
53+
test:
54+
assemblies:
55+
- MoBi.Tests.dll
56+
- MoBi.UI.Tests.dll
57+
58+
on_finish:
59+
- ps: Get-ChildItem setup.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
60+
- ps: Get-ChildItem .\setup\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
61+
62+
skip_commits:
63+
files:
6464
- '*.md'

‎appveyor.yml‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
configuration: Debug
2-
image: Visual Studio 2019
3-
4-
version: '{build}'
5-
6-
init:
7-
- ps: Update-AppveyorBuild -Version "$($env:ospsuite_version).$($env:appveyor_build_version)"
8-
9-
clone_depth: 1
10-
11-
dotnet_csproj:
12-
patch: true
13-
file: '**\*.csproj'
14-
version: '$(ospsuite_version).$(build_number)'
15-
assembly_version: '$(ospsuite_version).$(build_number)'
16-
file_version: '$(ospsuite_version).$(build_number)'
17-
informational_version: '$(ospsuite_version).$(build_number)'
18-
19-
before_build:
20-
- nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper
21-
- nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
22-
- nuget sources add -name serializer -source https://ci.appveyor.com/nuget/ospsuite-serializer
23-
- nuget sources add -name texreporting -source https://ci.appveyor.com/nuget/ospsuite-texreporting
24-
- nuget sources add -name databinding -source https://ci.appveyor.com/nuget/ospsuite-databinding
25-
- nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress
26-
- nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser
27-
- nuget sources add -name simmodel -source https://ci.appveyor.com/nuget/ospsuite-simmodel
28-
- nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes
29-
- nuget sources add -name core -source https://ci.appveyor.com/nuget/ospsuite-core
30-
- nuget restore
31-
32-
build:
33-
verbosity: minimal
34-
project: MoBi.sln
35-
36-
test:
37-
assemblies:
38-
- MoBi.Tests.dll
39-
- MoBi.UI.Tests.dll
40-
41-
categories:
42-
except:
43-
- IntegrationTests
44-
45-
skip_commits:
46-
files:
47-
- '*.md'
48-
49-
skip_branch_with_pr: true
50-
51-
skip_tags: true
52-
53-
branches:
54-
only:
55-
- develop
56-
57-
pull_requests:
58-
do_not_increment_build_number: true
1+
configuration: Debug
2+
image: Visual Studio 2019
3+
4+
version: '{build}'
5+
6+
init:
7+
- ps: Update-AppveyorBuild -Version "$($env:ospsuite_nightly_version).$($env:appveyor_build_version)"
8+
9+
clone_depth: 1
10+
11+
dotnet_csproj:
12+
patch: true
13+
file: '**\*.csproj'
14+
version: '$(ospsuite_nightly_version).$(build_number)'
15+
assembly_version: '$(ospsuite_nightly_version).$(build_number)'
16+
file_version: '$(ospsuite_nightly_version).$(build_number)'
17+
informational_version: '$(ospsuite_nightly_version).$(build_number)'
18+
19+
before_build:
20+
- nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper
21+
- nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility
22+
- nuget sources add -name serializer -source https://ci.appveyor.com/nuget/ospsuite-serializer
23+
- nuget sources add -name texreporting -source https://ci.appveyor.com/nuget/ospsuite-texreporting
24+
- nuget sources add -name databinding -source https://ci.appveyor.com/nuget/ospsuite-databinding
25+
- nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress
26+
- nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser
27+
- nuget sources add -name simmodel -source https://ci.appveyor.com/nuget/ospsuite-simmodel
28+
- nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes
29+
- nuget sources add -name core -source https://ci.appveyor.com/nuget/ospsuite-core
30+
- nuget restore
31+
32+
build:
33+
verbosity: minimal
34+
project: MoBi.sln
35+
36+
test:
37+
assemblies:
38+
- MoBi.Tests.dll
39+
- MoBi.UI.Tests.dll
40+
41+
categories:
42+
except:
43+
- IntegrationTests
44+
45+
skip_commits:
46+
files:
47+
- '*.md'
48+
49+
skip_branch_with_pr: true
50+
51+
skip_tags: true
52+
53+
branches:
54+
only:
55+
- hotfix/11.3
56+
57+
pull_requests:
58+
do_not_increment_build_number: true

‎rakefile.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def src_dir_for(configuration)
112112
packages_dir = src_dir_for("Debug")
113113

114114
all_users_dir = ENV['ALLUSERSPROFILE']
115-
all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '11.1')
115+
all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '11.3')
116116

117117
copy_dependencies solution_dir, all_users_application_dir do
118118
copy_files 'Data', ['xml', 'mbdt']

‎src/MoBi.Assets/MoBi.Assets.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<Version>11.1.0</Version>
6-
<PackageVersion>11.1.0</PackageVersion>
7-
<AssemblyVersion>11.1.0</AssemblyVersion>
8-
<FileVersion>11.1.0</FileVersion>
9-
<InformationalVersion>11.1.0</InformationalVersion>
5+
<Version>11.3.0</Version>
6+
<PackageVersion>11.3.0</PackageVersion>
7+
<AssemblyVersion>11.3.0</AssemblyVersion>
8+
<FileVersion>11.3.0</FileVersion>
9+
<InformationalVersion>11.3.0</InformationalVersion>
1010
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
@@ -26,9 +26,9 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
30-
<PackageReference Include="OSPSuite.Assets.Images" Version="11.2.155" />
31-
<PackageReference Include="OSPSuite.Core" Version="11.2.155" />
29+
<PackageReference Include="OSPSuite.Assets" Version="11.3.272" />
30+
<PackageReference Include="OSPSuite.Assets.Images" Version="11.3.272" />
31+
<PackageReference Include="OSPSuite.Core" Version="11.3.272" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

‎src/MoBi.BatchTool/MoBi.BatchTool.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<PropertyGroup>
44
<TargetFramework>net472</TargetFramework>
55
<OutputType>WinExe</OutputType>
6-
<Version>11.1.0</Version>
7-
<PackageVersion>11.1.0</PackageVersion>
8-
<AssemblyVersion>11.1.0</AssemblyVersion>
9-
<FileVersion>11.1.0</FileVersion>
10-
<InformationalVersion>11.1.0</InformationalVersion>
6+
<Version>11.3.0</Version>
7+
<PackageVersion>11.3.0</PackageVersion>
8+
<AssemblyVersion>11.3.0</AssemblyVersion>
9+
<FileVersion>11.3.0</FileVersion>
10+
<InformationalVersion>11.3.0</InformationalVersion>
1111
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1212
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1313
<Authors>Open-Systems-Pharmacology</Authors>
@@ -60,7 +60,7 @@
6060
</ItemGroup>
6161

6262
<ItemGroup>
63-
<PackageReference Include="OSPSuite.Core" Version="11.2.155" />
63+
<PackageReference Include="OSPSuite.Core" Version="11.3.272" />
6464
<PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
6565
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
6666
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />

‎src/MoBi.Core/MoBi.Core.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<TargetFramework>net472</TargetFramework>
5-
<Version>11.1.0</Version>
6-
<PackageVersion>11.1.0</PackageVersion>
7-
<AssemblyVersion>11.1.0</AssemblyVersion>
8-
<FileVersion>11.1.0</FileVersion>
9-
<InformationalVersion>11.1.0</InformationalVersion>
5+
<Version>11.3.0</Version>
6+
<PackageVersion>11.3.0</PackageVersion>
7+
<AssemblyVersion>11.3.0</AssemblyVersion>
8+
<FileVersion>11.3.0</FileVersion>
9+
<InformationalVersion>11.3.0</InformationalVersion>
1010
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
@@ -32,13 +32,13 @@
3232
<PackageReference Include="FluentNHibernate" Version="2.1.2" />
3333
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
3434
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
35-
<PackageReference Include="OSPSuite.Core" Version="11.2.155" />
36-
<PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
37-
<PackageReference Include="OSPSuite.Assets.Images" Version="11.2.155" />
38-
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.2.155" />
39-
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.2.155" />
40-
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.2.155" />
41-
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.2.155" />
35+
<PackageReference Include="OSPSuite.Core" Version="11.3.272" />
36+
<PackageReference Include="OSPSuite.Assets" Version="11.3.272" />
37+
<PackageReference Include="OSPSuite.Assets.Images" Version="11.3.272" />
38+
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.3.272" />
39+
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.3.272" />
40+
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.3.272" />
41+
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.3.272" />
4242
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
4343
</ItemGroup>
4444

‎src/MoBi.Engine/MoBi.Engine.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<TargetFramework>net472</TargetFramework>
5-
<Version>11.1.0</Version>
6-
<PackageVersion>11.1.0</PackageVersion>
7-
<AssemblyVersion>11.1.0</AssemblyVersion>
8-
<FileVersion>11.1.0</FileVersion>
9-
<InformationalVersion>11.1.0</InformationalVersion>
5+
<Version>11.3.0</Version>
6+
<PackageVersion>11.3.0</PackageVersion>
7+
<AssemblyVersion>11.3.0</AssemblyVersion>
8+
<FileVersion>11.3.0</FileVersion>
9+
<InformationalVersion>11.3.0</InformationalVersion>
1010
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
@@ -32,8 +32,8 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="OSPSuite.Core" Version="11.2.155" />
36-
<PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
35+
<PackageReference Include="OSPSuite.Core" Version="11.3.272" />
36+
<PackageReference Include="OSPSuite.Assets" Version="11.3.272" />
3737
</ItemGroup>
3838

3939
<ItemGroup>

0 commit comments

Comments
 (0)