Merge remote-tracking branch 'origin/future' into dev

PHOENIXCONTACT · Nov 20, 2023 · f99ff8c · f99ff8c
2 parents 1a82246 + 1e3411d
commit f99ff8c
Show file tree

Hide file tree

Showing 13 changed files with 232 additions and 1,033 deletions.
diff --git a/.build/BuildToolkit.ps1 b/.build/BuildToolkit.ps1
diff --git a/.build/Common.props b/.build/Common.props
diff --git a/.build/Output.ps1 b/.build/Output.ps1
diff --git a/.build/moryx-logo.png b/.build/moryx-logo.png
diff --git a/.github/workflows/build-and-test-tool.yml b/.github/workflows/build-and-test-tool.yml
diff --git a/.github/workflows/build-tool.yml b/.github/workflows/build-tool.yml
@@ -9,47 +9,75 @@ on:
       REPOSITORY_NAME:
         required: true
         type: string
-      MORYX_OPTIMIZE_CODE:
-        required: false
-        type: string
-      MORYX_BUILD_CONFIG:
-        required: false
-        type: string
-      MORYX_BUILDNUMBER:
-        required: false
-        type: string
-      DOTNET_SKIP_FIRST_TIME_EXPERIENCE:
-        required: false
-        type: boolean
-
+
 jobs:
   Build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-
-      - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: ${{ inputs.dotnet_sdk_version }}
 
       - name: Setup Node version
         uses: actions/setup-node@v3
         with:
           node-version: 16
 
-      - name: Build
-        shell: pwsh
-        env:
-          MORYX_BUILDNUMBER: ${{inputs.MORYX_BUILDNUMBER}}
-          MORYX_OPTIMIZE_CODE: ${{inputs.MORYX_OPTIMIZE_CODE}}
-          MORYX_BUILD_CONFIG: ${{inputs.MORYX_BUILD_CONFIG}}
-          DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ${{inputs.DOTNET_SKIP_FIRST_TIME_EXPERIENCE}}
-        run: ./Build.ps1 -Build -Pack
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: ${{ inputs.dotnet_sdk_version }}
+
+      - name: Clean
+        run: dotnet clean && dotnet nuget locals all --clear
+
+      - name: Execute dotnet restore
+        run: dotnet restore
 
+      - name: Execute dotnet build
+        if: ${{ !(startsWith(github.ref, 'refs/tags/v')) }}
+        run: |
+          ASSEMBLY_VERSION="$(cat VERSION)"
+          ASSEMBLY_VERSION="${ASSEMBLY_VERSION%%.*}".0.0.0
+          echo "ASSEMBLY_VERSION = ${ASSEMBLY_VERSION}"
+          FILE_VERSION="$(cat VERSION)"."${{github.run_number}}"
+          echo "FILE_VERSION = ${FILE_VERSION}"
+          INFORMATIONAL_VERSION="$(cat VERSION)"-"${{github.ref_name}}"."${{github.run_number}}"
+          echo "INFORMATIONAL_VERSION = ${INFORMATIONAL_VERSION}"
+          dotnet build --configuration Release --no-restore -p:AssemblyVersion=$ASSEMBLY_VERSION -p:FileVersion=$FILE_VERSION -p:InformationalVersion=$INFORMATIONAL_VERSION
+        
+        
+      - name: Execute dotnet build (Release) 
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        run: |
+          ASSEMBLY_VERSION="${{github.ref_name}}"
+          ASSEMBLY_VERSION="${ASSEMBLY_VERSION#v}"
+          ASSEMBLY_VERSION="${ASSEMBLY_VERSION%%.*}".0.0.0
+          echo "ASSEMBLY_VERSION = ${ASSEMBLY_VERSION}"
+          FILE_VERSION="$(cat VERSION)"."${{github.run_number}}"
+          echo "FILE_VERSION = ${FILE_VERSION}"
+          INFORMATIONAL_VERSION="$(cat VERSION)"-"${{github.ref_name}}"."${{github.run_number}}"
+          echo "INFORMATIONAL_VERSION = ${INFORMATIONAL_VERSION}"
+          dotnet build --configuration Release --no-restore -p:AssemblyVersion=$ASSEMBLY_VERSION -p:FileVersion=$FILE_VERSION -p:InformationalVersion=$INFORMATIONAL_VERSION
+        
+        
+      - name: Execute dotnet pack with release version
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        run: |
+          RELEASE_VERSION="${{github.ref_name}}"
+          RELEASE_VERSION="${RELEASE_VERSION#v}"
+          echo "RELEASE_VERSION = ${RELEASE_VERSION}"
+          dotnet pack --configuration Release --no-build --no-restore --output artifacts/packages -p:PackageVersion=$RELEASE_VERSION
+         
+        
+      - name: Execute dotnet pack with production version (dev or future)
+        if: ${{ github.ref_name == 'dev' || github.ref_name == 'future'}}
+        run: |
+          PRODUCTION_VERSION="$(cat VERSION)"-"${{github.ref_name}}"."${{github.run_number}}"
+          echo "PRODUCTION_VERSION = ${PRODUCTION_VERSION}"
+          dotnet pack --configuration Release --no-build --no-restore --output artifacts/packages -p:PackageVersion=$PRODUCTION_VERSION
+        
       - name: Upload package artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: packages
-          path: artifacts/Packages/
-          retention-days: 1
+          name: ${{inputs.REPOSITORY_NAME}}-packages
+          path: artifacts/packages/
+          retention-days: 1
diff --git a/.github/workflows/documentation-tool.yml b/.github/workflows/documentation-tool.yml
@@ -3,43 +3,25 @@ name: Documentation
 on:
   workflow_call:
     inputs:
-      dotnet_sdk_version:
-        required: true
-        type: string
       REPOSITORY_NAME:
         required: true
         type: string
-      MORYX_OPTIMIZE_CODE:
-        required: false
-        type: string
-      MORYX_BUILD_CONFIG:
-        required: false
-        type: string
-      MORYX_BUILDNUMBER:
-        required: false
-        type: string
-      DOTNET_SKIP_FIRST_TIME_EXPERIENCE:
-        required: false
-        type: boolean
 
 jobs:
   Documentation:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout code 
+        uses: actions/checkout@v2
 
-      - name: Generate docFx
-        shell: pwsh
-        env:
-          MORYX_BUILDNUMBER: ${{inputs.MORYX_BUILDNUMBER}}
-          MORYX_OPTIMIZE_CODE: ${{inputs.MORYX_OPTIMIZE_CODE}}
-          MORYX_BUILD_CONFIG: ${{inputs.MORYX_BUILD_CONFIG}}
-          DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ${{inputs.DOTNET_SKIP_FIRST_TIME_EXPERIENCE}}
-        run: ./Build.ps1 -GenerateDocs
+      - name: Build Documentation
+        uses: nunit/[email protected]  
+        with:
+          args: docs/docfx.json
 
       - name: Upload documentation results
         uses: actions/upload-artifact@v2
         with:
-          name: documentation
-          path: artifacts/Documentation/
+          name: ${{inputs.REPOSITORY_NAME}}-documentation
+          path: docs/_site
           retention-days: 2
diff --git a/.github/workflows/integrationtest-tool.yml b/.github/workflows/integrationtest-tool.yml
@@ -9,24 +9,13 @@ on:
       REPOSITORY_NAME:
         required: true
         type: string
-      MORYX_OPTIMIZE_CODE:
-        required: false
-        type: string
-      MORYX_BUILD_CONFIG:
-        required: false
-        type: string
-      MORYX_BUILDNUMBER:
-        required: false
-        type: string
-      DOTNET_SKIP_FIRST_TIME_EXPERIENCE:
-        required: false
-        type: boolean
 
 jobs:
   IntegrationTests:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout code 
+        uses: actions/checkout@v2
 
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v1
@@ -41,18 +30,19 @@ jobs:
       - name: Clean
         run: dotnet clean && dotnet nuget locals all --clear
 
-      - name: Execute Integration Tests
-        shell: pwsh
-        env:
-          MORYX_BUILDNUMBER: ${{inputs.MORYX_BUILDNUMBER}}
-          MORYX_OPTIMIZE_CODE: ${{inputs.MORYX_OPTIMIZE_CODE}}
-          MORYX_BUILD_CONFIG: ${{inputs.MORYX_BUILD_CONFIG}}
-          DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ${{inputs.DOTNET_SKIP_FIRST_TIME_EXPERIENCE}}
-        run: ./Build.ps1 -IntegrationTests
+      - name: Execute dotnet restore
+        run: dotnet restore
 
+      - name: Execute dotnet build
+        run: dotnet build --no-restore
+
+      - name: Execute dotnet test (needs coverlet.collector nuget)
+        run: dotnet test --no-build --filter FullyQualifiedName~Integration --collect:"XPlat Code Coverage"
+
       - name: Upload test results
         uses: actions/upload-artifact@v2
         with:
           name: ${{inputs.REPOSITORY_NAME}}-test-results
-          path: artifacts/Tests/
-          retention-days: 1
+          path: src/Tests/**/TestResults/**/coverage.cobertura.xml
+          retention-days: 1
+