Skip to content

Commit 7dfc9ee

Browse files
grantbsgrantbs
authored
Merge branch 'KelvinTegelaar:master' into master
2 parents 3254b82 + 2e6997f commit 7dfc9ee

File tree

1,029 files changed

+338913
-58883
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,029 files changed

+338913
-58883
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ insert_final_newline = true
88

99
[*.{ps1, psd1, psm1}]
1010
indent_size = 4
11-
end_of_line = crlf
11+
end_of_line = lf
1212
trim_trailing_whitespace = true
1313

1414
[*.json]
1515
indent_size = 2
16-
end_of_line = crlf
16+
end_of_line = lf
1717
trim_trailing_whitespace = true
1818

1919
[*.{md, txt}]

‎.gitattributes‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
* text=lf
2+
3+
*.txt text eol=crlf
4+
*.md text eol=crlf
5+
6+
*.ps1 text eol=lf
7+
*.psd1 text eol=lf
8+
*.psm1 text eol=lf
9+
10+
*.json text eol=lf
11+
12+
*.png binary
13+
*.jpg binary

.github/workflows/dev_cippjta72.yml renamed to .github/workflows/dev_api.yml

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
1-
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
2-
# More GitHub Actions for Azure: https://github.com/Azure/actions
3-
4-
name: Build and deploy Powershell project to Azure Function App - cippjta72
5-
6-
on:
7-
push:
8-
branches:
9-
- dev
10-
workflow_dispatch:
11-
12-
env:
13-
AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
14-
15-
jobs:
16-
deploy:
17-
runs-on: windows-latest
18-
19-
steps:
20-
- name: 'Checkout GitHub Action'
21-
uses: actions/checkout@v4
22-
23-
- name: 'Run Azure Functions Action'
24-
uses: Azure/functions-action@v1
25-
id: fa
26-
with:
27-
app-name: 'cippjta72'
28-
slot-name: 'Production'
29-
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_5B44448119C645C099EE192346D7433A }}
1+
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
2+
# More GitHub Actions for Azure: https://github.com/Azure/actions
3+
4+
name: dev_api
5+
6+
on:
7+
push:
8+
branches:
9+
- dev
10+
workflow_dispatch:
11+
12+
env:
13+
AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
14+
15+
jobs:
16+
deploy:
17+
if: github.event.repository.fork == false && github.event_name == 'push'
18+
runs-on: windows-latest
19+
20+
steps:
21+
- name: 'Checkout GitHub Action'
22+
uses: actions/checkout@v4
23+
24+
- name: 'Run Azure Functions Action'
25+
uses: Azure/functions-action@v1
26+
id: fa
27+
with:
28+
app-name: 'cippjta72'
29+
slot-name: 'Production'
30+
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
31+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_5B44448119C645C099EE192346D7433A }}

.github/workflows/dev_cippjta72-proc.yml renamed to .github/workflows/dev_api_proc.yml

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
1-
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
2-
# More GitHub Actions for Azure: https://github.com/Azure/actions
3-
4-
name: Build and deploy Powershell project to Azure Function App - cippjta72-proc
5-
6-
on:
7-
push:
8-
branches:
9-
- dev
10-
workflow_dispatch:
11-
12-
env:
13-
AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
14-
15-
jobs:
16-
deploy:
17-
runs-on: windows-latest
18-
19-
steps:
20-
- name: 'Checkout GitHub Action'
21-
uses: actions/checkout@v4
22-
23-
- name: 'Run Azure Functions Action'
24-
uses: Azure/functions-action@v1
25-
id: fa
26-
with:
27-
app-name: 'cippjta72-proc'
28-
slot-name: 'Production'
29-
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_A53AC5C52A55459DA0A3D8F1716638CB }}
1+
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
2+
# More GitHub Actions for Azure: https://github.com/Azure/actions
3+
4+
name: dev_api_proc
5+
6+
on:
7+
push:
8+
branches:
9+
- dev
10+
workflow_dispatch:
11+
12+
env:
13+
AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
14+
15+
jobs:
16+
deploy:
17+
if: github.event.repository.fork == false && github.event_name == 'push'
18+
runs-on: windows-latest
19+
20+
steps:
21+
- name: 'Checkout GitHub Action'
22+
uses: actions/checkout@v4
23+
24+
- name: 'Run Azure Functions Action'
25+
uses: Azure/functions-action@v1
26+
id: fa
27+
with:
28+
app-name: 'cippjta72-proc'
29+
slot-name: 'Production'
30+
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
31+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_A53AC5C52A55459DA0A3D8F1716638CB }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
22
# More GitHub Actions for Azure: https://github.com/Azure/actions
33

4-
name: Build and deploy Powershell project to Azure Function App - cipp44thq
4+
name: Build and deploy Powershell project to Azure Function App - cippahmcc
55

66
on:
77
push:
@@ -24,7 +24,7 @@ jobs:
2424
uses: Azure/functions-action@v1
2525
id: fa
2626
with:
27-
app-name: 'cipp44thq'
27+
app-name: 'cippahmcc'
2828
slot-name: 'Production'
2929
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_2EBCA6FEB5E54403AE417859C5D28817 }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_D6317AAB492A474D91B7A6CD29E53BA3 }}

.github/workflows/dev_cippbcaom.yml renamed to .github/workflows/dev_cippmpiii.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
22
# More GitHub Actions for Azure: https://github.com/Azure/actions
33

4-
name: Build and deploy Powershell project to Azure Function App - cippbcaom
4+
name: Build and deploy Powershell project to Azure Function App - cippmpiii
55

66
on:
77
push:
@@ -14,7 +14,7 @@ env:
1414

1515
jobs:
1616
deploy:
17-
runs-on: windows-latest
17+
runs-on: ubuntu-latest
1818

1919
steps:
2020
- name: 'Checkout GitHub Action'
@@ -24,7 +24,7 @@ jobs:
2424
uses: Azure/functions-action@v1
2525
id: fa
2626
with:
27-
app-name: 'cippbcaom'
27+
app-name: 'cippmpiii'
2828
slot-name: 'Production'
2929
package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
30-
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_0FE8CACBBF7D409DAAF132988BECEC4B }}
30+
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_BC5F21E993034DF2A3793489CE4705E4 }}

‎.github/workflows/dev_cipppwrro.yml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎.github/workflows/upload_dev.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Upload Dev zip
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
8+
jobs:
9+
release:
10+
if: github.event.repository.fork == false && github.event_name == 'push'
11+
name: Upload to Azure
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
# Checkout the repository
16+
- name: Checkout Code
17+
uses: actions/checkout@v3
18+
19+
# Create ZIP File in a New Source Directory
20+
- name: Prepare and Zip Release Files
21+
run: |
22+
mkdir -p src/releases
23+
zip -r src/releases/dev.zip . \
24+
--exclude "./src/releases/*" \
25+
--exclude ".*" \
26+
--exclude ".*/**"
27+
28+
# Upload to Azure Blob Storage
29+
- name: Azure Blob Upload with Destination folder defined
30+
uses: LanceMcCarthy/Action-AzureBlobUpload@v3.3.0
31+
with:
32+
connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
33+
container_name: cipp-api
34+
source_folder: src/releases/
35+
destination_folder: /
36+
delete_if_exists: true

‎.vscode/extensions.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{
2-
"recommendations": [
3-
"editorconfig.editorconfig"
4-
]
5-
}
1+
{
2+
"recommendations": [
3+
"editorconfig.editorconfig",
4+
"streetsidesoftware.code-spell-checker"
5+
]
6+
}

‎AddChocoApp/IntunePackage/Install.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ param (
1919

2020
try {
2121
if ($Trace) { Start-Transcript -Path (Join-Path $env:windir "\temp\choco-$Packagename-trace.log") }
22-
$chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
22+
$chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
2323

2424
if ($InstallChoco) {
2525
if (-not (Test-Path $chocoPath)) {
2626
try {
2727
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'))
28-
$chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
28+
$chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
2929
}
3030
catch {
3131
Write-Host "InstallChoco Error: $($_.Exception.Message)"
@@ -45,7 +45,7 @@ try {
4545
& "$chocoPath" install $Packagename -y $CustomRepoString
4646
}
4747
Write-Host 'Completed.'
48-
}
48+
}
4949
catch {
5050
Write-Host "Install/upgrade error: $($_.Exception.Message)"
5151
}

0 commit comments

Comments
 (0)