Re-enable all builds

Author: JimBobSquarePants

.github/workflows/build-and-test.yml

@@ -19,45 +19,45 @@ jobs:
         isARM:
           - ${{ contains(github.event.pull_request.labels.*.name, 'arch:arm32') || contains(github.event.pull_request.labels.*.name, 'arch:arm64') }}
         options:
-          # - os: ubuntu-latest
-          #   framework: net7.0
-          #   sdk: 7.0.x
-          #   sdk-preview: true
-          #   runtime: -x64
-          #   codecov: false
-          # - os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
-          #   framework: net7.0
-          #   sdk: 7.0.x
-          #   sdk-preview: true
-          #   runtime: -x64
-          #   codecov: false
-          # - os: windows-latest
-          #   framework: net7.0
-          #   sdk: 7.0.x
-          #   sdk-preview: true
-          #   runtime: -x64
-          #   codecov: false
-          # - os: buildjet-4vcpu-ubuntu-2204-arm
-          #   framework: net7.0
-          #   sdk: 7.0.x
-          #   sdk-preview: true
-          #   runtime: -x64
-          #   codecov: false
           - os: ubuntu-latest
+            framework: net7.0
+            sdk: 7.0.x
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
+          - os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
+            framework: net7.0
+            sdk: 7.0.x
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
+          - os: windows-latest
+            framework: net7.0
+            sdk: 7.0.x
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
+          - os: buildjet-4vcpu-ubuntu-2204-arm
+            framework: net7.0
+            sdk: 7.0.x
+            sdk-preview: true
+            runtime: -x64
+            codecov: false
+          - os: ubuntu-latest
+            framework: net6.0
+            sdk: 6.0.x
+            runtime: -x64
+            codecov: false
+          - os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
+            framework: net6.0
+            sdk: 6.0.x
+            runtime: -x64
+            codecov: false
+          - os: windows-latest
             framework: net6.0
             sdk: 6.0.x
             runtime: -x64
             codecov: false
-          # - os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
-          #   framework: net6.0
-          #   sdk: 6.0.x
-          #   runtime: -x64
-          #   codecov: false
-          # - os: windows-latest
-          #   framework: net6.0
-          #   sdk: 6.0.x
-          #   runtime: -x64
-          #   codecov: false
         exclude:
           - isARM: false
             options:
@@ -108,28 +108,13 @@ jobs:
           restore-keys: ${{ runner.os }}-nuget-
 
       - name: DotNet Setup
-        if: ${{ matrix.options.sdk-preview != true }}
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
             8.0.x
             7.0.x
             6.0.x
 
-      - name: DotNet Setup Preview
-        if: ${{ matrix.options.sdk-preview == true }}
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: |
-            7.0.x
-
-      # - name: Ensure DotNet Path
-      #   if: ${{ matrix.options.os != 'windows-latest' }}
-      #   run: echo "/usr/share/dotnet" >> $GITHUB_PATH
-
-      # - name: Confirm DotNet Version
-      #   run: dotnet --version
-
       - name: DotNet Build
         if: ${{ matrix.options.sdk-preview != true }}
         shell: pwsh

.github/workflows/code-coverage.yml

@@ -61,14 +61,10 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
+            8.0.x
+            7.0.x
             6.0.x
 
-      - name: Ensure DotNet Path
-        run: echo "/usr/share/dotnet" >> $GITHUB_PATH
-
-      - name: Confirm DotNet Version
-        run: dotnet --version  # This will now find dotnet in /usr/share/dotnet
-
       - name: DotNet Build
         shell: pwsh
         run: ./ci-build.ps1 "${{matrix.options.framework}}"

ci-build.ps1

@@ -3,16 +3,6 @@ param(
   [string]$targetFramework
 )
 
-Write-Output "PATH"
-Write-Output $env:PATH
-
-Write-Output "DOTNET_LIST"
-dotnet --list-sdks
-
-# Confirm dotnet version.
-Write-Output "DOTNET_VERSION"
-dotnet --version
-
 dotnet clean -c Release
 
 $repositoryUrl = "https://github.com/$env:GITHUB_REPOSITORY"