Merge pull request #5 from PHOENIXCONTACT/feature/net-8

Update MORYX toolset to .net 8
PHOENIXCONTACT · Jun 23, 2023 · 1e3411d · 1e3411d
2 parents 11fe6a7 + 9c69b51
commit 1e3411d
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 64 deletions.
diff --git a/.github/workflows/build-tool.yml b/.github/workflows/build-tool.yml
@@ -15,18 +15,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-
-      # - name: Setup .NET SDK
-      #   uses: actions/setup-dotnet@v3
-      #   with:
-      #     dotnet-version: 6.x
 
       - name: Setup Node version
         uses: actions/setup-node@v3
         with:
           node-version: 16
 
-      - name: Setup .NET SDK standard (7)
+      - name: Setup .NET SDK
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: ${{ inputs.dotnet_sdk_version }}

diff --git a/.github/workflows/documentation-tool.yml b/.github/workflows/documentation-tool.yml
@@ -11,14 +11,11 @@ jobs:
   Documentation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
-      - uses: nuget/setup-nuget@v1
-        with:
-          nuget-version: latest
+      - name: Checkout code 
+        uses: actions/checkout@v2
 
       - name: Build Documentation
-        uses: nunit/docfx-action@v2.4.0  
+        uses: nunit/docfx-action@v2.6.0  
         with:
           args: docs/docfx.json
 

diff --git a/.github/workflows/integrationtest-tool.yml b/.github/workflows/integrationtest-tool.yml
@@ -14,18 +14,14 @@ jobs:
   IntegrationTests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout code 
+        uses: actions/checkout@v2
 
-      - name: Setup .NET SDK standard (7)
+      - name: Setup .NET SDK
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: ${{ inputs.dotnet_sdk_version }}
 
-      - name: Setup .NET SDK 6 for testing purposes
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.x
-
       - name: Setup Node version
         uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/build-and-test-tool.yml → .github/workflows/reference-example.yml b/.github/workflows/build-and-test-tool.yml → .github/workflows/reference-example.yml
@@ -14,7 +14,7 @@ on:
       - future
 
 env:
-  dotnet_sdk_version: '7.x'
+  dotnet_sdk_version: '8.0.100-preview.5.23303.2'
   REPOSITORY_NAME: ${{ github.event.repository.name }}
   MORYX_PACKAGE_TARGET_DEV: 'https://www.myget.org/F/moryx/api/v2/package'
   MORYX_PACKAGE_TARGET_V3_DEV: 'https://www.myget.org/F/moryx/api/v3/index.json'
@@ -24,7 +24,7 @@ env:
   MORYX_PACKAGE_TARGET_V3_RELEASE: 'https://api.nuget.org/v3/index.json'
 
 jobs:
-  EnvVar:
+  SetupEnvironment:
     runs-on: ubuntu-latest
     steps:
       - run: echo ""
@@ -39,60 +39,60 @@ jobs:
       MORYX_PACKAGE_TARGET_V3_RELEASE: ${{ env.MORYX_PACKAGE_TARGET_V3_RELEASE }}
 
   Build:
-    needs: [EnvVar]
-    uses: phoenixcontact/tools/.github/workflows/build-tool.yml@main
+    needs: [SetupEnvironment]
+    uses: phoenixcontact/tools/.github/workflows/build-tool.yml@future
     with:
-      dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
-      REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
+      dotnet_sdk_version: ${{ needs.SetupEnvironment.outputs.dotnet_sdk_version }}
+      REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
 
   UnitTests:
-    needs: [EnvVar, Build]
-    uses: phoenixcontact/tools/.github/workflows/unittest-tool.yml@main
+    needs: [SetupEnvironment, Build]
+    uses: ./.github/workflows/unittest-tool.yml@future
     with:
-      dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
-      REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
+      dotnet_sdk_version: ${{ needs.SetupEnvironment.outputs.dotnet_sdk_version }}
+      REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
 
   IntegrationTests:
-    needs: [EnvVar, Build]
-    uses: phoenixcontact/tools/.github/workflows/integrationtest-tool.yml@main
+    needs: [SetupEnvironment, Build]
+    uses: phoenixcontact/tools/.github/workflows/integrationtest-tool.yml@future
     with:
-      dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
-      REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
+      dotnet_sdk_version: ${{ needs.SetupEnvironment.outputs.dotnet_sdk_version }}
+      REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
 
   ReportGenerator:
-    needs: [EnvVar, UnitTests, IntegrationTests]
-    uses: phoenixcontact/tools/.github/workflows/reportgenerator-tool.yml@main
+    needs: [SetupEnvironment, UnitTests, IntegrationTests]
+    uses: phoenixcontact/tools/.github/workflows/reportgenerator-tool.yml@future
     with:
-      REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
+      REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
 
   Publish-Test-Coverage:
-    needs: [EnvVar, ReportGenerator]
-    uses: phoenixcontact/tools/.github/workflows/publish-test-coverage-tool.yml@main
+    needs: [SetupEnvironment, ReportGenerator]
+    uses: phoenixcontact/tools/.github/workflows/publish-test-coverage-tool.yml@future
     with:
-      REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
+      REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
     secrets:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
-  # currently not working with .Net 8 and in Framework-repo
-  # Documentation:
-  #   needs: [EnvVar, UnitTests]
-  #   uses: phoenixcontact/tools/.github/workflows/documentation-tool.yml@main
-  #   with:
-  #     REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
+
+  Documentation:
+    needs: [SetupEnvironment, UnitTests]
+    uses: phoenixcontact/tools/.github/workflows/documentation-tool.yml@future
+    with:
+      REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
 
   Publish:
-    needs: [EnvVar, UnitTests]
-    uses: phoenixcontact/tools/.github/workflows/publish-tool.yml@main
+    needs: [SetupEnvironment, UnitTests]
+    uses: phoenixcontact/tools/.github/workflows/publish-tool.yml@future
     with:
-      dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
-      REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
-      MORYX_PACKAGE_TARGET_DEV: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_DEV }}
-      MORYX_PACKAGE_TARGET_V3_DEV: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_DEV }}
-      MORYX_PACKAGE_TARGET_FUTURE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_FUTURE }}
-      MORYX_PACKAGE_TARGET_V3_FUTURE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_FUTURE }}
-      MORYX_PACKAGE_TARGET_RELEASE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_RELEASE }}
-      MORYX_PACKAGE_TARGET_V3_RELEASE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_RELEASE }}
+      dotnet_sdk_version: ${{ needs.SetupEnvironment.outputs.dotnet_sdk_version }}
+      REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
+      MORYX_PACKAGE_TARGET_DEV: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_DEV }}
+      MORYX_PACKAGE_TARGET_V3_DEV: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_V3_DEV }}
+      MORYX_PACKAGE_TARGET_FUTURE: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_FUTURE }}
+      MORYX_PACKAGE_TARGET_V3_FUTURE: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_V3_FUTURE }}
+      MORYX_PACKAGE_TARGET_RELEASE: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_RELEASE }}
+      MORYX_PACKAGE_TARGET_V3_RELEASE: ${{ needs.SetupEnvironment.outputs.MORYX_PACKAGE_TARGET_V3_RELEASE }}
     secrets: 
       MYGET_TOKEN: ${{secrets.MYGET_TOKEN}}
       NUGET_TOKEN: ${{secrets.NUGET_TOKEN}}

diff --git a/.github/workflows/reportgenerator-tool.yml b/.github/workflows/reportgenerator-tool.yml
@@ -11,7 +11,8 @@ jobs:
   ReportGenerator:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout code 
+        uses: actions/checkout@v2
 
       - name: Download test results
         uses: actions/download-artifact@v2
@@ -20,7 +21,7 @@ jobs:
           path: artifacts/test-results
 
       - name: ReportGenerator
-        uses: danielpalme/[email protected].12
+        uses: danielpalme/[email protected].22
         with:
           reports: artifacts/test-results/**/TestResults/**/coverage.cobertura.xml
           targetdir: Coverage

diff --git a/.github/workflows/unittest-tool.yml b/.github/workflows/unittest-tool.yml
@@ -14,18 +14,14 @@ jobs:
   UnitTests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout code 
+        uses: actions/checkout@v2
 
-      - name: Setup .NET SDK standard (7)
+      - name: Setup .NET SDK
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: ${{ inputs.dotnet_sdk_version }}
 
-      - name: Setup .NET SDK 6 for testing purposes
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.x
-
       - name: Setup Node version
         uses: actions/setup-node@v3
         with: