Skip to content

Commit 1e3411d

Browse files
1nf0rmagician1nf0rmagician
authored
Merge pull request #5 from PHOENIXCONTACT/feature/net-8
Update MORYX toolset to .net 8
2 parents 11fe6a7 + 9c69b51 commit 1e3411d

File tree

6 files changed

+49
-64
lines changed

6 files changed

+49
-64
lines changed

‎.github/workflows/build-tool.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,13 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v2
18-
19-
# - name: Setup .NET SDK
20-
# uses: actions/setup-dotnet@v3
21-
# with:
22-
# dotnet-version: 6.x
2318

2419
- name: Setup Node version
2520
uses: actions/setup-node@v3
2621
with:
2722
node-version: 16
2823

29-
- name: Setup .NET SDK standard (7)
24+
- name: Setup .NET SDK
3025
uses: actions/setup-dotnet@v3
3126
with:
3227
dotnet-version: ${{ inputs.dotnet_sdk_version }}

‎.github/workflows/documentation-tool.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@ jobs:
1111
Documentation:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
15-
16-
- uses: nuget/setup-nuget@v1
17-
with:
18-
nuget-version: latest
14+
- name: Checkout code
15+
uses: actions/checkout@v2
1916

2017
- name: Build Documentation
21-
uses: nunit/docfx-action@v2.4.0
18+
uses: nunit/docfx-action@v2.6.0
2219
with:
2320
args: docs/docfx.json
2421

‎.github/workflows/integrationtest-tool.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,14 @@ jobs:
1414
IntegrationTests:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v2
17+
- name: Checkout code
18+
uses: actions/checkout@v2
1819

19-
- name: Setup .NET SDK standard (7)
20+
- name: Setup .NET SDK
2021
uses: actions/setup-dotnet@v1
2122
with:
2223
dotnet-version: ${{ inputs.dotnet_sdk_version }}
2324

24-
- name: Setup .NET SDK 6 for testing purposes
25-
uses: actions/setup-dotnet@v1
26-
with:
27-
dotnet-version: 6.x
28-
2925
- name: Setup Node version
3026
uses: actions/setup-node@v3
3127
with:

‎.github/workflows/build-and-test-tool.yml renamed to ‎.github/workflows/reference-example.yml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- future
1515

1616
env:
17-
dotnet_sdk_version: '7.x'
17+
dotnet_sdk_version: '8.0.100-preview.5.23303.2'
1818
REPOSITORY_NAME: ${{ github.event.repository.name }}
1919
MORYX_PACKAGE_TARGET_DEV: 'https://www.myget.org/F/moryx/api/v2/package'
2020
MORYX_PACKAGE_TARGET_V3_DEV: 'https://www.myget.org/F/moryx/api/v3/index.json'
@@ -24,7 +24,7 @@ env:
2424
MORYX_PACKAGE_TARGET_V3_RELEASE: 'https://api.nuget.org/v3/index.json'
2525

2626
jobs:
27-
EnvVar:
27+
SetupEnvironment:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- run: echo ""
@@ -39,60 +39,60 @@ jobs:
3939
MORYX_PACKAGE_TARGET_V3_RELEASE: ${{ env.MORYX_PACKAGE_TARGET_V3_RELEASE }}
4040

4141
Build:
42-
needs: [EnvVar]
43-
uses: phoenixcontact/tools/.github/workflows/build-tool.yml@main
42+
needs: [SetupEnvironment]
43+
uses: phoenixcontact/tools/.github/workflows/build-tool.yml@future
4444
with:
45-
dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
46-
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
45+
dotnet_sdk_version: ${{ needs.SetupEnvironment.outputs.dotnet_sdk_version }}
46+
REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
4747

4848
UnitTests:
49-
needs: [EnvVar, Build]
50-
uses: phoenixcontact/tools/.github/workflows/unittest-tool.yml@main
49+
needs: [SetupEnvironment, Build]
50+
uses: ./.github/workflows/unittest-tool.yml@future
5151
with:
52-
dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
53-
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
52+
dotnet_sdk_version: ${{ needs.SetupEnvironment.outputs.dotnet_sdk_version }}
53+
REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
5454

5555
IntegrationTests:
56-
needs: [EnvVar, Build]
57-
uses: phoenixcontact/tools/.github/workflows/integrationtest-tool.yml@main
56+
needs: [SetupEnvironment, Build]
57+
uses: phoenixcontact/tools/.github/workflows/integrationtest-tool.yml@future
5858
with:
59-
dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
60-
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
59+
dotnet_sdk_version: ${{ needs.SetupEnvironment.outputs.dotnet_sdk_version }}
60+
REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
6161

6262
ReportGenerator:
63-
needs: [EnvVar, UnitTests, IntegrationTests]
64-
uses: phoenixcontact/tools/.github/workflows/reportgenerator-tool.yml@main
63+
needs: [SetupEnvironment, UnitTests, IntegrationTests]
64+
uses: phoenixcontact/tools/.github/workflows/reportgenerator-tool.yml@future
6565
with:
66-
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
66+
REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
6767

6868
Publish-Test-Coverage:
69-
needs: [EnvVar, ReportGenerator]
70-
uses: phoenixcontact/tools/.github/workflows/publish-test-coverage-tool.yml@main
69+
needs: [SetupEnvironment, ReportGenerator]
70+
uses: phoenixcontact/tools/.github/workflows/publish-test-coverage-tool.yml@future
7171
with:
72-
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
72+
REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
7373
secrets:
7474
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
7575
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
7676

77-
# currently not working with .Net 8 and in Framework-repo
78-
# Documentation:
79-
# needs: [EnvVar, UnitTests]
80-
# uses: phoenixcontact/tools/.github/workflows/documentation-tool.yml@main
81-
# with:
82-
# REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
77+
78+
Documentation:
79+
needs: [SetupEnvironment, UnitTests]
80+
uses: phoenixcontact/tools/.github/workflows/documentation-tool.yml@future
81+
with:
82+
REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
8383

8484
Publish:
85-
needs: [EnvVar, UnitTests]
86-
uses: phoenixcontact/tools/.github/workflows/publish-tool.yml@main
85+
needs: [SetupEnvironment, UnitTests]
86+
uses: phoenixcontact/tools/.github/workflows/publish-tool.yml@future
8787
with:
88-
dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
89-
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
90-
MORYX_PACKAGE_TARGET_DEV: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_DEV }}
91-
MORYX_PACKAGE_TARGET_V3_DEV: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_DEV }}
92-
MORYX_PACKAGE_TARGET_FUTURE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_FUTURE }}
93-
MORYX_PACKAGE_TARGET_V3_FUTURE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_FUTURE }}
94-
MORYX_PACKAGE_TARGET_RELEASE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_RELEASE }}
95-
MORYX_PACKAGE_TARGET_V3_RELEASE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_RELEASE }}
88+
dotnet_sdk_version: ${{ needs.SetupEnvironment.outputs.dotnet_sdk_version }}
89+
REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
90+
MORYX_PACKAGE_TARGET_DEV: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_DEV }}
91+
MORYX_PACKAGE_TARGET_V3_DEV: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_V3_DEV }}
92+
MORYX_PACKAGE_TARGET_FUTURE: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_FUTURE }}
93+
MORYX_PACKAGE_TARGET_V3_FUTURE: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_V3_FUTURE }}
94+
MORYX_PACKAGE_TARGET_RELEASE: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_RELEASE }}
95+
MORYX_PACKAGE_TARGET_V3_RELEASE: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_V3_RELEASE }}
9696
secrets:
9797
MYGET_TOKEN: ${{secrets.MYGET_TOKEN}}
9898
NUGET_TOKEN: ${{secrets.NUGET_TOKEN}}

‎.github/workflows/reportgenerator-tool.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ jobs:
1111
ReportGenerator:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- name: Checkout code
15+
uses: actions/checkout@v2
1516

1617
- name: Download test results
1718
uses: actions/download-artifact@v2
@@ -20,7 +21,7 @@ jobs:
2021
path: artifacts/test-results
2122

2223
- name: ReportGenerator
23-
uses: danielpalme/ReportGenerator-GitHub-Action@5.1.12
24+
uses: danielpalme/ReportGenerator-GitHub-Action@5.1.22
2425
with:
2526
reports: artifacts/test-results/**/TestResults/**/coverage.cobertura.xml
2627
targetdir: Coverage

‎.github/workflows/unittest-tool.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,14 @@ jobs:
1414
UnitTests:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v2
17+
- name: Checkout code
18+
uses: actions/checkout@v2
1819

19-
- name: Setup .NET SDK standard (7)
20+
- name: Setup .NET SDK
2021
uses: actions/setup-dotnet@v1
2122
with:
2223
dotnet-version: ${{ inputs.dotnet_sdk_version }}
2324

24-
- name: Setup .NET SDK 6 for testing purposes
25-
uses: actions/setup-dotnet@v1
26-
with:
27-
dotnet-version: 6.x
28-
2925
- name: Setup Node version
3026
uses: actions/setup-node@v3
3127
with:

0 commit comments

Comments
 (0)