Skip to content

Commit

Permalink
DISMTools 0.4.2 Update 2 (April 2024 Update) (#116)
Browse files Browse the repository at this point in the history
* Update assembly information

* Close popup Mounted Image Manager with key press

* Change default log view font to Consolas

* Set default font to Consolas in the installer

* Fixed CSS layout issues

* Show file copy error information

* Detect if language is supported

* Enhanced automatic image reload feature

* Only show reload window when necessary

* Detect custom themes

* Added installer generation automation (#113)

* Test automation

* Update create-nightly-installer.yaml

* Update create-nightly-installer.yaml

* Update create-nightly-installer.yaml

* Update create-nightly-installer.yaml

* Update create-nightly-installer.yaml

* Update create-nightly-installer.yaml

* Update create-nightly-installer.yaml

* Update create-nightly-installer.yaml

* Update create-nightly-installer.yaml

* Update create-nightly-installer.yaml

* DISMTools Nightly Installer

* Update .gitignore

* DISMTools Nightly Installer

---------

Co-authored-by: CodingWonders <[email protected]>

* Added release update branches to action

* Update What's New section and Update System information files

* Delete temporary installer files

* Add workaround for #114

---------

Co-authored-by: CodingWonders <[email protected]>
  • Loading branch information
CodingWonders and CodingWonders authored Apr 27, 2024
1 parent 69eb63d commit 530a47d
Show file tree
Hide file tree
Showing 34 changed files with 1,805 additions and 75 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/create-nightly-installer.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Create Nightly Installer

on:
push:
branches:
- stable
- dt_pre*
- dt_rel*
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true

jobs:
build-runspace:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
- name: Set up MSBuild
uses: warrenbuckley/Setup-MSBuild@v1
- name: Prepare NuGet packages
run: .\nugetpkgprep.bat
continue-on-error: false
- name: Generate installer
run: |
$solutionDir = "$((Get-Location).Path)\"
$projectDir = "$((Get-Location).Path)\"
$targetDir = (Get-Location).Path + "\bin\Debug\"
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
- name: Push nightly installer
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: DISMTools Nightly Installer
if: success()
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -398,4 +398,5 @@ FodyWeavers.xsd
*.sln.iml

# Installer leftovers
[Ii]nstaller/[Ff]iles/
[Ii]nstaller/[Ff]iles/
[Ii]nstaller/[Oo]utput/
6 changes: 3 additions & 3 deletions Actions/Actions.MainForm.vb
Original file line number Diff line number Diff line change
Expand Up @@ -147,15 +147,15 @@ Public Class Actions_MainForm
Next
End If
StatusStrip.BackColor = MainForm.StatusStrip.BackColor
InitScintilla("Courier New", 10)
InitScintilla("Consolas", 11)
If MainForm.IsWindowsVersionOrGreater(10, 0, 18362) Then MainForm.EnableDarkTitleBar(Handle, MainForm.BackColor = Color.FromArgb(48, 48, 48))
' Fill in font combinations
FontFamilyTSCB.Items.Clear()
For Each fntFamily As FontFamily In FontFamily.Families
FontFamilyTSCB.Items.Add(fntFamily.Name)
Next
FontFamilyTSCB.SelectedItem = "Courier New"
InitScintilla("Courier New", 10)
FontFamilyTSCB.SelectedItem = "Consolas"
InitScintilla("Consolas", 11)
End Sub

Private Sub FontChange(sender As Object, e As EventArgs) Handles FontFamilyTSCB.SelectedIndexChanged, FontSizeTSCB.SelectedIndexChanged
Expand Down
10 changes: 10 additions & 0 deletions DISMTools.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,12 @@
<Compile Include="Panels\Report_Dlgs\Get-ImageInfo\ReportForm.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Panels\Startup\AutoReload\AutoReloadForm.Designer.vb">
<DependentUpon>AutoReloadForm.vb</DependentUpon>
</Compile>
<Compile Include="Panels\Startup\AutoReload\AutoReloadForm.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Panels\Startup\SplashScreen.Designer.vb">
<DependentUpon>SplashScreen.vb</DependentUpon>
</Compile>
Expand Down Expand Up @@ -966,6 +972,9 @@
<EmbeddedResource Include="Panels\Report_Dlgs\Get-ImageInfo\ReportForm.resx">
<DependentUpon>ReportForm.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Panels\Startup\AutoReload\AutoReloadForm.resx">
<DependentUpon>AutoReloadForm.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Panels\Startup\SplashScreen.resx">
<DependentUpon>SplashScreen.vb</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1603,6 +1612,7 @@ IF %25COPY_DOCS%25=="Yes" (
IF %25GEN_INSTALLER%25=="Yes" (
echo The technology used for creating the installer is subject to a license. Refer to the "LICENSE.TXT" file in the "$(SolutionDir)Installer" directory for more information
echo Copying program files...
IF EXIST "$(SolutionDir)Installer\files" (rd "$(SolutionDir)Installer\files" /s /q)
IF NOT EXIST "$(SolutionDir)Installer\files" (md "$(SolutionDir)Installer\files")
XCOPY "$(TargetDir)*.*" "$(SolutionDir)Installer\files" /cehyi
IF EXIST "$(SolutionDir)Installer\files\VS*.tmp" (del "$(SolutionDir)Installer\files\VS*.tmp" /f /q)
Expand Down
Binary file modified Installer/Output/dt_setup.exe
Binary file not shown.
4 changes: 2 additions & 2 deletions Installer/dt.iss
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ Root: HKCU; Subkey: "Software\DISMTools\Stable\Personalization"; Flags: uninsdel
Root: HKCU; Subkey: "Software\DISMTools\Stable\Personalization"; ValueType: dword; ValueName: "AllCaps"; ValueData: 0; Flags: uninsdeletevalue createvalueifdoesntexist
Root: HKCU; Subkey: "Software\DISMTools\Stable\Personalization"; ValueType: dword; ValueName: "ColorMode"; ValueData: 0; Flags: uninsdeletevalue createvalueifdoesntexist
Root: HKCU; Subkey: "Software\DISMTools\Stable\Personalization"; ValueType: dword; ValueName: "Language"; ValueData: 0; Flags: uninsdeletevalue createvalueifdoesntexist
Root: HKCU; Subkey: "Software\DISMTools\Stable\Personalization"; ValueType: string; ValueName: "LogFont"; ValueData: "Courier New"; Flags: uninsdeletevalue createvalueifdoesntexist
Root: HKCU; Subkey: "Software\DISMTools\Stable\Personalization"; ValueType: string; ValueName: "LogFont"; ValueData: "Consolas"; Flags: uninsdeletevalue createvalueifdoesntexist
Root: HKCU; Subkey: "Software\DISMTools\Stable\Personalization"; ValueType: dword; ValueName: "LogFontBold"; ValueData: 0; Flags: uninsdeletevalue createvalueifdoesntexist
Root: HKCU; Subkey: "Software\DISMTools\Stable\Personalization"; ValueType: dword; ValueName: "LogFontSi"; ValueData: 10; Flags: uninsdeletevalue createvalueifdoesntexist
Root: HKCU; Subkey: "Software\DISMTools\Stable\Personalization"; ValueType: dword; ValueName: "LogFontSi"; ValueData: 11; Flags: uninsdeletevalue createvalueifdoesntexist
Root: HKCU; Subkey: "Software\DISMTools\Stable\Personalization"; ValueType: dword; ValueName: "NewDesign"; ValueData: 1; Flags: uninsdeletevalue createvalueifdoesntexist
Root: HKCU; Subkey: "Software\DISMTools\Stable\Personalization"; ValueType: dword; ValueName: "SecondaryProgressPanelStyle"; ValueData: 1; Flags: uninsdeletevalue createvalueifdoesntexist

Expand Down
28 changes: 14 additions & 14 deletions MainForm.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 530a47d

Please sign in to comment.