Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DISMTools 0.4.2 Update 3 (Push to Stable) #128

Merged
merged 18 commits into from
May 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/create-nightly-installer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
$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
Move-Item -Path "$($solutionDir.TrimEnd("\"))\Installer\Output\dt_setup.exe" -Destination "$($solutionDir.TrimEnd("\"))\Installer\Nightly\dt_setup.exe" -Force
- name: Push nightly installer
uses: stefanzweifel/git-auto-commit-action@v5
with:
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -399,4 +399,7 @@ FodyWeavers.xsd

# Installer leftovers
[Ii]nstaller/[Ff]iles/
[Ii]nstaller/[Oo]utput/
[Ii]nstaller/[Oo]utput/

# JetBrains software
.idea/
6 changes: 3 additions & 3 deletions Actions/Actions.MainForm.vb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ Public Class Actions_MainForm
Scintilla1.StyleResetDefault()
' Use VS's selection color, as I find it the most natural
If MainForm.BackColor = Color.FromArgb(48, 48, 48) Then
Scintilla1.SetSelectionBackColor(True, Color.FromArgb(38, 79, 120))
Scintilla1.SelectionBackColor = Color.FromArgb(38, 79, 120)
ElseIf MainForm.BackColor = Color.FromArgb(239, 239, 242) Then
Scintilla1.SetSelectionBackColor(True, Color.FromArgb(153, 201, 239))
Scintilla1.SelectionBackColor = Color.FromArgb(153, 201, 239)
End If
Scintilla1.Styles(Style.Default).Font = fntName
Scintilla1.Styles(Style.Default).Size = fntSize
Expand Down Expand Up @@ -51,7 +51,7 @@ Public Class Actions_MainForm
Scintilla1.Styles(Style.Vb.Date).ForeColor = Color.FromArgb(0, 255, 0)
End If
' Set lexer
Scintilla1.Lexer = Lexer.Vb
Scintilla1.LexerName = "vb"

' Set line number margin properties
If MainForm.BackColor = Color.FromArgb(48, 48, 48) Then
Expand Down
10 changes: 10 additions & 0 deletions ApplicationEvents.vb
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Imports Microsoft.Win32
Imports Microsoft.VisualBasic.ControlChars
Imports System.Management
Imports System.IO
Imports System.Text.Encoding

Namespace My
' Los siguientes eventos están disponibles para MyApplication:
Expand Down Expand Up @@ -61,6 +63,14 @@ Namespace My
Catch ex As Exception
' Could not get basic machine information
End Try
Try
If Not Directory.Exists(Path.Combine(Windows.Forms.Application.StartupPath, "logs", "errors")) Then
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
' Could not save error information
End Try
ExceptionForm.ShowDialog()
If ExceptionForm.DialogResult = DialogResult.OK Then
e.ExitApplication = False
Expand Down
6 changes: 0 additions & 6 deletions DISMTools.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DISMTools-Setup", "installer\DISMTools-Setup\DISMTools-Setup.vbproj", "{B5709CC5-633B-45DE-A398-B6D56F56CD7B}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DISMTools-UCS", "Updater\DISMTools-UCS\DISMTools-UCS.vbproj", "{C084B601-F395-47D3-9E66-C0582139DCF4}"
EndProject
Global
Expand All @@ -22,10 +20,6 @@ Global
{042ED465-C910-407A-93D1-736639FF0EA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{042ED465-C910-407A-93D1-736639FF0EA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{042ED465-C910-407A-93D1-736639FF0EA5}.Release|Any CPU.Build.0 = Release|Any CPU
{B5709CC5-633B-45DE-A398-B6D56F56CD7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B5709CC5-633B-45DE-A398-B6D56F56CD7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5709CC5-633B-45DE-A398-B6D56F56CD7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B5709CC5-633B-45DE-A398-B6D56F56CD7B}.Release|Any CPU.Build.0 = Release|Any CPU
{C084B601-F395-47D3-9E66-C0582139DCF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C084B601-F395-47D3-9E66-C0582139DCF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C084B601-F395-47D3-9E66-C0582139DCF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
15 changes: 13 additions & 2 deletions DISMTools.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -78,8 +80,8 @@
<Reference Include="Microsoft.Dism, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5bba90053b345501, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.Dism.3.1.0\lib\net40\Microsoft.Dism.dll</HintPath>
</Reference>
<Reference Include="ScintillaNET, Version=3.6.3.0, Culture=neutral, PublicKeyToken=d42c48f11a620156, processorArchitecture=MSIL">
<HintPath>packages\jacobslusser.ScintillaNET.Signed.3.6.3\lib\net40\ScintillaNET.dll</HintPath>
<Reference Include="Scintilla.NET, Version=5.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Scintilla5.NET.5.5.1\lib\net47\Scintilla.NET.dll</HintPath>
</Reference>
<Reference Include="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<Private>True</Private>
Expand All @@ -88,6 +90,7 @@
<Reference Include="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
<Reference Include="System.Design" />
<Reference Include="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
Expand Down Expand Up @@ -696,6 +699,7 @@
<Compile Include="Panels\Unattend_Files\Management\UnattendMgr.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Utilities\DriverSignerViewer.vb" />
<Compile Include="Utilities\DT_Utils.vb" />
<Compile Include="Utilities\ImageWatcher.vb" />
<Compile Include="Utilities\PriReader.vb" />
Expand Down Expand Up @@ -1651,6 +1655,13 @@ IF EXIST videos (
IF EXIST videos.xml (del videos.xml)
IF EXIST videos.xml.old (del videos.xml.old)</PreBuildEvent>
</PropertyGroup>
<Import Project="packages\Scintilla5.NET.5.5.1\build\scintilla5.net.targets" Condition="Exists('packages\Scintilla5.NET.5.5.1\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.5.1\build\scintilla5.net.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Scintilla5.NET.5.5.1\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.
<Target Name="BeforeBuild">
Expand Down
6 changes: 0 additions & 6 deletions Installer/DISMTools-Setup/App.config

This file was deleted.

158 changes: 0 additions & 158 deletions Installer/DISMTools-Setup/DISMTools-Setup.vbproj

This file was deleted.

Loading