Merge pull request #19 from WarehouseFinds/feat/update-actions

Update .NET version in CI workflow to 10.0.x

Author: marko-stanojevic

.github/actions/ps-build/action.yml

@@ -55,7 +55,7 @@ runs:
       uses: actions/upload-artifact@v4
       with:
         name: ${{ github.event.repository.name }}.${{ steps.gitversion.outputs.MajorMinorPatch }}.nupkg
-        path: /build/package/${{ github.event.repository.name }}.${{ steps.gitversion.outputs.MajorMinorPatch }}.nupkg
+        path: build/package/${{ github.event.repository.name }}.${{ steps.gitversion.outputs.MajorMinorPatch }}.nupkg
 
     - name: Upload module bin artifacts
       id: upload_bin

.github/workflows/ci.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '10.0.x'
 
       - name: Restore dependencies
         run: dotnet restore
@@ -124,22 +124,55 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '10.0.x'
 
-      - name: Download all build artifacts
-        uses: actions/download-artifact@v5
-        with:
-          name: PSBinaryModule
-          path: build/out/PSBinaryModule
+      - name: Build Module
+        shell: pwsh
+        run: |
+          dotnet restore './PSBinaryModule.sln'
+          dotnet build './PSBinaryModule.sln' --configuration Release --no-restore
+
+          if (Get-Command Invoke-Build -ErrorAction SilentlyContinue) {
+            Invoke-Build -Task Build -Configuration Release
+          } else {
+            Install-Module InvokeBuild -Force -SkipPublisherCheck
+            Invoke-Build -Task Build -Configuration Release
+          }
+
+      - name: Install PowerShell
+        shell: pwsh
+        run: |
+          if ($env:RUNNER_OS -eq 'Linux') {
+            sudo apt-get update
+            sudo apt-get install -y powershell
+          } elseif ($env:RUNNER_OS -eq 'macOS') {
+            brew install --cask powershell
+          }
 
-      - name: Setup PowerShell
+      - name: Install Pester
         shell: pwsh
         run: |
-          Install-PSResource -Name Pester -TrustRepository -AcceptLicense
+          Install-Module Pester -Force -SkipPublisherCheck
+
+      - name: Configure .NET Environment
+        shell: pwsh
+        run: |
+          $dotnetInfo = & dotnet --info
+          $sdkPath = $dotnetInfo | Select-String "Base Path:" | ForEach-Object { $_.Line -replace '.*Base Path:\s*', '' }
+          if ($sdkPath) {
+            $dotnetRoot = Split-Path -Parent (Split-Path -Parent $sdkPath)
+            echo "DOTNET_ROOT=$dotnetRoot" >> $env:GITHUB_ENV
+            echo "DOTNET_MULTILEVEL_LOOKUP=1" >> $env:GITHUB_ENV
+            Write-Host "DOTNET_ROOT set to: $dotnetRoot"
+          }
 
       - name: Run Integration Tests
         shell: pwsh
+        env:
+          DOTNET_ROOT: ${{ env.DOTNET_ROOT }}
+          DOTNET_MULTILEVEL_LOOKUP: ${{ env.DOTNET_MULTILEVEL_LOOKUP }}
         run: |
+          Import-Module Pester
           $config = New-PesterConfiguration @{
               Run        = @{
                   Path     = './tests/Integration'
@@ -158,7 +191,6 @@ jobs:
               }
           }
           Invoke-Pester -Configuration $config
-
       - name: Upload test results
         uses: actions/upload-artifact@v6
         if: always()

PSBinaryModule.build.ps1

@@ -169,17 +169,21 @@ task Build Compile, {
         Copy-Item -Path "$helpPath/*" -Destination $outputHelpPath -Recurse -Force
     }
 
-    # Copy dependencies (if any)
+    # Copy dependencies
     $binPath = Join-Path -Path $srcPath -ChildPath "bin/$Configuration"
     Get-ChildItem -Path $binPath -Filter '*.dll' | Where-Object {
         $_.Name -ne "$moduleName.dll" -and
-        $_.Name -notmatch '^System\.' -and
-        $_.Name -notmatch '^Microsoft\.' -and
         $_.Name -ne 'PowerShellStandard.Library.dll'
     } | ForEach-Object {
         Copy-Item -Path $_.FullName -Destination $outputPath -Force
     }
 
+    # Copy the deps.json file which helps with assembly resolution
+    $depsFile = Join-Path -Path $binPath -ChildPath "$moduleName.deps.json"
+    if (Test-Path $depsFile) {
+        Copy-Item -Path $depsFile -Destination $outputPath -Force
+    }
+
     Write-Build Green "Module built successfully at: $outputPath"
 }
 

src/PSBinaryModule.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
+    <RuntimeIdentifiers>win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <AssemblyName>PSBinaryModule</AssemblyName>
     <RootNamespace>PSBinaryModule</RootNamespace>
     <LangVersion>latest</LangVersion>