From 21775ad05bf2415ebd480c17a803fd8a83065a72 Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Fri, 15 Oct 2021 15:32:54 -0700
Subject: [PATCH 01/17] Rename "azure.yml" to Node-specific name

---
 .../{azure.yml => azure-webapps-node.yml}     | 30 +++++++++++++++----
 ...son => azure-webapps-node.properties.json} |  0
 2 files changed, 24 insertions(+), 6 deletions(-)
 rename deployments/{azure.yml => azure-webapps-node.yml} (81%)
 rename deployments/properties/{azure.properties.json => azure-webapps-node.properties.json} (100%)

diff --git a/deployments/azure.yml b/deployments/azure-webapps-node.yml
similarity index 81%
rename from deployments/azure.yml
rename to deployments/azure-webapps-node.yml
index 0262b49..ab144ba 100644
--- a/deployments/azure.yml
+++ b/deployments/azure-webapps-node.yml
@@ -25,23 +25,41 @@ env:
   NODE_VERSION: '10.x'                # set this to the node version to use
 
 jobs:
-  build-and-deploy:
-    name: Build and Deploy
+  build:
     runs-on: ubuntu-latest
-    environment: production
     steps:
     - uses: actions/checkout@v2
-    - name: Use Node.js ${{ env.NODE_VERSION }}
+
+    - name: Set up Node.js
       uses: actions/setup-node@v2
       with:
         node-version: ${{ env.NODE_VERSION }}
+
     - name: npm install, build, and test
       run: |
-        # Build and test the project, then
-        # deploy to Azure Web App.
         npm install
         npm run build --if-present
         npm run test --if-present
+
+    - name: Upload artifact for deployment job
+      uses: actions/upload-artifact@v2
+      with:
+        name: node-app
+        path: .
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+    - name: Download artifact from build job
+      uses: actions/download-artifact@v2
+      with:
+        name: node-app
+
     - name: 'Deploy to Azure WebApp'
       uses: azure/webapps-deploy@v2
       with:
diff --git a/deployments/properties/azure.properties.json b/deployments/properties/azure-webapps-node.properties.json
similarity index 100%
rename from deployments/properties/azure.properties.json
rename to deployments/properties/azure-webapps-node.properties.json

From e59c11c494c0a2a443cf8577b496e63f618c8169 Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Fri, 15 Oct 2021 15:33:45 -0700
Subject: [PATCH 02/17] Add templates and properties for other languages

---
 deployments/azure-webapps-container.yml       | 59 ++++++++++++++++
 deployments/azure-webapps-java-jar.yml        | 56 ++++++++++++++++
 deployments/azure-webapps-python.yml          | 67 +++++++++++++++++++
 .../azure-webapps-container.properties.json   |  7 ++
 .../azure-webapps-java-jar.properties.json    |  7 ++
 .../azure-webapps-python.properties.json      |  7 ++
 6 files changed, 203 insertions(+)
 create mode 100644 deployments/azure-webapps-container.yml
 create mode 100644 deployments/azure-webapps-java-jar.yml
 create mode 100644 deployments/azure-webapps-python.yml
 create mode 100644 deployments/properties/azure-webapps-container.properties.json
 create mode 100644 deployments/properties/azure-webapps-java-jar.properties.json
 create mode 100644 deployments/properties/azure-webapps-python.properties.json

diff --git a/deployments/azure-webapps-container.yml b/deployments/azure-webapps-container.yml
new file mode 100644
index 0000000..b9dab0d
--- /dev/null
+++ b/deployments/azure-webapps-container.yml
@@ -0,0 +1,59 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy a container to an Azure Web App
+
+env:
+  AZURE_WEBAPP_NAME: ''  # set this to the name of your Azure Web App
+
+on:
+  push:
+    branches:
+      - $default-branch
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Log in to GitHub container registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Lowercase the repo name
+        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
+
+      - name: Build and push container image to registry
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: ghcr.io/${{ env.REPO }}:${{ github.sha }}
+          file: ./Dockerfile
+
+    deploy:
+      runs-on: ubuntu-latest
+      needs: build
+      environment:
+        name: 'Production'
+        url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+      steps:
+        - name: Lowercase the repo name
+          run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
+        
+        - name: Deploy to Azure Web App
+          id: deploy-to-webapp
+          uses: azure/webapps-deploy@v2
+          with:
+            app-name: ${{ env.AZURE_WEBAPP_NAME }}
+            publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
+            images: 'ghcr.io/${{ env.REPO }}:${{ github.sha }}'
\ No newline at end of file
diff --git a/deployments/azure-webapps-java-jar.yml b/deployments/azure-webapps-java-jar.yml
new file mode 100644
index 0000000..ae1cb87
--- /dev/null
+++ b/deployments/azure-webapps-java-jar.yml
@@ -0,0 +1,56 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy JAR app to Azure Web App
+
+env:
+  AZURE_WEBAPP_NAME: your-app-name    # set this to the name of your Azure Web App
+  JAVA_VERSION: '11'                  # set this to the Java version to use
+
+on:
+  push:
+    branches:
+      - $default-branch
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Java version
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+
+      - name: Build with Maven
+        run: mvn clean install
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v2
+        with:
+          name: java-app
+          path: '${{ github.workspace }}/target/*.jar'
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: Production
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: java-app
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: ${{ env.AZURE_WEBAPP_NAME }}
+          publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
+          package: '*.jar'
\ No newline at end of file
diff --git a/deployments/azure-webapps-python.yml b/deployments/azure-webapps-python.yml
new file mode 100644
index 0000000..a934a02
--- /dev/null
+++ b/deployments/azure-webapps-python.yml
@@ -0,0 +1,67 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+# More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions
+
+name: Build and deploy Python app to Azure Web App - __sitename__
+
+env:
+  AZURE_WEBAPP_NAME: your-app-name  # set this to the name of your Azure Web App
+  PYTHON_VERSION: '11'              # set this to the Python version to use
+
+on:
+  push:
+    branches:
+      - $default-branch
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python version
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Create and start virtual environment
+        run: |
+          python -m venv venv
+          source venv/bin/activate
+      
+      - name: Install dependencies
+        run: pip install -r requirements.txt
+        
+      # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
+      
+      - name: Upload artifact for deployment jobs
+        uses: actions/upload-artifact@v2
+        with:
+          name: python-app
+          path: |
+            . 
+            !venv/
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: '__slotname__'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: python-app
+          path: .
+          
+      - name: 'Deploy to Azure Web App'
+        uses: azure/webapps-deploy@v2
+        id: deploy-to-webapp
+        with:
+          app-name: '__sitename__'
+          slot-name: '__slotname__'
+          publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
diff --git a/deployments/properties/azure-webapps-container.properties.json b/deployments/properties/azure-webapps-container.properties.json
new file mode 100644
index 0000000..1335e3a
--- /dev/null
+++ b/deployments/properties/azure-webapps-container.properties.json
@@ -0,0 +1,7 @@
+{
+    "name": "Deploy a container to an Azure Web App",
+    "description": "Build a container and deploy it to an Azure Web App.",
+    "creator": "Microsoft Azure",
+    "iconName": "azure",
+    "categories": ["Deployment"]
+}
\ No newline at end of file
diff --git a/deployments/properties/azure-webapps-java-jar.properties.json b/deployments/properties/azure-webapps-java-jar.properties.json
new file mode 100644
index 0000000..f2418fa
--- /dev/null
+++ b/deployments/properties/azure-webapps-java-jar.properties.json
@@ -0,0 +1,7 @@
+{
+    "name": "Deploy a Java .jar app to an Azure Web App",
+    "description": "Build a Java project and deploy it to an Azure Web App.",
+    "creator": "Microsoft Azure",
+    "iconName": "azure",
+    "categories": ["Deployment"]
+}
\ No newline at end of file
diff --git a/deployments/properties/azure-webapps-python.properties.json b/deployments/properties/azure-webapps-python.properties.json
new file mode 100644
index 0000000..f749848
--- /dev/null
+++ b/deployments/properties/azure-webapps-python.properties.json
@@ -0,0 +1,7 @@
+{
+    "name": "Deploy a Python app to an Azure Web App",
+    "description": "Build a Python app and deploy it to an Azure Web App.",
+    "creator": "Microsoft Azure",
+    "iconName": "azure",
+    "categories": ["Deployment"]
+}
\ No newline at end of file

From 4fad808870ff1d108b443339ba43616c6f88c6ca Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Fri, 15 Oct 2021 15:47:30 -0700
Subject: [PATCH 03/17] Add workflow for .NET Core

---
 deployments/azure-webapps-dotnet-core.yml     | 59 +++++++++++++++++++
 .../properties/azure-webapps-donet-core.json  |  7 +++
 2 files changed, 66 insertions(+)
 create mode 100644 deployments/azure-webapps-dotnet-core.yml
 create mode 100644 deployments/properties/azure-webapps-donet-core.json

diff --git a/deployments/azure-webapps-dotnet-core.yml b/deployments/azure-webapps-dotnet-core.yml
new file mode 100644
index 0000000..532efc4
--- /dev/null
+++ b/deployments/azure-webapps-dotnet-core.yml
@@ -0,0 +1,59 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy ASP.Net Core app to an Azure Web App
+
+env:
+  AZURE_WEBAPP_NAME: your-app-name    # set this to the name of your Azure Web App
+  DOTNET_VERSION: '5'                 # set this to the .NET Core version to use
+
+on:
+  push:
+    branches:
+      - $default-branch
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: ${{ env.DOTNET_VERSION }}
+
+      - name: Build with dotnet
+        run: dotnet build --configuration Release
+
+      - name: dotnet publish
+        run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v2
+        with:
+          name: .net-app
+          path: ${{env.DOTNET_ROOT}}/myapp
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: .net-app
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: ${{ env.AZURE_WEBAPP_NAME }}
+          publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
+          package: .
diff --git a/deployments/properties/azure-webapps-donet-core.json b/deployments/properties/azure-webapps-donet-core.json
new file mode 100644
index 0000000..3ac2f8c
--- /dev/null
+++ b/deployments/properties/azure-webapps-donet-core.json
@@ -0,0 +1,7 @@
+{
+    "name": "Deploy a .NET Core app to an Azure Web App",
+    "description": "Build a .NET Core project and deploy it to an Azure Web App.",
+    "creator": "Microsoft Azure",
+    "iconName": "azure",
+    "categories": ["Deployment"]
+}
\ No newline at end of file

From a702d187d139aa4b2f22db55a7bcd8fb5d796027 Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Sun, 24 Oct 2021 21:37:36 -0700
Subject: [PATCH 04/17] Add workflow and properties file for PHP

---
 deployments/azure-webapps-php.yml             | 64 +++++++++++++++++++
 .../azure-webapps-php.properties.json         |  7 ++
 2 files changed, 71 insertions(+)
 create mode 100644 deployments/azure-webapps-php.yml
 create mode 100644 deployments/properties/azure-webapps-php.properties.json

diff --git a/deployments/azure-webapps-php.yml b/deployments/azure-webapps-php.yml
new file mode 100644
index 0000000..261184b
--- /dev/null
+++ b/deployments/azure-webapps-php.yml
@@ -0,0 +1,64 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy PHP app to Azure Web App - __sitename__
+
+on:
+  push:
+    branches:
+      - $default-branch
+  workflow_dispatch:
+
+env:
+  AZURE_WEBAPP_NAME: your-app-name    # set this to your application's name
+  AZURE_WEBAPP_PACKAGE_PATH: '.'      # set this to the path to your web app project, defaults to the repository root
+  NODE_VERSION: '10.x'                # set this to the PHP version to use
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ env.NODE_VERSION }}
+
+      - name: Check if composer.json exists
+        id: check_files
+        uses: andstor/file-existence-action@v1
+        with:
+          files: 'composer.json'
+
+      - name: Run composer install if composer.json exists
+        if: steps.check_files.outputs.files_exists == 'true'
+        run: composer validate --no-check-publish && composer install --prefer-dist --no-progress
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v2
+        with:
+          name: php-app
+          path: .
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: php-app
+
+      - name: 'Deploy to Azure Web App'
+        uses: azure/webapps-deploy@v2
+        id: deploy-to-webapp
+        with:
+        app-name: ${{ env.AZURE_WEBAPP_NAME }}
+        publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
+        package: .
diff --git a/deployments/properties/azure-webapps-php.properties.json b/deployments/properties/azure-webapps-php.properties.json
new file mode 100644
index 0000000..42fd724
--- /dev/null
+++ b/deployments/properties/azure-webapps-php.properties.json
@@ -0,0 +1,7 @@
+{
+    "name": "Deploy a PHP app to an Azure Web App",
+    "description": "Build a PHP app and deploy it to an Azure Web App.",
+    "creator": "Microsoft Azure",
+    "iconName": "azure",
+    "categories": ["Deployment"]
+}
\ No newline at end of file

From 704eb638ced8cd324890dcf8b1cbe0e21498e65c Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Sun, 24 Oct 2021 21:45:21 -0700
Subject: [PATCH 05/17] Updates from PR review

---
 deployments/azure-webapps-container.yml                  | 2 +-
 deployments/azure-webapps-dotnet-core.yml                | 2 +-
 deployments/azure-webapps-java-jar.yml                   | 2 +-
 deployments/azure-webapps-node.yml                       | 2 +-
 deployments/azure-webapps-php.yml                        | 8 ++++----
 deployments/azure-webapps-python.yml                     | 9 ++++-----
 .../properties/azure-webapps-container.properties.json   | 4 ++--
 ...ps-donet-core.json => azure-webapps-dotnet-core.json} | 4 ++--
 .../properties/azure-webapps-java-jar.properties.json    | 4 ++--
 .../properties/azure-webapps-node.properties.json        | 4 ++--
 deployments/properties/azure-webapps-php.properties.json | 4 ++--
 .../properties/azure-webapps-python.properties.json      | 4 ++--
 12 files changed, 24 insertions(+), 25 deletions(-)
 rename deployments/properties/{azure-webapps-donet-core.json => azure-webapps-dotnet-core.json} (78%)

diff --git a/deployments/azure-webapps-container.yml b/deployments/azure-webapps-container.yml
index b9dab0d..e2dec98 100644
--- a/deployments/azure-webapps-container.yml
+++ b/deployments/azure-webapps-container.yml
@@ -43,7 +43,7 @@ jobs:
       runs-on: ubuntu-latest
       needs: build
       environment:
-        name: 'Production'
+        name: 'Development'
         url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
 
       steps:
diff --git a/deployments/azure-webapps-dotnet-core.yml b/deployments/azure-webapps-dotnet-core.yml
index 532efc4..9948969 100644
--- a/deployments/azure-webapps-dotnet-core.yml
+++ b/deployments/azure-webapps-dotnet-core.yml
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     environment:
-      name: 'Production'
+      name: 'Development'
       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
 
     steps:
diff --git a/deployments/azure-webapps-java-jar.yml b/deployments/azure-webapps-java-jar.yml
index ae1cb87..a46026d 100644
--- a/deployments/azure-webapps-java-jar.yml
+++ b/deployments/azure-webapps-java-jar.yml
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     environment:
-      name: Production
+      name: 'Development'
       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
     
     steps:
diff --git a/deployments/azure-webapps-node.yml b/deployments/azure-webapps-node.yml
index ab144ba..f3221c2 100644
--- a/deployments/azure-webapps-node.yml
+++ b/deployments/azure-webapps-node.yml
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     environment:
-      name: 'Production'
+      name: 'Development'
       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
 
     steps:
diff --git a/deployments/azure-webapps-php.yml b/deployments/azure-webapps-php.yml
index 261184b..936e0db 100644
--- a/deployments/azure-webapps-php.yml
+++ b/deployments/azure-webapps-php.yml
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     environment:
-      name: 'Production'
+      name: 'Development'
       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
 
     steps:
@@ -59,6 +59,6 @@ jobs:
         uses: azure/webapps-deploy@v2
         id: deploy-to-webapp
         with:
-        app-name: ${{ env.AZURE_WEBAPP_NAME }}
-        publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
-        package: .
+          app-name: ${{ env.AZURE_WEBAPP_NAME }}
+          publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
+          package: .
diff --git a/deployments/azure-webapps-python.yml b/deployments/azure-webapps-python.yml
index a934a02..c4ba186 100644
--- a/deployments/azure-webapps-python.yml
+++ b/deployments/azure-webapps-python.yml
@@ -2,11 +2,11 @@
 # More GitHub Actions for Azure: https://github.com/Azure/actions
 # More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions
 
-name: Build and deploy Python app to Azure Web App - __sitename__
+name: Build and deploy Python app to Azure Web App
 
 env:
   AZURE_WEBAPP_NAME: your-app-name  # set this to the name of your Azure Web App
-  PYTHON_VERSION: '11'              # set this to the Python version to use
+  PYTHON_VERSION: '3.8'              # set this to the Python version to use
 
 on:
   push:
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     environment:
-      name: '__slotname__'
+      name: 'Development'
       url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
 
     steps:
@@ -62,6 +62,5 @@ jobs:
         uses: azure/webapps-deploy@v2
         id: deploy-to-webapp
         with:
-          app-name: '__sitename__'
-          slot-name: '__slotname__'
+          app-name: ${{ env.AZURE_WEBAPP_NAME }}
           publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
diff --git a/deployments/properties/azure-webapps-container.properties.json b/deployments/properties/azure-webapps-container.properties.json
index 1335e3a..fcd62b2 100644
--- a/deployments/properties/azure-webapps-container.properties.json
+++ b/deployments/properties/azure-webapps-container.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a container and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": ["Deployment"]
-}
\ No newline at end of file
+    "categories": ["Deployment", "Dockerfile"]
+}
diff --git a/deployments/properties/azure-webapps-donet-core.json b/deployments/properties/azure-webapps-dotnet-core.json
similarity index 78%
rename from deployments/properties/azure-webapps-donet-core.json
rename to deployments/properties/azure-webapps-dotnet-core.json
index 3ac2f8c..9074a2a 100644
--- a/deployments/properties/azure-webapps-donet-core.json
+++ b/deployments/properties/azure-webapps-dotnet-core.json
@@ -3,5 +3,5 @@
     "description": "Build a .NET Core project and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": ["Deployment"]
-}
\ No newline at end of file
+    "categories": ["Deployment", "C#", "dotNetCore"]
+}
diff --git a/deployments/properties/azure-webapps-java-jar.properties.json b/deployments/properties/azure-webapps-java-jar.properties.json
index f2418fa..6654463 100644
--- a/deployments/properties/azure-webapps-java-jar.properties.json
+++ b/deployments/properties/azure-webapps-java-jar.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a Java project and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": ["Deployment"]
-}
\ No newline at end of file
+    "categories": ["Deployment", "Java"]
+}
diff --git a/deployments/properties/azure-webapps-node.properties.json b/deployments/properties/azure-webapps-node.properties.json
index 362d5d1..f24fd04 100644
--- a/deployments/properties/azure-webapps-node.properties.json
+++ b/deployments/properties/azure-webapps-node.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a Node.js project and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": ["Deployment"]
-}
\ No newline at end of file
+    "categories": ["Deployment", "Node"]
+}
diff --git a/deployments/properties/azure-webapps-php.properties.json b/deployments/properties/azure-webapps-php.properties.json
index 42fd724..48554de 100644
--- a/deployments/properties/azure-webapps-php.properties.json
+++ b/deployments/properties/azure-webapps-php.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a PHP app and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": ["Deployment"]
-}
\ No newline at end of file
+    "categories": ["Deployment", "PHP"]
+}
diff --git a/deployments/properties/azure-webapps-python.properties.json b/deployments/properties/azure-webapps-python.properties.json
index f749848..73f0cf5 100644
--- a/deployments/properties/azure-webapps-python.properties.json
+++ b/deployments/properties/azure-webapps-python.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a Python app and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": ["Deployment"]
-}
\ No newline at end of file
+    "categories": ["Deployment", "Python"]
+}

From b5113430d97e147627681b7acb9e8799b18338b0 Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Sun, 24 Oct 2021 21:46:13 -0700
Subject: [PATCH 06/17] Fix EOF

---
 deployments/azure-webapps-container.yml | 2 +-
 deployments/azure-webapps-java-jar.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployments/azure-webapps-container.yml b/deployments/azure-webapps-container.yml
index e2dec98..66c49d8 100644
--- a/deployments/azure-webapps-container.yml
+++ b/deployments/azure-webapps-container.yml
@@ -56,4 +56,4 @@ jobs:
           with:
             app-name: ${{ env.AZURE_WEBAPP_NAME }}
             publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
-            images: 'ghcr.io/${{ env.REPO }}:${{ github.sha }}'
\ No newline at end of file
+            images: 'ghcr.io/${{ env.REPO }}:${{ github.sha }}'
diff --git a/deployments/azure-webapps-java-jar.yml b/deployments/azure-webapps-java-jar.yml
index a46026d..8e4f5fb 100644
--- a/deployments/azure-webapps-java-jar.yml
+++ b/deployments/azure-webapps-java-jar.yml
@@ -53,4 +53,4 @@ jobs:
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }}
           publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
-          package: '*.jar'
\ No newline at end of file
+          package: '*.jar'

From c78dd727e93078bf584efad509341f4758d7ad5a Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Sun, 24 Oct 2021 21:47:00 -0700
Subject: [PATCH 07/17] Use latest versions

---
 deployments/azure-webapps-java-jar.yml | 2 +-
 deployments/azure-webapps-python.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployments/azure-webapps-java-jar.yml b/deployments/azure-webapps-java-jar.yml
index 8e4f5fb..45ec6f8 100644
--- a/deployments/azure-webapps-java-jar.yml
+++ b/deployments/azure-webapps-java-jar.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up Java version
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2.3.1
         with:
           java-version: ${{ env.JAVA_VERSION }}
 
diff --git a/deployments/azure-webapps-python.yml b/deployments/azure-webapps-python.yml
index c4ba186..7ad005e 100644
--- a/deployments/azure-webapps-python.yml
+++ b/deployments/azure-webapps-python.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up Python version
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2.2.2
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 

From 3893e3d7c85c519d9c6125372276812811dbac3b Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Wed, 27 Oct 2021 12:20:09 -0700
Subject: [PATCH 08/17] Add setup instructions to the top

---
 deployments/azure-webapps-container.yml   | 20 ++++++++++++++--
 deployments/azure-webapps-dotnet-core.yml | 23 ++++++++++++++++---
 deployments/azure-webapps-java-jar.yml    | 20 ++++++++++++++--
 deployments/azure-webapps-node.yml        | 25 ++++++++++++--------
 deployments/azure-webapps-php.yml         | 28 ++++++++++++++++++-----
 deployments/azure-webapps-python.yml      | 23 +++++++++++++++----
 6 files changed, 112 insertions(+), 27 deletions(-)

diff --git a/deployments/azure-webapps-container.yml b/deployments/azure-webapps-container.yml
index 66c49d8..18cc860 100644
--- a/deployments/azure-webapps-container.yml
+++ b/deployments/azure-webapps-container.yml
@@ -1,5 +1,21 @@
-# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
-# More GitHub Actions for Azure: https://github.com/Azure/actions
+# This workflow will build and push a Docker container to an Azure Web App when a commit is pushed to your default branch.
+#
+# This workflow assumes you have already created the target Azure App Service web app.
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
+#
+# To configure this workflow:
+#
+# 1. Download the Publish Profile for your Azure Web App. You can download this file from the Overview page of your Web App in the Azure Portal.
+#    For more information: https://docs.microsoft.com/en-us/azure/app-service/deploy-github-actions?tabs=applevel#generate-deployment-credentials
+#
+# 2. Create a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE, paste the publish profile contents as the value of the secret.
+#    For instructions on obtaining the publish profile see: https://docs.microsoft.com/azure/app-service/deploy-github-actions#configure-the-github-secret
+#
+# 3. Change the value for the AZURE_WEBAPP_NAME.
+#
+# For more information on GitHub Actions for Azure: https://github.com/Azure/Actions
+# For more information on the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# For more samples to get started with GitHub Action workflows to deploy to Azure: https://github.com/Azure/actions-workflow-samples
 
 name: Build and deploy a container to an Azure Web App
 
diff --git a/deployments/azure-webapps-dotnet-core.yml b/deployments/azure-webapps-dotnet-core.yml
index 9948969..656136c 100644
--- a/deployments/azure-webapps-dotnet-core.yml
+++ b/deployments/azure-webapps-dotnet-core.yml
@@ -1,10 +1,27 @@
-# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
-# More GitHub Actions for Azure: https://github.com/Azure/actions
+# This workflow will build and push a .NET Core app to an Azure Web App when a commit is pushed to your default branch.
+#
+# This workflow assumes you have already created the target Azure App Service web app.
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
+#
+# To configure this workflow:
+#
+# 1. Download the Publish Profile for your Azure Web App. You can download this file from the Overview page of your Web App in the Azure Portal.
+#    For more information: https://docs.microsoft.com/en-us/azure/app-service/deploy-github-actions?tabs=applevel#generate-deployment-credentials
+#
+# 2. Create a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE, paste the publish profile contents as the value of the secret.
+#    For instructions on obtaining the publish profile see: https://docs.microsoft.com/azure/app-service/deploy-github-actions#configure-the-github-secret
+#
+# 3. Change the value for the AZURE_WEBAPP_NAME. Optionally, change the AZURE_WEBAPP_PACKAGE_PATH and DOTNET_VERSION environment variables below.
+#
+# For more information on GitHub Actions for Azure: https://github.com/Azure/Actions
+# For more information on the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# For more samples to get started with GitHub Action workflows to deploy to Azure: https://github.com/Azure/actions-workflow-samples
 
 name: Build and deploy ASP.Net Core app to an Azure Web App
 
 env:
   AZURE_WEBAPP_NAME: your-app-name    # set this to the name of your Azure Web App
+  AZURE_WEBAPP_PACKAGE_PATH: '.'      # set this to the path to your web app project, defaults to the repository root
   DOTNET_VERSION: '5'                 # set this to the .NET Core version to use
 
 on:
@@ -56,4 +73,4 @@ jobs:
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }}
           publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
-          package: .
+          package: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
diff --git a/deployments/azure-webapps-java-jar.yml b/deployments/azure-webapps-java-jar.yml
index 45ec6f8..48e9e88 100644
--- a/deployments/azure-webapps-java-jar.yml
+++ b/deployments/azure-webapps-java-jar.yml
@@ -1,5 +1,21 @@
-# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
-# More GitHub Actions for Azure: https://github.com/Azure/actions
+# This workflow will build and push a node.js application to an Azure Web App when a commit is pushed to your default branch.
+#
+# This workflow assumes you have already created the target Azure App Service web app.
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
+#
+# To configure this workflow:
+#
+# 1. Download the Publish Profile for your Azure Web App. You can download this file from the Overview page of your Web App in the Azure Portal.
+#    For more information: https://docs.microsoft.com/en-us/azure/app-service/deploy-github-actions?tabs=applevel#generate-deployment-credentials
+#
+# 2. Create a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE, paste the publish profile contents as the value of the secret.
+#    For instructions on obtaining the publish profile see: https://docs.microsoft.com/azure/app-service/deploy-github-actions#configure-the-github-secret
+#
+# 3. Change the value for the AZURE_WEBAPP_NAME. Optionally, change the JAVA_VERSION environment variable below.
+#
+# For more information on GitHub Actions for Azure: https://github.com/Azure/Actions
+# For more information on the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# For more samples to get started with GitHub Action workflows to deploy to Azure: https://github.com/Azure/actions-workflow-samples
 
 name: Build and deploy JAR app to Azure Web App
 
diff --git a/deployments/azure-webapps-node.yml b/deployments/azure-webapps-node.yml
index f3221c2..8c80255 100644
--- a/deployments/azure-webapps-node.yml
+++ b/deployments/azure-webapps-node.yml
@@ -1,23 +1,27 @@
-# This workflow will build and push a node.js application to an Azure Web App when a release is created.
+# This workflow will build and push a node.js application to an Azure Web App when a commit is pushed to your default branch.
 #
 # This workflow assumes you have already created the target Azure App Service web app.
-# For instructions see https://docs.microsoft.com/azure/app-service/app-service-plan-manage#create-an-app-service-plan
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
 #
 # To configure this workflow:
 #
-# 1. For Linux apps, add an app setting called WEBSITE_WEBDEPLOY_USE_SCM and set it to true in your app **before downloading the file**.
-#      For more instructions see: https://docs.microsoft.com/azure/app-service/configure-common#configure-app-settings
+# 1. Download the Publish Profile for your Azure Web App. You can download this file from the Overview page of your Web App in the Azure Portal.
+#    For more information: https://docs.microsoft.com/en-us/azure/app-service/deploy-github-actions?tabs=applevel#generate-deployment-credentials
 #
-# 2. Set up a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE with the value of your Azure publish profile.
+# 2. Create a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE, paste the publish profile contents as the value of the secret.
 #    For instructions on obtaining the publish profile see: https://docs.microsoft.com/azure/app-service/deploy-github-actions#configure-the-github-secret
 #
-# 3. Change the values for the AZURE_WEBAPP_NAME, AZURE_WEBAPP_PACKAGE_PATH and NODE_VERSION environment variables  (below).
+# 3. Change the value for the AZURE_WEBAPP_NAME. Optionally, change the AZURE_WEBAPP_PACKAGE_PATH and NODE_VERSION environment variables below.
 #
-# For more information on GitHub Actions for Azure, refer to https://github.com/Azure/Actions
-# For more samples to get started with GitHub Action workflows to deploy to Azure, refer to https://github.com/Azure/actions-workflow-samples
+# For more information on GitHub Actions for Azure: https://github.com/Azure/Actions
+# For more information on the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# For more samples to get started with GitHub Action workflows to deploy to Azure: https://github.com/Azure/actions-workflow-samples
+
 on:
-  release:
-    types: [created]
+  push:
+    branches:
+      - $default-branch
+  workflow_dispatch:
 
 env:
   AZURE_WEBAPP_NAME: your-app-name    # set this to your application's name
@@ -61,6 +65,7 @@ jobs:
         name: node-app
 
     - name: 'Deploy to Azure WebApp'
+      id: deploy-to-webapp 
       uses: azure/webapps-deploy@v2
       with:
         app-name: ${{ env.AZURE_WEBAPP_NAME }}
diff --git a/deployments/azure-webapps-php.yml b/deployments/azure-webapps-php.yml
index 936e0db..19af463 100644
--- a/deployments/azure-webapps-php.yml
+++ b/deployments/azure-webapps-php.yml
@@ -1,7 +1,23 @@
-# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
-# More GitHub Actions for Azure: https://github.com/Azure/actions
+# This workflow will build and push a node.js application to an Azure Web App when a commit is pushed to your default branch.
+#
+# This workflow assumes you have already created the target Azure App Service web app.
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
+#
+# To configure this workflow:
+#
+# 1. Download the Publish Profile for your Azure Web App. You can download this file from the Overview page of your Web App in the Azure Portal.
+#    For more information: https://docs.microsoft.com/en-us/azure/app-service/deploy-github-actions?tabs=applevel#generate-deployment-credentials
+#
+# 2. Create a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE, paste the publish profile contents as the value of the secret.
+#    For instructions on obtaining the publish profile see: https://docs.microsoft.com/azure/app-service/deploy-github-actions#configure-the-github-secret
+#
+# 3. Change the value for the AZURE_WEBAPP_NAME. Optionally, change the AZURE_WEBAPP_PACKAGE_PATH and PHP_VERSION environment variables below.
+#
+# For more information on GitHub Actions for Azure: https://github.com/Azure/Actions
+# For more information on the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# For more samples to get started with GitHub Action workflows to deploy to Azure: https://github.com/Azure/actions-workflow-samples
 
-name: Build and deploy PHP app to Azure Web App - __sitename__
+name: Build and deploy PHP app to Azure Web App
 
 on:
   push:
@@ -12,7 +28,7 @@ on:
 env:
   AZURE_WEBAPP_NAME: your-app-name    # set this to your application's name
   AZURE_WEBAPP_PACKAGE_PATH: '.'      # set this to the path to your web app project, defaults to the repository root
-  NODE_VERSION: '10.x'                # set this to the PHP version to use
+  PHP_VERSION: '8.x'                  # set this to the PHP version to use
 
 jobs:
   build:
@@ -24,7 +40,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ env.NODE_VERSION }}
+          php-version: ${{ env.PHP_VERSION }}
 
       - name: Check if composer.json exists
         id: check_files
@@ -56,8 +72,8 @@ jobs:
           name: php-app
 
       - name: 'Deploy to Azure Web App'
-        uses: azure/webapps-deploy@v2
         id: deploy-to-webapp
+        uses: azure/webapps-deploy@v2
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }}
           publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
diff --git a/deployments/azure-webapps-python.yml b/deployments/azure-webapps-python.yml
index 7ad005e..208c8c1 100644
--- a/deployments/azure-webapps-python.yml
+++ b/deployments/azure-webapps-python.yml
@@ -1,6 +1,21 @@
-# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
-# More GitHub Actions for Azure: https://github.com/Azure/actions
-# More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions
+# This workflow will build and push a node.js application to an Azure Web App when a commit is pushed to your default branch.
+#
+# This workflow assumes you have already created the target Azure App Service web app.
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
+#
+# To configure this workflow:
+#
+# 1. Download the Publish Profile for your Azure Web App. You can download this file from the Overview page of your Web App in the Azure Portal.
+#    For more information: https://docs.microsoft.com/en-us/azure/app-service/deploy-github-actions?tabs=applevel#generate-deployment-credentials
+#
+# 2. Create a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE, paste the publish profile contents as the value of the secret.
+#    For instructions on obtaining the publish profile see: https://docs.microsoft.com/azure/app-service/deploy-github-actions#configure-the-github-secret
+#
+# 3. Change the value for the AZURE_WEBAPP_NAME. Optionally, change the AZURE_WEBAPP_PACKAGE_PATH and PYTHON_VERSION environment variables below.
+#
+# For more information on GitHub Actions for Azure: https://github.com/Azure/Actions
+# For more information on the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# For more samples to get started with GitHub Action workflows to deploy to Azure: https://github.com/Azure/actions-workflow-samples
 
 name: Build and deploy Python app to Azure Web App
 
@@ -59,8 +74,8 @@ jobs:
           path: .
           
       - name: 'Deploy to Azure Web App'
-        uses: azure/webapps-deploy@v2
         id: deploy-to-webapp
+        uses: azure/webapps-deploy@v2
         with:
           app-name: ${{ env.AZURE_WEBAPP_NAME }}
           publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}

From e176cd52cd2a6c5e8a5f15a500af05a40748416c Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Wed, 27 Oct 2021 12:20:29 -0700
Subject: [PATCH 09/17] Add more tech stack metadata to the properties files

---
 ...tnet-core.json => azure-webapps-dotnet-core.properties.json} | 0
 deployments/properties/azure-webapps-java-jar.properties.json   | 2 +-
 deployments/properties/azure-webapps-node.properties.json       | 2 +-
 deployments/properties/azure-webapps-python.properties.json     | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename deployments/properties/{azure-webapps-dotnet-core.json => azure-webapps-dotnet-core.properties.json} (100%)

diff --git a/deployments/properties/azure-webapps-dotnet-core.json b/deployments/properties/azure-webapps-dotnet-core.properties.json
similarity index 100%
rename from deployments/properties/azure-webapps-dotnet-core.json
rename to deployments/properties/azure-webapps-dotnet-core.properties.json
diff --git a/deployments/properties/azure-webapps-java-jar.properties.json b/deployments/properties/azure-webapps-java-jar.properties.json
index 6654463..289d95c 100644
--- a/deployments/properties/azure-webapps-java-jar.properties.json
+++ b/deployments/properties/azure-webapps-java-jar.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a Java project and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": ["Deployment", "Java"]
+    "categories": ["Deployment", "Java", "Maven"]
 }
diff --git a/deployments/properties/azure-webapps-node.properties.json b/deployments/properties/azure-webapps-node.properties.json
index f24fd04..89a9542 100644
--- a/deployments/properties/azure-webapps-node.properties.json
+++ b/deployments/properties/azure-webapps-node.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a Node.js project and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": ["Deployment", "Node"]
+    "categories": ["Deployment", "Javascript", "Typescript", "npm"]
 }
diff --git a/deployments/properties/azure-webapps-python.properties.json b/deployments/properties/azure-webapps-python.properties.json
index 73f0cf5..391af32 100644
--- a/deployments/properties/azure-webapps-python.properties.json
+++ b/deployments/properties/azure-webapps-python.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a Python app and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": ["Deployment", "Python"]
+    "categories": ["Deployment", "Python", "Django", "Flask", "Pip"]
 }

From e1ca1f58becaa3ee88a3b990b3504f0010b3749d Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Wed, 27 Oct 2021 12:23:24 -0700
Subject: [PATCH 10/17] typos

---
 deployments/azure-webapps-container.yml                         | 2 +-
 .../properties/azure-webapps-dotnet-core.properties.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployments/azure-webapps-container.yml b/deployments/azure-webapps-container.yml
index 18cc860..3fb2bbd 100644
--- a/deployments/azure-webapps-container.yml
+++ b/deployments/azure-webapps-container.yml
@@ -20,7 +20,7 @@
 name: Build and deploy a container to an Azure Web App
 
 env:
-  AZURE_WEBAPP_NAME: ''  # set this to the name of your Azure Web App
+  AZURE_WEBAPP_NAME: your-app-name  # set this to the name of your Azure Web App
 
 on:
   push:
diff --git a/deployments/properties/azure-webapps-dotnet-core.properties.json b/deployments/properties/azure-webapps-dotnet-core.properties.json
index 9074a2a..a9d5e20 100644
--- a/deployments/properties/azure-webapps-dotnet-core.properties.json
+++ b/deployments/properties/azure-webapps-dotnet-core.properties.json
@@ -3,5 +3,5 @@
     "description": "Build a .NET Core project and deploy it to an Azure Web App.",
     "creator": "Microsoft Azure",
     "iconName": "azure",
-    "categories": ["Deployment", "C#", "dotNetCore"]
+    "categories": ["Deployment", "C#", "aspNetCore"]
 }

From 69f26d5fd6ff080f5e949cde398a9f46270ef32a Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Wed, 3 Nov 2021 17:58:38 -0700
Subject: [PATCH 11/17] Copy/paste error

---
 deployments/azure-webapps-java-jar.yml | 2 +-
 deployments/azure-webapps-php.yml      | 2 +-
 deployments/azure-webapps-python.yml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deployments/azure-webapps-java-jar.yml b/deployments/azure-webapps-java-jar.yml
index 48e9e88..edb630e 100644
--- a/deployments/azure-webapps-java-jar.yml
+++ b/deployments/azure-webapps-java-jar.yml
@@ -1,4 +1,4 @@
-# This workflow will build and push a node.js application to an Azure Web App when a commit is pushed to your default branch.
+# This workflow will build and push a Java application to an Azure Web App when a commit is pushed to your default branch.
 #
 # This workflow assumes you have already created the target Azure App Service web app.
 # For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
diff --git a/deployments/azure-webapps-php.yml b/deployments/azure-webapps-php.yml
index 19af463..0be746f 100644
--- a/deployments/azure-webapps-php.yml
+++ b/deployments/azure-webapps-php.yml
@@ -1,4 +1,4 @@
-# This workflow will build and push a node.js application to an Azure Web App when a commit is pushed to your default branch.
+# This workflow will build and push a PHP application to an Azure Web App when a commit is pushed to your default branch.
 #
 # This workflow assumes you have already created the target Azure App Service web app.
 # For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
diff --git a/deployments/azure-webapps-python.yml b/deployments/azure-webapps-python.yml
index 208c8c1..6cb093b 100644
--- a/deployments/azure-webapps-python.yml
+++ b/deployments/azure-webapps-python.yml
@@ -1,4 +1,4 @@
-# This workflow will build and push a node.js application to an Azure Web App when a commit is pushed to your default branch.
+# This workflow will build and push a Python application to an Azure Web App when a commit is pushed to your default branch.
 #
 # This workflow assumes you have already created the target Azure App Service web app.
 # For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli

From a561392dff9de9a2623fb6de09e74b551e5d451e Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Wed, 3 Nov 2021 18:02:06 -0700
Subject: [PATCH 12/17] Update azure-webapps-container.yml

---
 deployments/azure-webapps-container.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/azure-webapps-container.yml b/deployments/azure-webapps-container.yml
index 3fb2bbd..823a36f 100644
--- a/deployments/azure-webapps-container.yml
+++ b/deployments/azure-webapps-container.yml
@@ -39,7 +39,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Log in to GitHub container registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v1.10.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From 5354877aa04d5e0970f648f356bc9d9f0a9c94b7 Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Wed, 3 Nov 2021 18:10:02 -0700
Subject: [PATCH 13/17] enable caching

---
 deployments/azure-webapps-java-jar.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deployments/azure-webapps-java-jar.yml b/deployments/azure-webapps-java-jar.yml
index edb630e..e533f3f 100644
--- a/deployments/azure-webapps-java-jar.yml
+++ b/deployments/azure-webapps-java-jar.yml
@@ -40,6 +40,7 @@ jobs:
         uses: actions/setup-java@v2.3.1
         with:
           java-version: ${{ env.JAVA_VERSION }}
+          cache: 'maven'
 
       - name: Build with Maven
         run: mvn clean install

From 214aeaaafe01dc791220ab91d9043e79d34db66f Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Tue, 16 Nov 2021 09:43:18 -0800
Subject: [PATCH 14/17] Update quickstart link

---
 deployments/azure-webapps-container.yml   | 2 +-
 deployments/azure-webapps-dotnet-core.yml | 2 +-
 deployments/azure-webapps-java-jar.yml    | 2 +-
 deployments/azure-webapps-php.yml         | 2 +-
 deployments/azure-webapps-python.yml      | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployments/azure-webapps-container.yml b/deployments/azure-webapps-container.yml
index 823a36f..407279e 100644
--- a/deployments/azure-webapps-container.yml
+++ b/deployments/azure-webapps-container.yml
@@ -1,7 +1,7 @@
 # This workflow will build and push a Docker container to an Azure Web App when a commit is pushed to your default branch.
 #
 # This workflow assumes you have already created the target Azure App Service web app.
-# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-custom-container?tabs=dotnet&pivots=container-linux
 #
 # To configure this workflow:
 #
diff --git a/deployments/azure-webapps-dotnet-core.yml b/deployments/azure-webapps-dotnet-core.yml
index 656136c..fe81148 100644
--- a/deployments/azure-webapps-dotnet-core.yml
+++ b/deployments/azure-webapps-dotnet-core.yml
@@ -1,7 +1,7 @@
 # This workflow will build and push a .NET Core app to an Azure Web App when a commit is pushed to your default branch.
 #
 # This workflow assumes you have already created the target Azure App Service web app.
-# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-dotnetcore?tabs=net60&pivots=development-environment-vscode
 #
 # To configure this workflow:
 #
diff --git a/deployments/azure-webapps-java-jar.yml b/deployments/azure-webapps-java-jar.yml
index e533f3f..f386250 100644
--- a/deployments/azure-webapps-java-jar.yml
+++ b/deployments/azure-webapps-java-jar.yml
@@ -1,7 +1,7 @@
 # This workflow will build and push a Java application to an Azure Web App when a commit is pushed to your default branch.
 #
 # This workflow assumes you have already created the target Azure App Service web app.
-# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-java?tabs=javase&pivots=platform-linux
 #
 # To configure this workflow:
 #
diff --git a/deployments/azure-webapps-php.yml b/deployments/azure-webapps-php.yml
index 0be746f..c900dfa 100644
--- a/deployments/azure-webapps-php.yml
+++ b/deployments/azure-webapps-php.yml
@@ -1,7 +1,7 @@
 # This workflow will build and push a PHP application to an Azure Web App when a commit is pushed to your default branch.
 #
 # This workflow assumes you have already created the target Azure App Service web app.
-# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-php?pivots=platform-linux
 #
 # To configure this workflow:
 #
diff --git a/deployments/azure-webapps-python.yml b/deployments/azure-webapps-python.yml
index 6cb093b..216742f 100644
--- a/deployments/azure-webapps-python.yml
+++ b/deployments/azure-webapps-python.yml
@@ -1,7 +1,7 @@
 # This workflow will build and push a Python application to an Azure Web App when a commit is pushed to your default branch.
 #
 # This workflow assumes you have already created the target Azure App Service web app.
-# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-nodejs?tabs=linux&pivots=development-environment-cli
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-python?tabs=bash&pivots=python-framework-flask
 #
 # To configure this workflow:
 #
@@ -11,7 +11,7 @@
 # 2. Create a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE, paste the publish profile contents as the value of the secret.
 #    For instructions on obtaining the publish profile see: https://docs.microsoft.com/azure/app-service/deploy-github-actions#configure-the-github-secret
 #
-# 3. Change the value for the AZURE_WEBAPP_NAME. Optionally, change the AZURE_WEBAPP_PACKAGE_PATH and PYTHON_VERSION environment variables below.
+# 3. Change the value for the AZURE_WEBAPP_NAME. Optionally, change the PYTHON_VERSION environment variables below.
 #
 # For more information on GitHub Actions for Azure: https://github.com/Azure/Actions
 # For more information on the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy

From 8fd6550c33440825258777a9a357dabe11fd35b2 Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Wed, 24 Nov 2021 14:20:00 -0800
Subject: [PATCH 15/17] Revert overwrite from upstream pull

---
 deployments/azure-webapps-node.yml | 32 +++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/deployments/azure-webapps-node.yml b/deployments/azure-webapps-node.yml
index a1330cc..fcfb75e 100644
--- a/deployments/azure-webapps-node.yml
+++ b/deployments/azure-webapps-node.yml
@@ -29,27 +29,45 @@ env:
   NODE_VERSION: '10.x'                # set this to the node version to use
 
 jobs:
-  build-and-deploy:
-    name: Build and Deploy
+  build:
     runs-on: ubuntu-latest
-    environment: production
     steps:
     - uses: actions/checkout@v2
-    - name: Use Node.js ${{ env.NODE_VERSION }}
+
+    - name: Set up Node.js
       uses: actions/setup-node@v2
       with:
         node-version: ${{ env.NODE_VERSION }}
+
     - name: npm install, build, and test
       run: |
-        # Build and test the project, then
-        # deploy to Azure Web App.
         npm install
         npm run build --if-present
         npm run test --if-present
+
+    - name: Upload artifact for deployment job
+      uses: actions/upload-artifact@v2
+      with:
+        name: node-app
+        path: .
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'Development'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+    - name: Download artifact from build job
+      uses: actions/download-artifact@v2
+      with:
+        name: node-app
+
     - name: 'Deploy to Azure WebApp'
       id: deploy-to-webapp 
       uses: azure/webapps-deploy@v2
       with:
         app-name: ${{ env.AZURE_WEBAPP_NAME }}
         publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
-        package: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
+        package: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
\ No newline at end of file

From 278aa7a82e206a81e3a9057063117e4d94cf5356 Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Wed, 24 Nov 2021 14:26:16 -0800
Subject: [PATCH 16/17] Add dependency caching for .NET, Node, PHP, and Python
 workflows

---
 deployments/azure-webapps-dotnet-core.yml |  8 ++++++++
 deployments/azure-webapps-node.yml        |  1 +
 deployments/azure-webapps-php.yml         | 15 +++++++++++++++
 deployments/azure-webapps-python.yml      |  8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/deployments/azure-webapps-dotnet-core.yml b/deployments/azure-webapps-dotnet-core.yml
index fe81148..7a2a84f 100644
--- a/deployments/azure-webapps-dotnet-core.yml
+++ b/deployments/azure-webapps-dotnet-core.yml
@@ -41,6 +41,14 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
+      
+      - name: Set up dependency caching for faster builds
+        uses: actions/cache@v2
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-nuget-
 
       - name: Build with dotnet
         run: dotnet build --configuration Release
diff --git a/deployments/azure-webapps-node.yml b/deployments/azure-webapps-node.yml
index fcfb75e..8546fea 100644
--- a/deployments/azure-webapps-node.yml
+++ b/deployments/azure-webapps-node.yml
@@ -38,6 +38,7 @@ jobs:
       uses: actions/setup-node@v2
       with:
         node-version: ${{ env.NODE_VERSION }}
+        cache: 'npm'
 
     - name: npm install, build, and test
       run: |
diff --git a/deployments/azure-webapps-php.yml b/deployments/azure-webapps-php.yml
index c900dfa..ad351dc 100644
--- a/deployments/azure-webapps-php.yml
+++ b/deployments/azure-webapps-php.yml
@@ -48,6 +48,21 @@ jobs:
         with:
           files: 'composer.json'
 
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        if: steps.check_files.outputs.files_exists == 'true'
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Set up dependency caching for faster installs
+        uses: actions/cache@v2
+        if: steps.check_files.outputs.files_exists == 'true'
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
       - name: Run composer install if composer.json exists
         if: steps.check_files.outputs.files_exists == 'true'
         run: composer validate --no-check-publish && composer install --prefer-dist --no-progress
diff --git a/deployments/azure-webapps-python.yml b/deployments/azure-webapps-python.yml
index 216742f..1212caa 100644
--- a/deployments/azure-webapps-python.yml
+++ b/deployments/azure-webapps-python.yml
@@ -46,6 +46,14 @@ jobs:
           python -m venv venv
           source venv/bin/activate
       
+      - name: Set up dependency caching for faster installs
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
       - name: Install dependencies
         run: pip install -r requirements.txt
         

From 1a67e08a9eb41fc63c6d5ef750ed6e8f37a9595a Mon Sep 17 00:00:00 2001
From: Jason Freeberg <jafreebe@microsoft.com>
Date: Wed, 24 Nov 2021 15:58:25 -0800
Subject: [PATCH 17/17] Update azure-webapps-container.yml

---
 deployments/azure-webapps-container.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/deployments/azure-webapps-container.yml b/deployments/azure-webapps-container.yml
index 407279e..7c7bb2a 100644
--- a/deployments/azure-webapps-container.yml
+++ b/deployments/azure-webapps-container.yml
@@ -11,7 +11,14 @@
 # 2. Create a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE, paste the publish profile contents as the value of the secret.
 #    For instructions on obtaining the publish profile see: https://docs.microsoft.com/azure/app-service/deploy-github-actions#configure-the-github-secret
 #
-# 3. Change the value for the AZURE_WEBAPP_NAME.
+# 3. Create a GitHub Personal access token with "repo" and "read:packages" permissions. 
+#
+# 4. Create three app settings on your Azure Web app:
+#       DOCKER_REGISTRY_SERVER_URL: Set this to "https://ghcr.io"
+#       DOCKER_REGISTRY_SERVER_USERNAME: Set this to the GitHub username or organization that owns the repository
+#       DOCKER_REGISTRY_SERVER_PASSWORD: Set this to the value of your PAT token from the previous step
+#
+# 5. Change the value for the AZURE_WEBAPP_NAME.
 #
 # For more information on GitHub Actions for Azure: https://github.com/Azure/Actions
 # For more information on the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
@@ -43,9 +50,9 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ github.token }}
 
-      - name: Lowercase the repo name
+      - name: Lowercase the repo name and username
         run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
 
       - name: Build and push container image to registry
@@ -63,7 +70,7 @@ jobs:
         url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
 
       steps:
-        - name: Lowercase the repo name
+        - name: Lowercase the repo name and username
           run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
         
         - name: Deploy to Azure Web App