Skip to content

Commit 8350e5b

Browse files
committed
merge 7.5.1 into dev-testing
1 parent 84a2137 commit 8350e5b

File tree

318 files changed

+3868
-1662
lines changed

Some content is hidden

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

318 files changed

+3868
-1662
lines changed

.github/workflows/dev_cipppwrro.yml

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

.vscode/extensions.json

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

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
}

AddChocoApp/IntunePackage/Uninstall.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ param (
44
[string]
55
$Packagename
66
)
7-
$chocoPath = "$($ENV:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
7+
$chocoPath = "$($env:SystemDrive)\ProgramData\chocolatey\bin\choco.exe"
88
& $Chocopath uninstall $Packagename -y
99

0 commit comments

Comments
 (0)