Skip to content

Commit 26cbe6a

Browse files
committed
[CCP] Improve representation of third-party Appxs and drivers
1 parent 3211b61 commit 26cbe6a

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

Helpers/CompatChecks/DismThirdPartyDriverCCP.vb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Imports Microsoft.Dism
2+
Imports System.IO
23

34
Namespace Helpers.CompatChecks
45

@@ -32,9 +33,11 @@ Namespace Helpers.CompatChecks
3233
DynaLog.LogMessage("Detecting if there are any third-party drivers...")
3334
If driverInfoCollection.Any(Function(driver) driver.InBox = False) Then
3435
DynaLog.LogMessage("There are third party drivers. External devices have been detected.")
36+
Dim Drivers() As String = driverInfoCollection.Where(Function(driver) driver.InBox = False).Select(Function(driver) String.Format("{0} ({1})", driver.PublishedName, Path.GetFileName(driver.OriginalFileName))).ToArray()
37+
Dim drvStr As String = ControlChars.CrLf & "- " & String.Join(ControlChars.CrLf & "- ", Drivers) & ControlChars.CrLf
3538
Status.StatusMessage = New Classes.StatusMessage("DISM driver checks",
3639
"Third-party drivers were detected in this installation. You can continue, but this is not a good system administration practice if you want to install this system on multiple machines.",
37-
"Remove third-party drivers if you want to install this system on multiple machines with different hardware.",
40+
"These were the third-party drivers detected: " & drvStr & "Remove these drivers if you want to install this system on multiple machines with different hardware.",
3841
Classes.StatusMessage.StatusMessageSeverity.Warning)
3942
Else
4043
DynaLog.LogMessage("There aren't any third party drivers. External devices have not been detected.")

Helpers/CompatChecks/ThirdPartyAppxCCP.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ Namespace Helpers.CompatChecks
1414
Dim Appxs() As String = thirdPartyAppxsRk.GetSubKeyNames()
1515
thirdPartyAppxsRk.Close()
1616
If Appxs.Count > 0 Then
17-
Dim appxStr As String = String.Join(", ", Appxs)
17+
Dim appxStr As String = ControlChars.CrLf & "- " & String.Join(ControlChars.CrLf & "- ", Appxs) & ControlChars.CrLf
1818
Status.Compatible = True
1919
Status.StatusMessage = New Classes.StatusMessage("Third-party Microsoft Store app checks",
2020
"Some packages that may only be registered to this user account have been detected. Sysprep may fail to run.",
21-
"These were the AppX packages detected: " & appxStr & ". Verify the list and remove the ones you have installed. You can relaunch Sysprep as many times as you want after preparation is complete.",
21+
"These were the AppX packages detected: " & appxStr & "Verify the list and remove the ones you have installed. You can relaunch Sysprep as many times as you want after preparation is complete.",
2222
Classes.StatusMessage.StatusMessageSeverity.Warning)
2323
Else
2424
Status.Compatible = True

0 commit comments

Comments
 (0)