Skip to content

Commit

Permalink
Version 10.0
Browse files Browse the repository at this point in the history
Distributed with version 10.0 of the OSPSuite
  • Loading branch information
msevestre committed Oct 6, 2021
2 parents fed9716 + 5578bd5 commit ebd6fb5
Show file tree
Hide file tree
Showing 577 changed files with 34,971 additions and 15,723 deletions.
16 changes: 2 additions & 14 deletions OSPSuite.Core.sln
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.Core.IntegrationTe
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.Presentation", "src\OSPSuite.Presentation\OSPSuite.Presentation.csproj", "{5CBFB5CA-1F1B-44CB-9C51-0C7904B12AD5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.Presentation.Importer", "src\OSPSuite.Presentation.Importer\OSPSuite.Presentation.Importer.csproj", "{A9ABCE50-65D6-4E4C-A4F1-730A4FEECC46}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.Presentation.Tests", "tests\OSPSuite.Presentation.Tests\OSPSuite.Presentation.Tests.csproj", "{4B2DDBFB-6DC8-45D0-B24E-0B64FB74B93C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.UI", "src\OSPSuite.UI\OSPSuite.UI.csproj", "{AC617E4A-028B-4BFF-993C-3EA34EB042B4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.UI.Importer", "src\OSPSuite.UI.Importer\OSPSuite.UI.Importer.csproj", "{6B501AF0-ACC0-4051-8FDE-9E8A92DB22D8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.UI.Tests", "tests\OSPSuite.UI.Tests\OSPSuite.UI.Tests.csproj", "{D17000A2-5981-44EE-85FA-FDE93DF8D8D3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.Starter", "tests\OSPSuite.Starter\OSPSuite.Starter.csproj", "{6457DB7A-E3C9-48E0-A886-601570E0C060}"
Expand All @@ -55,9 +51,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.Infrastructure.Imp
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.Presentation.Serialization", "src\OSPSuite.Presentation.Serialization\OSPSuite.Presentation.Serialization.csproj", "{47A7A6BA-C804-4A5B-A28F-535FA46E5FCB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSPSuite.Infrastructure.Castle", "src\OSPSuite.Infrastructure.Castle\OSPSuite.Infrastructure.Castle.csproj", "{F428C61C-1B1A-42E2-8362-E416260E7B07}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.Infrastructure.Castle", "src\OSPSuite.Infrastructure.Castle\OSPSuite.Infrastructure.Castle.csproj", "{F428C61C-1B1A-42E2-8362-E416260E7B07}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSPSuite.Infrastructure.Autofac", "src\OSPSuite.Infrastructure.Autofac\OSPSuite.Infrastructure.Autofac.csproj", "{E29CA1A8-7589-41DD-8280-4D0D9289DDB8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.Infrastructure.Autofac", "src\OSPSuite.Infrastructure.Autofac\OSPSuite.Infrastructure.Autofac.csproj", "{E29CA1A8-7589-41DD-8280-4D0D9289DDB8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -101,10 +97,6 @@ Global
{5CBFB5CA-1F1B-44CB-9C51-0C7904B12AD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5CBFB5CA-1F1B-44CB-9C51-0C7904B12AD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5CBFB5CA-1F1B-44CB-9C51-0C7904B12AD5}.Release|Any CPU.Build.0 = Release|Any CPU
{A9ABCE50-65D6-4E4C-A4F1-730A4FEECC46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A9ABCE50-65D6-4E4C-A4F1-730A4FEECC46}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A9ABCE50-65D6-4E4C-A4F1-730A4FEECC46}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A9ABCE50-65D6-4E4C-A4F1-730A4FEECC46}.Release|Any CPU.Build.0 = Release|Any CPU
{4B2DDBFB-6DC8-45D0-B24E-0B64FB74B93C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4B2DDBFB-6DC8-45D0-B24E-0B64FB74B93C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B2DDBFB-6DC8-45D0-B24E-0B64FB74B93C}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -113,10 +105,6 @@ Global
{AC617E4A-028B-4BFF-993C-3EA34EB042B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC617E4A-028B-4BFF-993C-3EA34EB042B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AC617E4A-028B-4BFF-993C-3EA34EB042B4}.Release|Any CPU.Build.0 = Release|Any CPU
{6B501AF0-ACC0-4051-8FDE-9E8A92DB22D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6B501AF0-ACC0-4051-8FDE-9E8A92DB22D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B501AF0-ACC0-4051-8FDE-9E8A92DB22D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6B501AF0-ACC0-4051-8FDE-9E8A92DB22D8}.Release|Any CPU.Build.0 = Release|Any CPU
{D17000A2-5981-44EE-85FA-FDE93DF8D8D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D17000A2-5981-44EE-85FA-FDE93DF8D8D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D17000A2-5981-44EE-85FA-FDE93DF8D8D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
23 changes: 10 additions & 13 deletions appveyor-coverage.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
configuration: Debug
image: Visual Studio 2019

environment:
app_version: '9.0'
version: '{build}'

version: '$(app_version).{build}'
init:
- ps: Update-AppveyorBuild -Version "$($env:ospsuite_version).$($env:appveyor_build_version)"

assembly_info:
dotnet_csproj:
patch: true
file: SolutionInfo.*
assembly_version: "{version}"
assembly_file_version: "{version}"

cache:
packages -> **\packages.config
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
Expand All @@ -25,7 +24,6 @@ before_build:
- 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 smartxls -source https://ci.appveyor.com/nuget/ospsuite-smartxls
- nuget install opencover -OutputDirectory packages
- nuget restore

Expand All @@ -38,5 +36,4 @@ test_script:

install:
- set PATH=C:\Ruby22\bin;C:\\Python34;C:\\Python34\\Scripts;%PATH%"
- pip install codecov
- git submodule update --init --recursive
- pip install codecov
50 changes: 20 additions & 30 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
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%)
version: '{build}'

environment:
app_version: '9.0'
APPVEYOR_BLOCK_DOTNETCORE_TESTS_AUTORUN: true

version: '$(app_version).{build}'
init:
- ps: Update-AppveyorBuild -Version "$($env:ospsuite_version).$($env:appveyor_build_version)"

dotnet_csproj:
patch: true
file: '**\*.csproj'
assembly_version: '$(app_version).$(build_number)'
file_version: '$(app_version).$(build_number)'
informational_version: '$(app_version).$(build_number)'
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
Expand All @@ -39,6 +35,18 @@ build:

skip_branch_with_pr: true

pull_requests:
do_not_increment_build_number: true

nuget:
disable_publish_on_pr: false

skip_tags: true

skip_commits:
files:
- '*.md'

branches:
only:
- develop
Expand All @@ -51,23 +59,5 @@ test:
- OSPSuite.Infrastructure.Tests.dll
- OSPSuite.R.Tests.dll
- OSPSuite.UI.Tests.dll

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

skip_tags: true

skip_commits:
files:
- '*.md'

pull_requests:
do_not_increment_build_number: true

nuget:
disable_publish_on_pr: true


notifications:
- provider: Slack
incoming_webhook:
secure: 4MH9Em6TtrKalq6808dhPOqypTfYBJvVlqPaa9akNyFEAs8X080yIO8g1FLt3tNfBN4OpeBnkgrXzf7AqNKV5561x7Coux3ByGrHmsL1sCo=
Loading

0 comments on commit ebd6fb5

Please sign in to comment.