Synchronise all example templates with that of our default one.

mjr4077au · mjr4077au · commit c0bfef959315 · 2026-03-27T18:17:01.000+11:00
diff --git a/examples/Multi-session Installation/Invoke-AppDeployToolkit.ps1 b/examples/Multi-session Installation/Invoke-AppDeployToolkit.ps1
@@ -184,7 +184,7 @@ try
     if (Test-Path -LiteralPath "$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1" -PathType Leaf)
     {
         Get-ChildItem -LiteralPath "$PSScriptRoot\PSAppDeployToolkit" -Recurse -File | Unblock-File -ErrorAction Ignore
-        Import-Module -FullyQualifiedName @{ ModuleName = "$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1"; Guid = '8c3c366b-8606-4576-9f2d-4051144f7ca2'; ModuleVersion = '4.2.0' } -Force
+        Import-Module -FullyQualifiedName @{ ModuleName = [System.Management.Automation.WildcardPattern]::Escape("$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1"); Guid = '8c3c366b-8606-4576-9f2d-4051144f7ca2'; ModuleVersion = '4.2.0' } -Force
     }
     else
     {
@@ -217,7 +217,7 @@ try
             if ($_.Name -match 'PSAppDeployToolkit\..+$')
             {
                 Get-ChildItem -LiteralPath $_.FullName -Recurse -File | Unblock-File -ErrorAction Ignore
-                Import-Module -Name $_.FullName -Force
+                Import-Module -Name ([System.Management.Automation.WildcardPattern]::Escape("$($_.FullName)\$($_.BaseName).psd1")) -Force
             }
         }
     }
@@ -230,7 +230,7 @@ catch
 {
     # An unhandled error has been caught.
     $mainErrorMessage = "An unhandled error within [$($MyInvocation.MyCommand.Name)] has occurred.`n$(Resolve-ADTErrorRecord -ErrorRecord $_)"
-    Write-ADTLogEntry -Message $mainErrorMessage -Severity 3
+    Write-ADTLogEntry -Message $mainErrorMessage -Severity Error
     Show-ADTDialogBox -Text $mainErrorMessage -Icon Stop -NoWait
     Close-ADTSession -ExitCode 60001
 }
diff --git a/examples/VLC/Invoke-AppDeployToolkit.ps1 b/examples/VLC/Invoke-AppDeployToolkit.ps1
@@ -112,6 +112,11 @@ $adtSession = @{
     DeployAppScriptVersion = '4.2.0'
 }
 
+
+##================================================
+## MARK: Deployment type definitions
+##================================================
+
 function Install-ADTDeployment
 {
     [CmdletBinding()]
@@ -307,7 +312,7 @@ try
     if (Test-Path -LiteralPath "$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1" -PathType Leaf)
     {
         Get-ChildItem -LiteralPath "$PSScriptRoot\PSAppDeployToolkit" -Recurse -File | Unblock-File -ErrorAction Ignore
-        Import-Module -FullyQualifiedName @{ ModuleName = "$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1"; Guid = '8c3c366b-8606-4576-9f2d-4051144f7ca2'; ModuleVersion = '4.2.0' } -Force
+        Import-Module -FullyQualifiedName @{ ModuleName = [System.Management.Automation.WildcardPattern]::Escape("$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1"); Guid = '8c3c366b-8606-4576-9f2d-4051144f7ca2'; ModuleVersion = '4.2.0' } -Force
     }
     else
     {
@@ -340,7 +345,7 @@ try
             if ($_.Name -match 'PSAppDeployToolkit\..+$')
             {
                 Get-ChildItem -LiteralPath $_.FullName -Recurse -File | Unblock-File -ErrorAction Ignore
-                Import-Module -Name $_.FullName -Force
+                Import-Module -Name ([System.Management.Automation.WildcardPattern]::Escape("$($_.FullName)\$($_.BaseName).psd1")) -Force
             }
         }
     }
@@ -353,12 +358,13 @@ catch
 {
     # An unhandled error has been caught.
     $mainErrorMessage = "An unhandled error within [$($MyInvocation.MyCommand.Name)] has occurred.`n$(Resolve-ADTErrorRecord -ErrorRecord $_)"
-    Write-ADTLogEntry -Message $mainErrorMessage -Severity 3
+    Write-ADTLogEntry -Message $mainErrorMessage -Severity Error
 
     ## Error details hidden from the user by default. Show a simple dialog with full stack trace:
     # Show-ADTDialogBox -Text $mainErrorMessage -Icon Stop -NoWait
 
     ## Or, a themed dialog with basic error message:
-    Show-ADTInstallationPrompt -Message "$($adtSession.DeploymentType) failed at line $($_.InvocationInfo.ScriptLineNumber), char $($_.InvocationInfo.OffsetInLine):`n$($_.InvocationInfo.Line.Trim())`n`nMessage:`n$($_.Exception.Message)" -MessageAlignment Left -ButtonRightText OK -Icon Error -NoWait
+    Show-ADTInstallationPrompt -Message "$($adtSession.DeploymentType) failed at line $($_.InvocationInfo.ScriptLineNumber), char $($_.InvocationInfo.OffsetInLine):`n$($_.InvocationInfo.Line.Trim())`n`nMessage:`n$($_.Exception.Message)" -ButtonRightText OK -Icon Error -NoWait
+
     Close-ADTSession -ExitCode 60001
 }
diff --git a/examples/WinSCP/Invoke-AppDeployToolkit.ps1 b/examples/WinSCP/Invoke-AppDeployToolkit.ps1
@@ -112,6 +112,11 @@ $adtSession = @{
     DeployAppScriptVersion = '4.2.0'
 }
 
+
+##================================================
+## MARK: Deployment type definitions
+##================================================
+
 function Install-ADTDeployment
 {
     [CmdletBinding()]
@@ -316,7 +321,7 @@ try
     if (Test-Path -LiteralPath "$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1" -PathType Leaf)
     {
         Get-ChildItem -LiteralPath "$PSScriptRoot\PSAppDeployToolkit" -Recurse -File | Unblock-File -ErrorAction Ignore
-        Import-Module -FullyQualifiedName @{ ModuleName = "$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1"; Guid = '8c3c366b-8606-4576-9f2d-4051144f7ca2'; ModuleVersion = '4.2.0' } -Force
+        Import-Module -FullyQualifiedName @{ ModuleName = [System.Management.Automation.WildcardPattern]::Escape("$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1"); Guid = '8c3c366b-8606-4576-9f2d-4051144f7ca2'; ModuleVersion = '4.2.0' } -Force
     }
     else
     {
@@ -349,7 +354,7 @@ try
             if ($_.Name -match 'PSAppDeployToolkit\..+$')
             {
                 Get-ChildItem -LiteralPath $_.FullName -Recurse -File | Unblock-File -ErrorAction Ignore
-                Import-Module -Name $_.FullName -Force
+                Import-Module -Name ([System.Management.Automation.WildcardPattern]::Escape("$($_.FullName)\$($_.BaseName).psd1")) -Force
             }
         }
     }
@@ -362,12 +367,13 @@ catch
 {
     # An unhandled error has been caught.
     $mainErrorMessage = "An unhandled error within [$($MyInvocation.MyCommand.Name)] has occurred.`n$(Resolve-ADTErrorRecord -ErrorRecord $_)"
-    Write-ADTLogEntry -Message $mainErrorMessage -Severity 3
+    Write-ADTLogEntry -Message $mainErrorMessage -Severity Error
 
     ## Error details hidden from the user by default. Show a simple dialog with full stack trace:
     # Show-ADTDialogBox -Text $mainErrorMessage -Icon Stop -NoWait
 
     ## Or, a themed dialog with basic error message:
-    Show-ADTInstallationPrompt -Message "$($adtSession.DeploymentType) failed at line $($_.InvocationInfo.ScriptLineNumber), char $($_.InvocationInfo.OffsetInLine):`n$($_.InvocationInfo.Line.Trim())`n`nMessage:`n$($_.Exception.Message)" -MessageAlignment Left -ButtonRightText OK -Icon Error -NoWait
+    Show-ADTInstallationPrompt -Message "$($adtSession.DeploymentType) failed at line $($_.InvocationInfo.ScriptLineNumber), char $($_.InvocationInfo.OffsetInLine):`n$($_.InvocationInfo.Line.Trim())`n`nMessage:`n$($_.Exception.Message)" -ButtonRightText OK -Icon Error -NoWait
+
     Close-ADTSession -ExitCode 60001
 }

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ try`
`184`	`184`	`if (Test-Path -LiteralPath "$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1" -PathType Leaf)`
`185`	`185`	`{`
`186`	`186`	`Get-ChildItem -LiteralPath "$PSScriptRoot\PSAppDeployToolkit" -Recurse -File \| Unblock-File -ErrorAction Ignore`
`187`		`- Import-Module -FullyQualifiedName @{ ModuleName = "$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1"; Guid = '8c3c366b-8606-4576-9f2d-4051144f7ca2'; ModuleVersion = '4.2.0' } -Force`
	`187`	`+ Import-Module -FullyQualifiedName @{ ModuleName = [System.Management.Automation.WildcardPattern]::Escape("$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1"); Guid = '8c3c366b-8606-4576-9f2d-4051144f7ca2'; ModuleVersion = '4.2.0' } -Force`
`188`	`188`	`}`
`189`	`189`	`else`
`190`	`190`	`{`
`@@ -217,7 +217,7 @@ try`
`217`	`217`	`if ($_.Name -match 'PSAppDeployToolkit\..+$')`
`218`	`218`	`{`
`219`	`219`	`Get-ChildItem -LiteralPath $_.FullName -Recurse -File \| Unblock-File -ErrorAction Ignore`
`220`		`- Import-Module -Name $_.FullName -Force`
	`220`	`+ Import-Module -Name ([System.Management.Automation.WildcardPattern]::Escape("$($_.FullName)\$($_.BaseName).psd1")) -Force`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`	`}`
`@@ -230,7 +230,7 @@ catch`
`230`	`230`	`{`
`231`	`231`	`# An unhandled error has been caught.`
`232`	`232`	$mainErrorMessage = "An unhandled error within [$($MyInvocation.MyCommand.Name)] has occurred.`n$(Resolve-ADTErrorRecord -ErrorRecord $_)"
`233`		`- Write-ADTLogEntry -Message $mainErrorMessage -Severity 3`
	`233`	`+ Write-ADTLogEntry -Message $mainErrorMessage -Severity Error`
`234`	`234`	`Show-ADTDialogBox -Text $mainErrorMessage -Icon Stop -NoWait`
`235`	`235`	`Close-ADTSession -ExitCode 60001`
`236`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,11 @@ $adtSession = @{`
`112`	`112`	`DeployAppScriptVersion = '4.2.0'`
`113`	`113`	`}`
`114`	`114`
	`115`	`+`
	`116`	`+##================================================`
	`117`	`+## MARK: Deployment type definitions`
	`118`	`+##================================================`
	`119`	`+`
`115`	`120`	`function Install-ADTDeployment`
`116`	`121`	`{`
`117`	`122`	`[CmdletBinding()]`
`@@ -307,7 +312,7 @@ try`
`307`	`312`	`if (Test-Path -LiteralPath "$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1" -PathType Leaf)`
`308`	`313`	`{`
`309`	`314`	`Get-ChildItem -LiteralPath "$PSScriptRoot\PSAppDeployToolkit" -Recurse -File \| Unblock-File -ErrorAction Ignore`
`310`		`- Import-Module -FullyQualifiedName @{ ModuleName = "$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1"; Guid = '8c3c366b-8606-4576-9f2d-4051144f7ca2'; ModuleVersion = '4.2.0' } -Force`
	`315`	`+ Import-Module -FullyQualifiedName @{ ModuleName = [System.Management.Automation.WildcardPattern]::Escape("$PSScriptRoot\PSAppDeployToolkit\PSAppDeployToolkit.psd1"); Guid = '8c3c366b-8606-4576-9f2d-4051144f7ca2'; ModuleVersion = '4.2.0' } -Force`
`311`	`316`	`}`
`312`	`317`	`else`
`313`	`318`	`{`
`@@ -340,7 +345,7 @@ try`
`340`	`345`	`if ($_.Name -match 'PSAppDeployToolkit\..+$')`
`341`	`346`	`{`
`342`	`347`	`Get-ChildItem -LiteralPath $_.FullName -Recurse -File \| Unblock-File -ErrorAction Ignore`
`343`		`- Import-Module -Name $_.FullName -Force`
	`348`	`+ Import-Module -Name ([System.Management.Automation.WildcardPattern]::Escape("$($_.FullName)\$($_.BaseName).psd1")) -Force`
`344`	`349`	`}`
`345`	`350`	`}`
`346`	`351`	`}`
`@@ -353,12 +358,13 @@ catch`
`353`	`358`	`{`
`354`	`359`	`# An unhandled error has been caught.`
`355`	`360`	$mainErrorMessage = "An unhandled error within [$($MyInvocation.MyCommand.Name)] has occurred.`n$(Resolve-ADTErrorRecord -ErrorRecord $_)"
`356`		`- Write-ADTLogEntry -Message $mainErrorMessage -Severity 3`
	`361`	`+ Write-ADTLogEntry -Message $mainErrorMessage -Severity Error`
`357`	`362`
`358`	`363`	`## Error details hidden from the user by default. Show a simple dialog with full stack trace:`
`359`	`364`	`# Show-ADTDialogBox -Text $mainErrorMessage -Icon Stop -NoWait`
`360`	`365`
`361`	`366`	`## Or, a themed dialog with basic error message:`
`362`		- Show-ADTInstallationPrompt -Message "$($adtSession.DeploymentType) failed at line $($_.InvocationInfo.ScriptLineNumber), char $($_.InvocationInfo.OffsetInLine):`n$($_.InvocationInfo.Line.Trim())`n`nMessage:`n$($_.Exception.Message)" -MessageAlignment Left -ButtonRightText OK -Icon Error -NoWait
	`367`	+ Show-ADTInstallationPrompt -Message "$($adtSession.DeploymentType) failed at line $($_.InvocationInfo.ScriptLineNumber), char $($_.InvocationInfo.OffsetInLine):`n$($_.InvocationInfo.Line.Trim())`n`nMessage:`n$($_.Exception.Message)" -ButtonRightText OK -Icon Error -NoWait
	`368`	`+`
`363`	`369`	`Close-ADTSession -ExitCode 60001`
`364`	`370`	`}`