Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
16 changes: 3 additions & 13 deletions .github/workflows/BuildAndTest (Scheduled).yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ jobs:
run: dotnet test --framework net8.0 --results-directory test-results-net8.0 --logger junit --configuration=${{env.BUILD_CONFIGURATION}} --no-restore

- name: Run Unit Tests - .NET Framework 4.8
if: (startsWith(matrix.os, 'windows'))
run: dotnet test --framework net48 --results-directory test-results-net48 --logger junit --configuration=${{env.BUILD_CONFIGURATION}} --no-restore

# - name: Dir Listing (Win) test-results
Expand Down Expand Up @@ -108,20 +109,9 @@ jobs:
check_name: Unit Test Results (${{matrix.os}}) - NET 8.0
report_individual_runs: true

- name: Publish Unit Test Results (Linux) - NET Framework 4.8
uses: EnricoMi/publish-unit-test-result-action@v2
if: always() && startsWith(matrix.os, 'ubuntu')
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
files: "test-results-net48/TestResults.xml"
check_run_annotations: all tests
comment_title: Unit Test Statistics (${{matrix.os}}) - NET Framework 4.8
check_name: Unit Test Results (${{matrix.os}}) - NET Framework 4.8
report_individual_runs: true

- name: Publish Unit Test Results (Win/Mac) - NET Framework 4.8
- name: Publish Unit Test Results (Win) - NET Framework 4.8
uses: EnricoMi/publish-unit-test-result-action/composite@v2
if: always() && (!(startsWith(matrix.os, 'ubuntu')))
if: always() && (startsWith(matrix.os, 'windows'))
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
files: "test-results-net48/TestResults.xml"
Expand Down
16 changes: 3 additions & 13 deletions .github/workflows/BuildAndTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ jobs:
run: dotnet test --framework net8.0 --results-directory test-results-net8.0 --logger junit --configuration=${{env.BUILD_CONFIGURATION}} --no-restore

- name: Run Unit Tests - .NET Framework 4.8
if: (startsWith(matrix.os, 'windows'))
run: dotnet test --framework net48 --results-directory test-results-net48 --logger junit --configuration=${{env.BUILD_CONFIGURATION}} --no-restore

# - name: Dir Listing (Win) test-results
Expand Down Expand Up @@ -113,20 +114,9 @@ jobs:
check_name: Unit Test Results (${{matrix.os}}) - NET 8.0
report_individual_runs: true

- name: Publish Unit Test Results (Linux) - NET Framework 4.8
uses: EnricoMi/publish-unit-test-result-action@v2
if: always() && startsWith(matrix.os, 'ubuntu')
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
files: "test-results-net48/TestResults.xml"
check_run_annotations: all tests
comment_title: Unit Test Statistics (${{matrix.os}}) - NET Framework 4.8
check_name: Unit Test Results (${{matrix.os}}) - NET Framework 4.8
report_individual_runs: true

- name: Publish Unit Test Results (Win/Mac) - NET Framework 4.8
- name: Publish Unit Test Results (Win) - NET Framework 4.8
uses: EnricoMi/publish-unit-test-result-action/composite@v2
if: always() && (!(startsWith(matrix.os, 'ubuntu')))
if: always() && (startsWith(matrix.os, 'windows'))
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
files: "test-results-net48/TestResults.xml"
Expand Down
19 changes: 9 additions & 10 deletions CompuMaster.Scopevisio.OpenApi.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29905.134
# Visual Studio Version 18
VisualStudioVersion = 18.0.11222.15 d18.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompuMaster.Scopevisio.OpenApi", "src\CompuMaster.Scopevisio.OpenApi\CompuMaster.Scopevisio.OpenApi.csproj", "{59C6F37B-4487-49D0-9B64-C8B9E772272C}"
EndProject
Expand All @@ -11,6 +11,9 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8FDD29A3-7D26-48C7-8C27-922FEEED0B24}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.github\workflows\BuildAndTest (Scheduled).yml = .github\workflows\BuildAndTest (Scheduled).yml
.github\workflows\BuildAndTest.yml = .github\workflows\BuildAndTest.yml
.github\workflows\PublishRelease.yml = .github\workflows\PublishRelease.yml
EndProjectSection
EndProject
Global
Expand All @@ -23,18 +26,14 @@ Global
{59C6F37B-4487-49D0-9B64-C8B9E772272C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59C6F37B-4487-49D0-9B64-C8B9E772272C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59C6F37B-4487-49D0-9B64-C8B9E772272C}.Release|Any CPU.Build.0 = Release|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU
{19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.Build.0 = Release|Any CPU
{612F8DBB-46C3-430B-9083-FD25DBB15275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{612F8DBB-46C3-430B-9083-FD25DBB15275}.Debug|Any CPU.Build.0 = Debug|Any CPU
{612F8DBB-46C3-430B-9083-FD25DBB15275}.Release|Any CPU.ActiveCfg = Release|Any CPU
{612F8DBB-46C3-430B-9083-FD25DBB15275}.Release|Any CPU.Build.0 = Release|Any CPU
{8CA7D7C9-425E-4F8E-BD06-74DDD04D79E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CA7D7C9-425E-4F8E-BD06-74DDD04D79E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CA7D7C9-425E-4F8E-BD06-74DDD04D79E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8CA7D7C9-425E-4F8E-BD06-74DDD04D79E8}.Release|Any CPU.Build.0 = Release|Any CPU
{612F8DBB-46C3-430B-9083-FD25DBB15275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{612F8DBB-46C3-430B-9083-FD25DBB15275}.Debug|Any CPU.Build.0 = Debug|Any CPU
{612F8DBB-46C3-430B-9083-FD25DBB15275}.Release|Any CPU.ActiveCfg = Release|Any CPU
{612F8DBB-46C3-430B-9083-FD25DBB15275}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading