Merge branch 'KelvinTegelaar:master' into master

Author: IntegriComCalvin

.github/workflows/dev_cipppwrro.yml renamed to .github/workflows/dev_cippahmcc.yml

@@ -1,7 +1,7 @@
 # Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
 # More GitHub Actions for Azure: https://github.com/Azure/actions
 
-name: Build and deploy Powershell project to Azure Function App - cipppwrro
+name: Build and deploy Powershell project to Azure Function App - cippahmcc
 
 on:
   push:
@@ -24,7 +24,7 @@ jobs:
         uses: Azure/functions-action@v1
         id: fa
         with:
-          app-name: 'cipppwrro'
+          app-name: 'cippahmcc'
           slot-name: 'Production'
           package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
-          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_D5D7DFF930C04B519206F25DDCD88324 }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_D6317AAB492A474D91B7A6CD29E53BA3 }}

.github/workflows/dev_cippmpiii.yml

@@ -0,0 +1,30 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Powershell project to Azure Function App - cippmpiii
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: 'Checkout GitHub Action'
+        uses: actions/checkout@v4
+      
+      - name: 'Run Azure Functions Action'
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: 'cippmpiii'
+          slot-name: 'Production'
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_BC5F21E993034DF2A3793489CE4705E4 }}

.vscode/extensions.json

@@ -1,5 +1,6 @@
-{
-  "recommendations": [
-    "editorconfig.editorconfig"
-  ]
-}
+{
+  "recommendations": [
+    "editorconfig.editorconfig",
+    "streetsidesoftware.code-spell-checker"
+  ]
+}

AddChocoApp/IntunePackage/Install.ps1

@@ -19,13 +19,13 @@ param (
 
 try {
     if ($Trace) { Start-Transcript -Path (Join-Path $env:windir "\temp\choco-$Packagename-trace.log") }
-    $chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
+    $chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
 
     if ($InstallChoco) {
         if (-not (Test-Path $chocoPath)) {
             try {
                 Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-                $chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
+                $chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
             }
             catch {
                 Write-Host "InstallChoco Error: $($_.Exception.Message)"
@@ -45,7 +45,7 @@ try {
             & "$chocoPath" install $Packagename -y $CustomRepoString
         }
         Write-Host 'Completed.'
-    }  
+    }
     catch {
         Write-Host "Install/upgrade error: $($_.Exception.Message)"
     }

AddChocoApp/IntunePackage/Uninstall.ps1

@@ -4,6 +4,6 @@ param (
     [string]
     $Packagename
 )
-$chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
+$chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
 & $Chocopath uninstall $Packagename -y