is that better?

anpin · Feb 11, 2024 · 27e6cf2 · 27e6cf2
1 parent 67c98fd
commit 27e6cf2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,11 +28,14 @@ jobs:
           java-version: '17'
       - name: Restore dotnet tools
         run: dotnet tool restore
-      - name: Restore dependencies
-        run: msbuild -t:Restore -p:Configuration=Release
       - name: Build package
-        run:
-          ./pack.ps1 -PackageOutputPath="$(pwd)\${{ env.RESULT_DIR }}"
+        run: |
+          $packageOutputPath = Join-Path -Path $(pwd) -ChildPath ${{ env.RESULT_DIR }}
+          Write-Host "packageOutputPath: $packageOutputPath"
+          $absolutePackageOutputPath = Convert-Path -Path $PackageOutputPath -ErrorAction Stop
+          Write-Host "absolutePackageOutputPath: $absolutePackageOutputPath"
+          msbuild -t:Restore -p:Configuration=Release
+          ./pack.ps1 -PackageOutputPath $packageOutputPath
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:

diff --git a/pack.ps1 b/pack.ps1
@@ -5,7 +5,4 @@ param(
 )
 $ErrorActionPreference = "Stop"
 
-$absolutePackageOutputPath = Convert-Path -Path $PackageOutputPath -ErrorAction Stop
-Write-Host "Using PackageOutputPath: $absolutePackageOutputPath"
-
-msbuild .\src\APES.UI.XF.csproj -t:Build,Pack -p:Configuration=Release -p:PackageOutputPath="$absolutePackageOutputPath"
+msbuild .\src\APES.UI.XF.csproj -t:Build,Pack -p:Configuration=Release -p:PackageOutputPath="$PackageOutputPath"