From a7bd5507d457ffb87bcde0134f216c6e91c8fa2a Mon Sep 17 00:00:00 2001
From: Gil LaHaye <gillahaye@microsoft.com>
Date: Wed, 16 Aug 2023 12:16:14 -0700
Subject: [PATCH 1/3] Update copilot-deploy-frontend.yml

---
 .github/workflows/copilot-deploy-frontend.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/copilot-deploy-frontend.yml b/.github/workflows/copilot-deploy-frontend.yml
index c32cdb5d4..03ab6fa75 100644
--- a/.github/workflows/copilot-deploy-frontend.yml
+++ b/.github/workflows/copilot-deploy-frontend.yml
@@ -82,12 +82,12 @@ jobs:
       - name: Set version tag
         id: versiontag
         run: |
-          $VERSION_TAG = "${{ steps.gitversion.outputs.Major }}."
-          $VERSION_TAG += "${{ steps.gitversion.outputs.Minor }}."
-          $VERSION_TAG += "${{ steps.gitversion.outputs.CommitsSinceVersionSource }}"
+          VERSION_TAG="${{ steps.gitversion.outputs.Major }}."
+          VERSION_TAG+="${{ steps.gitversion.outputs.Minor }}."
+          VERSION_TAG+="${{ steps.gitversion.outputs.CommitsSinceVersionSource }}"
           echo $VERSION_TAG
-          Write-Output "versiontag=$VERSION_TAG" >> $env:GITHUB_OUTPUT
+          echo "versiontag=$VERSION_TAG" >> "$GITHUB_OUTPUT"
 
       - name: Deploy SWA
         run: |
-          scripts/deploy/deploy-webapp.sh --subscription ${{secrets.AZURE_SUBSCRIPTION_ID}} --resource-group ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --deployment-name ${{inputs.DEPLOYMENT_NAME}} --application-id ${{vars.APPLICATION_CLIENT_ID}} --authority ${{secrets.APPLICATION_AUTHORITY}} --no-redirect -version ${{ steps.versiontag.outputs.versiontag }} -version-info "Built from commit ${{ steps.gitversion.outputs.ShortSha }} on $(Get-Date -Format "yyyy-MM-dd")"
+          scripts/deploy/deploy-webapp.sh --subscription ${{secrets.AZURE_SUBSCRIPTION_ID}} --resource-group ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --deployment-name ${{inputs.DEPLOYMENT_NAME}} --application-id ${{vars.APPLICATION_CLIENT_ID}} --authority ${{secrets.APPLICATION_AUTHORITY}} --no-redirect -version ${{ steps.versiontag.outputs.versiontag }} -version-info "Built from commit ${{ steps.gitversion.outputs.ShortSha }} on $(date +"%Y-%m-%d")"

From d8b1c0d78c41da56032104941a189290db96bb3e Mon Sep 17 00:00:00 2001
From: Gil LaHaye <gillahaye@microsoft.com>
Date: Wed, 16 Aug 2023 12:44:28 -0700
Subject: [PATCH 2/3] Update copilot-deploy-frontend.yml

---
 .github/workflows/copilot-deploy-frontend.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/copilot-deploy-frontend.yml b/.github/workflows/copilot-deploy-frontend.yml
index 03ab6fa75..f55089388 100644
--- a/.github/workflows/copilot-deploy-frontend.yml
+++ b/.github/workflows/copilot-deploy-frontend.yml
@@ -90,4 +90,4 @@ jobs:
 
       - name: Deploy SWA
         run: |
-          scripts/deploy/deploy-webapp.sh --subscription ${{secrets.AZURE_SUBSCRIPTION_ID}} --resource-group ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --deployment-name ${{inputs.DEPLOYMENT_NAME}} --application-id ${{vars.APPLICATION_CLIENT_ID}} --authority ${{secrets.APPLICATION_AUTHORITY}} --no-redirect -version ${{ steps.versiontag.outputs.versiontag }} -version-info "Built from commit ${{ steps.gitversion.outputs.ShortSha }} on $(date +"%Y-%m-%d")"
+          scripts/deploy/deploy-webapp.sh --subscription ${{secrets.AZURE_SUBSCRIPTION_ID}} --resource-group ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --deployment-name ${{inputs.DEPLOYMENT_NAME}} --application-id ${{vars.APPLICATION_CLIENT_ID}} --authority ${{secrets.APPLICATION_AUTHORITY}} --no-redirect --version ${{ steps.versiontag.outputs.versiontag }} --version-info "Built from commit ${{ steps.gitversion.outputs.ShortSha }} on $(date +"%Y-%m-%d")"

From 5a1f1c3cdc9d578669deb78ab76a955b0c8d0b9d Mon Sep 17 00:00:00 2001
From: Gil LaHaye <gillahaye@microsoft.com>
Date: Wed, 16 Aug 2023 13:38:41 -0700
Subject: [PATCH 3/3] Update deploy-webapp.sh

---
 scripts/deploy/deploy-webapp.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/deploy/deploy-webapp.sh b/scripts/deploy/deploy-webapp.sh
index faec44d84..31d072233 100755
--- a/scripts/deploy/deploy-webapp.sh
+++ b/scripts/deploy/deploy-webapp.sh
@@ -54,7 +54,7 @@ while [[ $# -gt 0 ]]; do
         shift
         shift
         ;;
-        -i|--version-nfo)
+        -i|--version-info)
         VERSION_INFO="$2"
         shift
         shift
@@ -177,4 +177,4 @@ if [ "$NO_REDIRECT" != true ]; then
     fi
 fi
 
-echo "To verify your deployment, go to 'https://$WEB_APP_URL' in your browser."
\ No newline at end of file
+echo "To verify your deployment, go to 'https://$WEB_APP_URL' in your browser."