From 344dcdf434e0703322d4c29ab12e68d410e0a955 Mon Sep 17 00:00:00 2001
From: Daniel Collingwood <82693586+danzuep@users.noreply.github.com>
Date: Tue, 5 Dec 2023 11:14:41 +0800
Subject: [PATCH] dotnet workload restore

---
 .github/workflows/_publish.yml | 4 +++-
 .github/workflows/_version.yml | 6 +++---
 .github/workflows/release.yml  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/_publish.yml b/.github/workflows/_publish.yml
index 4c121d0..40b5bc5 100644
--- a/.github/workflows/_publish.yml
+++ b/.github/workflows/_publish.yml
@@ -52,7 +52,9 @@ jobs:
         restore-keys: nugetpackages-${{ runner.os }}
 
     - name: Publish Android package
-      run: dotnet publish $projectFile -c $configuration -f $targetFramework /p:Version=$buildVersion /p:AndroidPackageFormats=$androidPackageFormats -o $publishOutputFolder --nologo;
+      run: |
+        dotnet workload restore;
+        dotnet publish $projectFile -c $configuration -f $targetFramework /p:Version=$buildVersion /p:AndroidPackageFormats=$androidPackageFormats -o $publishOutputFolder --nologo;
       env:
         projectFile: '${{ inputs.projectFile }}'
         buildVersion: '${{ inputs.version }}'
diff --git a/.github/workflows/_version.yml b/.github/workflows/_version.yml
index 189e674..f338c2c 100644
--- a/.github/workflows/_version.yml
+++ b/.github/workflows/_version.yml
@@ -26,8 +26,8 @@ jobs:
       majorMinorPatch: ${{ steps.gitversion.outputs.majorMinorPatch }}
       preReleaseLabel: ${{ steps.gitversion.outputs.preReleaseLabel }}
       commitDate: ${{ steps.gitversion.outputs.commitDate }}
-      projectName: $projectName
-      projectFile: $projectFile
+      projectName: "$projectName"
+      projectFile: "$projectFile"
 
     steps:
     # https://github.com/actions/checkout#fetch-all-history-for-all-tags-and-branches
@@ -107,4 +107,4 @@ jobs:
         echo 'Full Semantic Version: ${{ steps.gitversion.outputs.fullSemVer }}' >> $GITHUB_STEP_SUMMARY
         echo 'Pre-release Label: ${{ steps.gitversion.outputs.preReleaseLabel }}' >> $GITHUB_STEP_SUMMARY
       env:
-        workflowName: '$projectName version ${{ steps.gitversion.outputs.semVer }}'
+        workflowName: '"$projectName" version ${{ steps.gitversion.outputs.semVer }}'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 766dd49..48b1030 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,6 +25,6 @@ jobs:
     uses: ./.github/workflows/_publish.yml
     with:
       projectName: ${{ needs.version.outputs.projectName }}
-      projectFile: ${{ needs.version.outputs.projectFiles }}
+      projectFile: ${{ needs.version.outputs.projectFile }}
       version: ${{ needs.version.outputs.semVer }}
     secrets: inherit