Skip to content

Commit 9f7aace

Browse files
CodingWondersbovirus
CodingWonders
and
bovirus
authored
DISMTools 0.7.1 Update 1 (#308)
* Update assembly information * Italian language update (#294) * Italian language update (#296) * Italian language update (#298) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Update HelpBrowserForm.vb Removed duplicate import --------- Co-authored-by: CodingWonders <101426328+CodingWonders@users.noreply.github.com> * Italian language update (#301) * Italian language update * Update MainForm.vb Remove duplicate import --------- Co-authored-by: CodingWonders <101426328+CodingWonders@users.noreply.github.com> * [Help] Update Italian wording * [Fix] Fixed absolute path issues Reapplied * [InfoSaver] Rework AppX package count procedure * [InfoSaver] Add dark mode detection for HTML report * [Help/Tour] Update Tour with Italian videos * [PE Helper/HotInstall] DynaLog logging * [DynaLog] Log Archive Removal capabilities (DL v1.0.3) * [ServiceManager] Remove unnecessary call * [PE Helper/SysprepPreparator] Update binary Check out https://github.com/CodingWonders/SysprepPreparator for more information about commits. * [PE Helper] Update menu application, update Sysprep Preparator binary Added Auto mode * [PE Helper/SysprepPreparator] Update binary Check out https://github.com/CodingWonders/SysprepPreparator for more information about commits. * [PE Helper] Update compiled files * [PE Helper] Retry ISO creation if it failed * [PE Helper/SysprepPreparator] Update binary Check out https://github.com/CodingWonders/SysprepPreparator for more information about commits. * [Installer] Inno Setup 6.6 * [Unattended answer file] Delete incompatible self-contained UnattendGen * [Installer] Update dark mode main image * [Docs/Tour] Fixed YT error 153 for tour videos by using a web server * [Docs/Tour] Tour Server startup no longer shows a message to stop it * [Docs/Tour] Update submodule * [Lib] Update Scintilla.NET to 6.1.0 * [Lib] Update ManagedDism to 4.0 * [PE Helper/HotInstall] Ignore errors on BOOTMGR view settings * [Fix] Fixed crash * [Docs/Tour] Update submodule * [REL] Update What's New section --------- Co-authored-by: bovirus <1262554+bovirus@users.noreply.github.com>
1 parent 4e5dd73 commit 9f7aace

File tree

121 files changed

+7803
-66556
lines changed

Some content is hidden

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

121 files changed

+7803
-66556
lines changed

‎DISMTools.vbproj‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<HintPath>packages\Markdig.0.43.0\lib\net462\Markdig.dll</HintPath>
8585
</Reference>
8686
<Reference Include="Microsoft.Dism, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5bba90053b345501, processorArchitecture=MSIL">
87-
<HintPath>packages\Microsoft.Dism.3.3.12\lib\net40\Microsoft.Dism.dll</HintPath>
87+
<HintPath>packages\Microsoft.Dism.4.0.0\lib\net40\Microsoft.Dism.dll</HintPath>
8888
</Reference>
8989
<Reference Include="Microsoft.WindowsAPICodePack.Core, Version=8.0.6.0, Culture=neutral, PublicKeyToken=8afb38e9204fc0a9, processorArchitecture=MSIL">
9090
<HintPath>packages\WindowsAPICodePack.8.0.6\lib\net48\Microsoft.WindowsAPICodePack.Core.dll</HintPath>
@@ -107,8 +107,8 @@
107107
<Reference Include="PresentationFramework">
108108
<Private>True</Private>
109109
</Reference>
110-
<Reference Include="Scintilla.NET, Version=6.0.1.0, Culture=neutral, PublicKeyToken=0221e70ba618311e, processorArchitecture=MSIL">
111-
<HintPath>packages\Scintilla5.NET.6.0.1\lib\net462\Scintilla.NET.dll</HintPath>
110+
<Reference Include="Scintilla.NET, Version=6.1.0.0, Culture=neutral, PublicKeyToken=0221e70ba618311e, processorArchitecture=MSIL">
111+
<HintPath>packages\Scintilla5.NET.6.1.0\lib\net462\Scintilla.NET.dll</HintPath>
112112
</Reference>
113113
<Reference Include="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
114114
<Private>True</Private>
@@ -882,6 +882,7 @@
882882
<Compile Include="Utilities\ThemeUtilities\ColorTables\LightModeColorTable.vb" />
883883
<Compile Include="Utilities\ThemeUtilities\Theme.vb" />
884884
<Compile Include="Utilities\ThemeUtilities\ThemeHelper.vb" />
885+
<Compile Include="Utilities\TourServer.vb" />
885886
<Compile Include="Utilities\WindowHelper.vb" />
886887
<Compile Include="Utilities\WMIHelper.vb" />
887888
<Compile Include="Videos\Video.vb" />
@@ -1551,6 +1552,8 @@
15511552
<Content Include="Resources\glyphs\scripts_addfirstscript_dark.png" />
15521553
<Content Include="Resources\glyphs\scripts_addfirstscript_light.png" />
15531554
<None Include="Resources\service_pic_32px.png" />
1555+
<None Include="Resources\menus\tour_glyph_dark.png" />
1556+
<None Include="Resources\menus\tour_glyph_light.png" />
15541557
<Content Include="Tools\UnattendGen\win-arm64\Library-License.txt" />
15551558
<Content Include="Tools\UnattendGen\win-arm64\LICENSE.txt" />
15561559
<Content Include="Tools\UnattendGen\win-arm64\Newtonsoft.Json.dll" />
@@ -2102,18 +2105,18 @@ IF EXIST tools (
21022105

21032106
IF EXIST "report.html" (del "report.html")</PreBuildEvent>
21042107
</PropertyGroup>
2105-
<Import Project="packages\Scintilla5.NET.6.0.1\build\scintilla5.net.targets" Condition="Exists('packages\Scintilla5.NET.6.0.1\build\scintilla5.net.targets')" />
2106-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
2107-
<PropertyGroup>
2108-
<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>
2109-
</PropertyGroup>
2110-
<Error Condition="!Exists('packages\Scintilla5.NET.6.0.1\build\scintilla5.net.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Scintilla5.NET.6.0.1\build\scintilla5.net.targets'))" />
2111-
</Target>
21122108
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
21132109
Other similar extension points exist, see Microsoft.Common.targets.
21142110
<Target Name="BeforeBuild">
21152111
</Target>
21162112
<Target Name="AfterBuild">
21172113
</Target>
21182114
-->
2115+
<Import Project="packages\Scintilla5.NET.6.1.0\build\scintilla5.net.targets" Condition="Exists('packages\Scintilla5.NET.6.1.0\build\scintilla5.net.targets')" />
2116+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
2117+
<PropertyGroup>
2118+
<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>
2119+
</PropertyGroup>
2120+
<Error Condition="!Exists('packages\Scintilla5.NET.6.1.0\build\scintilla5.net.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Scintilla5.NET.6.1.0\build\scintilla5.net.targets'))" />
2121+
</Target>
21192122
</Project>

‎Elements/ServiceManagement/WindowsServiceHelper.vb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,6 @@ Module WindowsServiceHelper
571571
RegistryHelper.AddRegistryItem(New RegistryItem(registryPath, "DelayedAutoStart", RegistryItem.ValueType.RegDword, If(Service.DelayedStart, 1, 0)))
572572
End If
573573
If reportProgress IsNot Nothing Then reportProgress.Invoke(currentService, serviceCount)
574-
ServiceManagementForm.ReportServiceSave(currentService, serviceCount)
575574
Next
576575
DynaLog.EnableLogging()
577576

‎Help/HelpBrowserForm.vb‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Public Class HelpBrowserForm
2020
Case "PTB", "PTG"
2121
TitleMsg = "Tópicos de ajuda do DISMTools"
2222
Case "ITA"
23-
TitleMsg = "Argomenti della guida di DISMTools"
23+
TitleMsg = "Argomenti guida DISMTools"
2424
End Select
2525
Case 1
2626
TitleMsg = "DISMTools Help Topics"
@@ -31,7 +31,7 @@ Public Class HelpBrowserForm
3131
Case 4
3232
TitleMsg = "Tópicos de ajuda do DISMTools"
3333
Case 5
34-
TitleMsg = "Argomenti della guida di DISMTools"
34+
TitleMsg = "Argomenti guida di DISMTools"
3535
End Select
3636
Dim handle As IntPtr = MainForm.GetWindowHandle(Me)
3737
MainForm.EnableDarkTitleBar(handle, CurrentTheme.IsDark)
@@ -72,8 +72,12 @@ Public Class HelpBrowserForm
7272
Case 5
7373
languageCode = "it"
7474
End Select
75-
76-
Process.Start(Path.Combine(Application.StartupPath, "docs", "tour", languageCode, "tour-start.html"))
75+
76+
MainForm.tourServer.StartServer()
77+
If MainForm.tourServer.IsListenerAlive() Then
78+
Process.Start(String.Format("http://localhost:2022/{0}/tour-start.html", languageCode))
79+
MainForm.TourActionsTSMI.Visible = True
80+
End If
7781
End If
7882
WebBrowser1.Navigate(CurrentSite)
7983
Exit Sub
@@ -102,4 +106,4 @@ Public Class HelpBrowserForm
102106
If MainForm.IsWindowsVersionOrGreater(10, 0, 18362) Then MainForm.EnableDarkTitleBar(handle, CurrentTheme.IsDark)
103107
End If
104108
End Sub
105-
End Class
109+
End Class

‎Helpers/extps1/PE_Helper/PE_Helper.ps1‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# '`""""""`. """""""""^ `,,," ---------------------------------------------------------
99
# '^"""""`. ^""""""""""'. .`,,,,,^ | Preinstallation Environment (PE) helper |
1010
# .^"""""`. ."""""""",,,,,,,,,,,,,,,. ---------------------------------------------------------
11-
# .^"""""^. .`",,"""",,,,,,,,,,,,,,,,' | (C) 2024-2025 CodingWonders Software |
11+
# .^"""""^. .`",,"""",,,,,,,,,,,,,,,,' | (C) 2024-2026 CodingWonders Software |
1212
# .^"""""^. '`^^"",:,,,,,,,,,,,,,,,,,". ---------------------------------------------------------
1313
# .^"""""^.`+]>,^^"",,:,,,,,,,,,,,,,`.
1414
# .^""";_]]]?)}:^^""",,,`'````'..
@@ -87,7 +87,7 @@ function Start-PEGeneration
8787
$architecture = [PE_Arch]::($arch)
8888
$version = "0.7.1"
8989
Write-Host "DISMTools $version - Preinstallation Environment Helper"
90-
Write-Host "(c) 2024-2025. CodingWonders Software. Portions (c) CT Tech Group LLC; (c) JJ Fullmer"
90+
Write-Host "(c) 2024-2026. CodingWonders Software. Portions (c) CT Tech Group LLC; (c) JJ Fullmer"
9191
Write-Host "-----------------------------------------------------------"
9292
# Start PE generation
9393
Write-Host "Starting PE generation..."
@@ -878,16 +878,19 @@ function New-WinPEIso
878878
Write-Host "Generating ISO file with UEFI compatibility..."
879879
$bootData = "1$($efiVars)"
880880
}
881-
$oscdimgProc = Start-Process "$env:NewPath\oscdimg.exe" -ArgumentList "-lDISMTools_PE -bootdata:$bootData -u2 -udfver102 `"$((Get-Location).Path)\ISOTEMP\media`" `"$isoLocation`"" -Wait -PassThru -NoNewWindow
882-
if ($oscdimgProc.ExitCode -eq 0)
883-
{
884-
Write-Host "ISO generation has completed successfully."
885-
}
886-
else
887-
{
888-
Write-Host "Failed to generate an ISO file."
889-
}
890-
return $($oscdimgProc.ExitCode -eq 0)
881+
882+
$success = $false
883+
884+
do {
885+
$oscdimgProc = Start-Process "$env:NewPath\oscdimg.exe" -ArgumentList "-lDISMTools_PE -bootdata:$bootData -u2 -udfver102 `"$((Get-Location).Path)\ISOTEMP\media`" `"$isoLocation`"" -Wait -PassThru -NoNewWindow
886+
$success = ($oscdimgProc.ExitCode -eq 0)
887+
if ($success -eq $false) {
888+
Write-Host "Could not generate ISO file. This can happen if the destination file is in use. Trying again after 5 seconds..."
889+
Start-Sleep -Seconds 5
890+
}
891+
} until ($success -eq $true)
892+
893+
return $success
891894
}
892895
catch
893896
{
@@ -1952,7 +1955,7 @@ function Start-ProjectDevelopment {
19521955
$version = "0.7.1"
19531956
$ESVer = "0.6.1"
19541957
Write-Host "DISMTools $version - Preinstallation Environment Helper"
1955-
Write-Host "(c) 2024-2025. CodingWonders Software. Portions (c) CT Tech Group LLC; (c) JJ Fullmer"
1958+
Write-Host "(c) 2024-2026. CodingWonders Software. Portions (c) CT Tech Group LLC; (c) JJ Fullmer"
19561959
Write-Host "-----------------------------------------------------------"
19571960
# Start PE generation
19581961
Write-Host "Starting project creation... (Extensibility Suite version $ESVer)"
@@ -2155,7 +2158,7 @@ elseif ($cmd -eq "Help")
21552158
{
21562159
# Show help documentation
21572160
Write-Host "DISMTools - Preinstallation Environment Helper"
2158-
Write-Host "(c) 2024-2025. CodingWonders Software"
2161+
Write-Host "(c) 2024-2026. CodingWonders Software. Portions (c) CT Tech Group LLC; (c) JJ Fullmer"
21592162
Write-Host "-----------------------------------------------------------`n"
21602163

21612164
Write-Host "Usage: PE_Helper.ps1 {-cmd} [StartPEGen -arch <arch> -imgFile <imgFile> -isoPath <isoPath>] [StartApply] [StartDevelopment -testArch <arch> -targetPath <targetPath>] [Help]`n"

‎Helpers/extps1/PE_Helper/files/HotInstall.zip‎

37.8 KB
Binary file not shown.

‎Helpers/extps1/PE_Helper/files/SysprepPreparator.zip‎

-15.3 KB
Binary file not shown.

‎Helpers/extps1/PE_Helper/tools/HotInstall/Installer/ApplicationEvents.vb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
Partial Friend Class MyApplication
1010

1111
Public Sub CatchEmAll(sender As Object, e As Microsoft.VisualBasic.ApplicationServices.UnhandledExceptionEventArgs) Handles Me.UnhandledException
12+
DynaLog.LogMessage("Unhandled exception occurred. Gotta catch'em all !")
13+
DynaLog.LogMessage("Exception information:")
14+
DynaLog.LogMessage("- Message: " & e.Exception.Message)
15+
DynaLog.LogMessage("- Code (HRESULT): " & Hex(e.Exception.HResult))
1216
' Gotta catch 'em all !
1317
Installer.MainForm.LogErrorMessage(e.Exception, InstallationStage.InstallerStage.Miscellaneous)
1418
Installer.MainForm.ChangePage(WizardPage.Page.FailurePage, True)

0 commit comments

Comments
 (0)