CodingWonders
diff --git a/‎.github/ISSUE_TEMPLATE/bug.md
+12-1 b/‎.github/ISSUE_TEMPLATE/bug.md
+12-1
diff --git a/‎.github/ISSUE_TEMPLATE/program-exception.md
+11 b/‎.github/ISSUE_TEMPLATE/program-exception.md
+11
diff --git a/‎.github/workflows/create-nightly-installer.yaml
-1 b/‎.github/workflows/create-nightly-installer.yaml
-1
diff --git a/‎ApplicationEvents.vb
+32-2 b/‎ApplicationEvents.vb
+32-2
diff --git a/‎DISMTools.sln
-3 b/‎DISMTools.sln
-3
diff --git a/‎DISMTools.vbproj
+21-7 b/‎DISMTools.vbproj
+21-7
diff --git a/‎Elements/AppxPackage.vb
+9 b/‎Elements/AppxPackage.vb
+9
diff --git a/‎Elements/AutoUnattend/Components/Component.vb
+20 b/‎Elements/AutoUnattend/Components/Component.vb
+20
@@ -28,4 +28,15 @@ If applicable, add screenshots to help explain your problem.
 
 
 **Additional context**
-Add any other context about the problem here.
+Add any other context about the problem here.
+
+### Attaching DynaLog event logs
+---
+
+DISMTools 0.6.1 and later use DynaLog as a means to write diagnostic information to a log file that you can send to the developers. The log is stored in `<program directory>\Logs`:
+
+- If you are using an installed copy, go to `\Program Files\DISMTools\<Stable or Preview>\logs`
+- If you are using a portable copy, go to `<startup location>\logs`
+
+The file in question is `DT_DynaLog.log`. Attach this log by dropping it below:
+
@@ -18,3 +18,14 @@ If you have run into an internal error (program exception), we would like to lea
 **How did it happen?** What steps did you perform in order to experience this problem?
 
 <!-- Steps -->
+
+### Attaching DynaLog event logs
+---
+
+DISMTools 0.6.1 and later use DynaLog as a means to write diagnostic information to a log file that you can send to the developers. The log is stored in `<program directory>\Logs`:
+
+- If you are using an installed copy, go to `\Program Files\DISMTools\<Stable or Preview>\logs`
+- If you are using a portable copy, go to `<startup location>\logs`
+
+The file in question is `DT_DynaLog.log`. Attach this log by dropping it below:
+
@@ -33,7 +33,6 @@ jobs:
         $projectDir = "$((Get-Location).Path)\"
         $targetDir = (Get-Location).Path + "\bin\Debug\"
         iex "$($solutionDir)CheckMissingDlls.ps1"
-        msbuild Tools\UnpEax\UnpEax.csproj /p:Configuration=Debug /p:DeployOnBuild=true
         msbuild DISMTools.vbproj /p:Configuration=Debug /p:DeployOnBuild=true /p:SolutionDir=$solutionDir /p:ProjectDir=$projectDir /p:TargetDir=$targetDir
         Move-Item -Path "$($solutionDir.TrimEnd("\"))\Installer\Output\dt_setup.exe" -Destination "$($solutionDir.TrimEnd("\"))\Installer\Nightly\dt_setup.exe" -Force
     - name: Upload Artifact
 
@@ -19,16 +19,22 @@ Namespace My
         Private debounceInterval As TimeSpan = TimeSpan.FromSeconds(2)
 
         Private Sub Start(sender As Object, e As EventArgs) Handles Me.Startup
+            DynaLog.LogMessage("Adding startup event handlers...")
             AddHandler Microsoft.Win32.SystemEvents.UserPreferenceChanged, AddressOf SysEvts_UserPreferenceChanged
             AddHandler Microsoft.Win32.SystemEvents.DisplaySettingsChanging, AddressOf SysEvts_DisplaySettingsChanging
             AddHandler Microsoft.Win32.SystemEvents.DisplaySettingsChanged, AddressOf SysEvts_DisplaySettingsChanged
         End Sub
 
         Private Sub CatchEmAll(sender As Object, e As Microsoft.VisualBasic.ApplicationServices.UnhandledExceptionEventArgs) Handles Me.UnhandledException
+            DynaLog.LogMessage("Unhandled exception occurred. Gotta catch'em all !")
+            DynaLog.LogMessage("Exception information:")
+            DynaLog.LogMessage("- Message: " & e.Exception.Message)
+            DynaLog.LogMessage("- Code (HRESULT): " & Hex(e.Exception.HResult))
             ExceptionForm.ErrorText.Text = e.Exception.ToString() & CrLf & CrLf &
                                            "Error Message: " & e.Exception.Message & CrLf & CrLf &
                                            "Error Code (HRESULT): " & Hex(e.Exception.HResult)
             Try
+                DynaLog.LogMessage("Getting program information for exception report...")
                 ' Get version of DISMTools that threw the exception. Include program version, branch, and (possibly) build time
                 ' in the case of nightly installers
                 ExceptionForm.ErrorText.AppendText(CrLf & CrLf &
@@ -40,16 +46,22 @@ Namespace My
                                                    " - Portable copy? " & If(File.Exists(My.Application.Info.DirectoryPath & "\portable"), "Yes", "No") & CrLf)
                 ' Get image information if a project has been loaded
                 If DISMTools.MainForm.isProjectLoaded And Not DISMTools.MainForm.OnlineManagement Then
+                    DynaLog.LogMessage("Getting information about the image/installation for exception report...")
                     Try
                         ExceptionForm.ErrorText.AppendText(CrLf &
                                                            "Information about the image loaded in this project:" & CrLf &
                                                            " - Image name: " & DISMTools.MainForm.Label46.Text & CrLf &
                                                            " - Image description: " & DISMTools.MainForm.Label47.Text & CrLf &
                                                            " - Image version: " & DISMTools.MainForm.Label48.Text)
                     Catch ex As Exception
+                        DynaLog.LogMessage("Could not get image/installation information. Error message: " & ex.Message)
                         ' Don't get this info
                     End Try
                 End If
+                DynaLog.LogMessage("Getting computer, BIOS, OS and processor information for exception report...")
+                DynaLog.LogMessage("--- NO PERSONALLY IDENTIFIABLE INFORMATION WILL BE INCLUDED IN THE REPORT ---")
+                DynaLog.LogMessage("---- I ONLY GRAB THIS INFORMATION TO HELP ISOLATE BUGS TO A HW/SW CONFIG ----")
+                DynaLog.LogMessage("I really care about your privacy and, like you, I hate tracking.")
                 ' Get basic information about the system. This does not include any personally identifiable information (PII) or
                 ' serial numbers that can identify the computer this program is run on
                 Dim CS_Searcher As ManagementObjectSearcher = New ManagementObjectSearcher("SELECT Manufacturer, Model FROM Win32_ComputerSystem")
@@ -86,26 +98,33 @@ Namespace My
                                                    "No information that can be used to identify the user or the exact system is gathered." & CrLf & CrLf &
                                                    "If you don't want to send this information to the developers, paste the text that was copied to the clipboard in a text editor, remove this information, and copy the new text again.")
             Catch ex As Exception
+                DynaLog.LogMessage("Could not get system information. Error message: " & ex.Message)
                 ' Could not get basic machine information
             End Try
             Try
+                DynaLog.LogMessage("Saving exception information to the error report...")
                 If Not Directory.Exists(Path.Combine(Windows.Forms.Application.StartupPath, "logs", "errors")) Then
+                    DynaLog.LogMessage("Creating directory for error reports...")
                     Directory.CreateDirectory(Path.Combine(Windows.Forms.Application.StartupPath, "logs", "errors"))
                 End If
                 File.WriteAllText(Path.Combine(Windows.Forms.Application.StartupPath, "logs", "errors") & "\DT-Error-" & Now.ToString().Replace("/", "-").Trim().Replace(":", "-").Trim() & ".log", ExceptionForm.ErrorText.Text, UTF8)
             Catch ex As Exception
+                DynaLog.LogMessage("Could not create the error report. Error message: " & ex.Message)
                 ' Could not save error information
             End Try
             ExceptionForm.ShowDialog()
             If ExceptionForm.DialogResult = DialogResult.OK Then
+                DynaLog.LogMessage("DISMTools will continue execution as user decided to do so.")
+                DynaLog.LogMessage("This is not the most recommended thing as it may happen again.")
                 e.ExitApplication = False
             ElseIf ExceptionForm.DialogResult = DialogResult.Cancel Then
+                DynaLog.LogMessage("DISMTools will stop execution as user decided to do so.")
                 e.ExitApplication = True
             End If
         End Sub
 
         Private Sub SysEvts_UserPreferenceChanged(sender As Object, e As Microsoft.Win32.UserPreferenceChangedEventArgs)
-            Debug.WriteLine(Date.UtcNow & " UTC - User Preference Category: " & e.Category.ToString())
+            DynaLog.LogMessage("A user preference of type " & e.Category.ToString() & " has changed.")
 
             ' Prevent the program from freezing. This is a fix for a very long-standing bug that was introduced with the mounted image detector,
             ' where the program would randomly freeze and never come back. And, even while the program itself was still responding, its UI thread
@@ -122,22 +141,33 @@ Namespace My
             '    - This event is triggered
             '
             ' This fixes the problem by temporarily stopping the mounted image detector, doing the event code, and restarting it afterward.
-            ' It hasn't caused any freezes for me yet, but I may be proven wrong.
+            ' It causes a temporary freeze, but it always comes back.
+            DynaLog.LogMessage("Detecting if mounted image detector is busy...")
             If DISMTools.MainForm.MountedImageDetectorBW.IsBusy Then
+                DynaLog.LogMessage("Mounted image detector is busy. Stopping to avoid a permanent freeze...")
                 DISMTools.MainForm.MountedImageDetectorBW.CancelAsync()
             End If
             If e.Category = UserPreferenceCategory.General And DISMTools.MainForm.ColorMode = 0 Then
+                DynaLog.LogMessage("Detecting if the system color theme changed...")
                 Dim currentTime As DateTime = DateTime.Now
+                DynaLog.LogMessage("Current system time: " & currentTime.ToString())
+                DynaLog.LogMessage("Time theme last changed: " & lastThemeChangeTime.ToString())
+                DynaLog.LogMessage("Time difference in seconds: " & (currentTime - lastThemeChangeTime).TotalSeconds)
+                DynaLog.LogMessage("Debounce interval: " & debounceInterval.TotalSeconds)
                 If currentTime - lastThemeChangeTime > debounceInterval Then
+                    DynaLog.LogMessage("Time difference is over debounce interval. Changing color theme...")
                     DISMTools.MainForm.ChangePrgColors(0)
+                    DynaLog.LogMessage("Setting the time the theme last changed...")
                     lastThemeChangeTime = currentTime
                 End If
             End If
             Try
+                DynaLog.LogMessage("Restarting mounted image detector...")
                 Threading.Thread.Sleep(1000)
                 Call DISMTools.MainForm.MountedImageDetectorBW.RunWorkerAsync()
                 Threading.Thread.Sleep(250)
             Catch ex As Exception
+                DynaLog.LogMessage("Could not restart mounted image detector. Error message: " & ex.Message)
                 DISMTools.MainForm.MountedImageDetectorBWRestarterTimer.Enabled = True
             End Try
         End Sub
 
@@ -2,9 +2,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DISMTools", "DISMTools.vbproj", "{042ED465-C910-407A-93D1-736639FF0EA5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5330BC3F-1BFF-4200-8872-3A2236F814AB} = {5330BC3F-1BFF-4200-8872-3A2236F814AB}
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{283DDE96-80B1-4AE2-9146-943E95039252}"
 	ProjectSection(SolutionItems) = preProject
 
@@ -104,8 +104,8 @@
     <Reference Include="PresentationFramework">
       <Private>True</Private>
     </Reference>
-    <Reference Include="Scintilla.NET, Version=5.6.5.0, Culture=neutral, PublicKeyToken=0221e70ba618311e, processorArchitecture=MSIL">
-      <HintPath>packages\Scintilla5.NET.5.6.5\lib\net462\Scintilla.NET.dll</HintPath>
+    <Reference Include="Scintilla.NET, Version=5.6.6.0, Culture=neutral, PublicKeyToken=0221e70ba618311e, processorArchitecture=MSIL">
+      <HintPath>packages\Scintilla5.NET.5.6.6\lib\net462\Scintilla.NET.dll</HintPath>
     </Reference>
     <Reference Include="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <Private>True</Private>
@@ -241,11 +241,12 @@
     <Compile Include="Elements\AutoUnattend\Localization\UserLocale.vb" />
     <Compile Include="Elements\AutoUnattend\NetworkConnections\WirelessSettings.vb" />
     <Compile Include="Elements\AutoUnattend\ProductKey\ProductKey.vb" />
+    <Compile Include="Elements\AutoUnattend\Scripts\PostInstallScript.vb" />
     <Compile Include="Elements\AutoUnattend\SysConfig\ComputerName.vb" />
     <Compile Include="Elements\AutoUnattend\SysConfig\SVSettings.vb" />
     <Compile Include="Elements\AutoUnattend\Telemetry\SystemTelemetry.vb" />
     <Compile Include="Elements\AutoUnattend\UnattendedWizardPage.vb" />
-    <Compile Include="Elements\AutoUnattend\UserAccounts\AccountLockdownSettings.vb" />
+    <Compile Include="Elements\AutoUnattend\UserAccounts\AccountLockoutSettings.vb" />
     <Compile Include="Elements\AutoUnattend\UserAccounts\AutoLogonSettings.vb" />
     <Compile Include="Elements\AutoUnattend\UserAccounts\PasswordExpirationSettings.vb" />
     <Compile Include="Elements\AutoUnattend\UserAccounts\User.vb" />
@@ -853,6 +854,12 @@
     <Compile Include="Panels\Unattend_Files\Management\UnattendMgr.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="UserControls\ConsoleControl.Designer.vb">
+      <DependentUpon>ConsoleControl.vb</DependentUpon>
+    </Compile>
+    <Compile Include="UserControls\ConsoleControl.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Utilities\DriverSignerViewer.vb" />
     <Compile Include="Utilities\DT_Utils.vb" />
     <Compile Include="Utilities\DynaLog.vb" />
@@ -1166,6 +1173,9 @@
     <EmbeddedResource Include="Panels\Unattend_Files\Management\UnattendMgr.resx">
       <DependentUpon>UnattendMgr.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="UserControls\ConsoleControl.resx">
+      <DependentUpon>ConsoleControl.vb</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include=".editorconfig" />
@@ -1204,6 +1214,9 @@
     <None Include="Helpers\extps1\mImgMgr.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Helpers\extps1\PE_Helper\files\dim_start\dimstart.bat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Helpers\extps1\PE_Helper\files\diskpart\dp_listdisk.dp">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -1520,6 +1533,7 @@
     <Content Include="Tools\UnattendGen\win-x86\UnattendGen.pdb" />
     <Content Include="Tools\UnattendGen\win-x86\UnattendGenerator.dll" />
     <Content Include="Tools\UnattendGen\win-x86\UnattendGenerator.pdb" />
+    <Content Include="Tools\UnpEax-Bin\UnpEax.exe" />
     <None Include="Resources\actions\validation.png" />
     <None Include="Resources\setting_migration.ico" />
     <None Include="Resources\secprogress_classic.png" />
@@ -1910,9 +1924,9 @@ copy /y "$(SolutionDir)Tools\DT_IEConfig.reg" "DT_IEConfig.reg"
 :: Copy registry file for ADK installations
 copy /y "$(SolutionDir)Tools\DT_WinADK.reg" "DT_WinADK.reg"
 
-IF EXIST "$(SolutionDir)Tools\UnpEax\bin\Debug\UnpEax.exe" (
+IF EXIST "$(SolutionDir)Tools\UnpEax-Bin\UnpEax.exe" (
 	md "Tools\UnpEax"
-	copy /y "$(SolutionDir)Tools\UnpEax\bin\Debug\UnpEax.exe" "Tools\UnpEax\UnpEax.exe"
+	copy /y "$(SolutionDir)Tools\UnpEax-Bin\UnpEax.exe" "Tools\UnpEax\UnpEax.exe"
 )
 
 :: Copy UnattendGen
@@ -1991,12 +2005,12 @@ IF EXIST tools (
 
 IF EXIST "report.html" (del "report.html")</PreBuildEvent>
   </PropertyGroup>
-  <Import Project="packages\Scintilla5.NET.5.6.5\build\scintilla5.net.targets" Condition="Exists('packages\Scintilla5.NET.5.6.5\build\scintilla5.net.targets')" />
+  <Import Project="packages\Scintilla5.NET.5.6.6\build\scintilla5.net.targets" Condition="Exists('packages\Scintilla5.NET.5.6.6\build\scintilla5.net.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Scintilla5.NET.5.6.5\build\scintilla5.net.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Scintilla5.NET.5.6.5\build\scintilla5.net.targets'))" />
+    <Error Condition="!Exists('packages\Scintilla5.NET.5.6.6\build\scintilla5.net.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Scintilla5.NET.5.6.6\build\scintilla5.net.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
 
@@ -1,4 +1,5 @@
 Imports System.Xml.Serialization
+Imports Microsoft.VisualBasic.ControlChars
 
 Namespace Elements
 
@@ -68,6 +69,14 @@ Namespace Elements
         ''' </summary>
         ''' <remarks></remarks>
         Public Property StubPackageOption As StubPreference
+
+        Public Overrides Function ToString() As String
+            Return "AppX package:" & CrLf &
+                "- Name: " & Quote & Me.PackageName & Quote & CrLf &
+                "- Publisher: " & Quote & Me.PackagePublisher & Quote & CrLf &
+                "- Version: " & Quote & Me.PackageVersion & Quote & CrLf &
+                "- Architecture: " & Quote & Me.PackageArchitecture & Quote
+        End Function
     End Class
 
     ''' <summary>
 
@@ -1,6 +1,7 @@
 Imports System.Xml.Serialization
 Imports System.Xml
 Imports System.IO
+Imports Microsoft.VisualBasic.ControlChars
 
 Namespace Elements
 
@@ -12,15 +13,32 @@ Namespace Elements
 
         Public Property Passes As New List(Of Pass)
 
+        Public Overrides Function ToString() As String
+            Dim passList As String = ""
+            If Me.Passes.Count > 0 Then
+                For Each componentPass As Pass In Me.Passes
+                    If passList <> "" Then
+                        passList &= ", " & componentPass.Name
+                    Else
+                        passList = componentPass.Name
+                    End If
+                Next
+            End If
+            Return "Component, with ID: " & Me.Id & "; Passes: " & passList
+        End Function
+
         Public Shared Function LoadItems(filePath As String) As List(Of Component)
+            DynaLog.LogMessage("Preparing to load items from file " & Quote & filePath & Quote & "...")
             Dim componentList As New List(Of Component)
             Try
                 Using fs As FileStream = New FileStream(filePath, FileMode.Open)
+                    DynaLog.LogMessage("Creating XML reader...")
                     Dim xs As New XmlReaderSettings()
                     xs.IgnoreWhitespace = True
                     Using reader As XmlReader = XmlReader.Create(fs, xs)
                         While reader.Read()
                             If reader.NodeType = XmlNodeType.Element AndAlso reader.Name = "Component" Then
+                                DynaLog.LogMessage("We are dealing with a component (XML node type is element and is " & Quote & "Component" & Quote & "). Parsing...")
                                 Dim sysComponent As New Component()
                                 sysComponent.Id = reader.GetAttribute("Id")
                                 Dim PassList As String = reader.GetAttribute("Passes")
@@ -46,8 +64,10 @@ Namespace Elements
                         End While
                     End Using
                 End Using
+                DynaLog.LogMessage("System component count: " & componentList.Count)
                 Return componentList
             Catch ex As Exception
+                DynaLog.LogMessage("Could not load items. Error message: " & ex.Message)
                 If Debugger.IsAttached Then Debugger.Break()
                 Return Nothing
             End Try