Merge branch 'KelvinTegelaar:master' into master

jcorrington · Dec 7, 2023 · feaa910 · feaa910
2 parents 3a2c0c3 + 73e032d
commit feaa910
Show file tree

Hide file tree

Showing 754 changed files with 15,565 additions and 14,253 deletions.
diff --git a/.github/workflows/dev_cippb2p4g.yml → .github/workflows/ninjaone_cipp426ns.yml b/.github/workflows/dev_cippb2p4g.yml → .github/workflows/ninjaone_cipp426ns.yml
@@ -1,12 +1,12 @@
 # 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 - cippb2p4g
+name: Build and deploy Powershell project to Azure Function App - cipp426ns
 
 on:
   push:
     branches:
-      - dev
+      - NinjaOne
   workflow_dispatch:
 
 env:
@@ -17,13 +17,13 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: 'Checkout GitHub Action'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: 'Run Azure Functions Action'
         uses: Azure/functions-action@v1
         id: fa
         with:
-          app-name: 'cippb2p4g'
+          app-name: 'cipp426ns'
           slot-name: 'Production'
           package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
-          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_C106B398356B4EFCB81F779ED5806A0D }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_198DAF92160A4302B5AA0C145DE72796 }}
diff --git a/.github/workflows/powershell-analysis.yml b/.github/workflows/powershell-analysis.yml
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,4 @@ chocoapps.cache
 Cache_*
 Logs
 ExcludedTenants
-Config
 SendNotifications/config.json
diff --git a/AddAPDevice/function.json b/AddAPDevice/function.json
diff --git a/AddAlert/function.json b/AddAlert/function.json
diff --git a/AddAlert/run.ps1 b/AddAlert/run.ps1
diff --git a/AddAutopilotConfig/function.json b/AddAutopilotConfig/function.json
diff --git a/AddCAPolicy/function.json b/AddCAPolicy/function.json
diff --git a/AddCATemplate/function.json b/AddCATemplate/function.json
diff --git a/AddChocoApp/function.json b/AddChocoApp/function.json
diff --git a/AddContact/function.json b/AddContact/function.json
diff --git a/AddDefenderDeployment/function.json b/AddDefenderDeployment/function.json
diff --git a/AddEnrollment/function.json b/AddEnrollment/function.json
diff --git a/AddExConnector/function.json b/AddExConnector/function.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,5 +7,4 @@ chocoapps.cache @@
     Cache_*
     Logs
     ExcludedTenants
-    Config
     SendNotifications/config.json