Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Build and Publish 12.2
run-name: Version 12.2.${{ github.run_number }} (${{ github.event.head_commit.message }})
name: Build and Publish 12.3
run-name: Version 12.3.${{ github.run_number }} (${{ github.event.head_commit.message }})

on:
push:
Expand All @@ -11,7 +11,7 @@ permissions:

env:
MAJOR: 12
MINOR: 2
MINOR: 3
RUN: ${{ github.run_number }}

jobs:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build PR 12.2
name: Build PR 12.3

on:
pull_request:
Expand All @@ -24,7 +24,7 @@ jobs:
dotnet restore

- name: Build
run: dotnet build OSPSuite.Core.sln /p:Version=12.2.9999
run: dotnet build OSPSuite.Core.sln /p:Version=12.3.9999

- name : Test
run: dotnet test .\tests\**\bin\Debug\net472\OSPSuite*Tests.dll -v normal --no-build --logger:"html;LogFileName=../testLog_Windows.html"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
run: |
nuget sources add -username Open-Systems-Pharmacology -password ${{ secrets.GITHUB_TOKEN }} -name OSP-GitHub-Packages -source "https://nuget.pkg.github.com/Open-Systems-Pharmacology/index.json"
dotnet restore
dotnet build OSPSuite.Core.sln /p:Version=12.2.9999
dotnet build OSPSuite.Core.sln /p:Version=12.3.9999

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Code Coverage 12.2
name: Code Coverage 12.3

on:
schedule:
Expand All @@ -23,7 +23,7 @@ jobs:
dotnet restore

- name: Build
run: dotnet build OSPSuite.Core.sln /p:Version=12.2.999
run: dotnet build OSPSuite.Core.sln /p:Version=12.3.999


- name: Cover and report
Expand Down
10 changes: 5 additions & 5 deletions OSPSuite.Core.sln
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31912.275
# Visual Studio Version 18
VisualStudioVersion = 18.1.11312.151 d18.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSPSuite.Core", "src\OSPSuite.Core\OSPSuite.Core.csproj", "{BBEFC737-8370-44A0-B3B4-60A6C405569C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{25A7357D-0812-44F3-AF90-244FD752FAE2}"
ProjectSection(SolutionItems) = preProject
.github\workflows\build-and-publish_12.2.yml = .github\workflows\build-and-publish_12.2.yml
.github\workflows\build-pr_12.2.yml = .github\workflows\build-pr_12.2.yml
.github\workflows\coverage_12.2.yml = .github\workflows\coverage_12.2.yml
.github\workflows\build-and-publish_12.3.yml = .github\workflows\build-and-publish_12.3.yml
.github\workflows\build-pr_12.3.yml = .github\workflows\build-pr_12.3.yml
.github\workflows\coverage_12.3.yml = .github\workflows\coverage_12.3.yml
dotcover.xml = dotcover.xml
logo.png = logo.png
rakefile.rb = rakefile.rb
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Core functionalities of the Open Systems Pharmacology Suite.

## Code Status
[![Build status](https://img.shields.io/github/actions/workflow/status/Open-Systems-Pharmacology/OSPSuite.Core/build-and-publish_12.2.yml?logo=nuget&label=Build%20status)](https://github.com/Open-Systems-Pharmacology/OSPSuite.Core/actions/workflows/build-and-publish_12.2.yml)
[![Build status](https://img.shields.io/github/actions/workflow/status/Open-Systems-Pharmacology/OSPSuite.Core/build-and-publish_12.3.yml?logo=nuget&label=Build%20status)](https://github.com/Open-Systems-Pharmacology/OSPSuite.Core/actions/workflows/build-and-publish_12.3.yml)
[![Coverage status](https://codecov.io/gh/Open-Systems-Pharmacology/OSPSuite.Core/branch/develop/graph/badge.svg)](https://codecov.io/gh/Open-Systems-Pharmacology/OSPSuite.Core)

## Code of conduct
Expand Down
2 changes: 1 addition & 1 deletion rakefile.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

task :create_local_nuget, [:arg1, :arg2, :arg3] do |t, args|
FileUtils.rm_f Dir.glob("./nuget_repo/*.nupkg")
versionId = "12.2.0-" + generate_code(5)
versionId = "12.3.0-" + generate_code(5)
puts("Your version is " + versionId.red)
system("dotnet", "pack", "-p:PackageVersion="+ versionId, "--configuration", "Debug", "--output", "nuget_repo", "--no-build")
if args.to_hash.values.include? "m"
Expand Down
Loading