Skip to content

Commit

Permalink
Merge pull request #20 from CodingWonders/dt_pre_2381
Browse files Browse the repository at this point in the history
DISMTools 0.3.1 Preview 1
  • Loading branch information
CodingWonders authored Aug 5, 2023
2 parents 8ae7c6a + a004201 commit ae8c530
Show file tree
Hide file tree
Showing 28 changed files with 1,731 additions and 1,420 deletions.
7 changes: 7 additions & 0 deletions 7z/README.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# 7-Zip executables

To fix the 7-Zip issue spotted by [abbodi1406](https://github.com/abbodi1406/) on the MDL forums, DISMTools 0.3.1 includes both the x64 and x86 versions of `7z.exe` and `7z.dll`.

7-Zip comes with a license, which you can read either [here](https://7-zip.org/license.txt) or in the Licenses section of the About dialog.

Some components used by 7-Zip come with different licenses, which are mentioned in the aforementioned ways to view the license file.
Binary file added 7z/amd64/7z.dll
Binary file not shown.
Binary file added 7z/amd64/7z.exe
Binary file not shown.
Binary file added 7z/i386/7z.dll
Binary file not shown.
Binary file added 7z/i386/7z.exe
Binary file not shown.
44 changes: 44 additions & 0 deletions Actions/example.dta
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
' Welcome to DISMTools Actions - version 0.1 (for DISMTools 0.3)
' Actions is the official scripting language of DISMTools. Create Action files (with the "dta" extension) and let tasks be automated.
' This is an example Action to help you get started.

' DO NOTE THAT THE DEVELOPER DOES NOT RECOMMEND DOING THIS YET!!! Its set of actions is REALLY limited, only 4
' commands in total. This is expected to change in future versions of this program.

' Available commands:
' - Project.Create
' - Image.Mount
' - Image.Remount
' - Image.Unmount
' Look in ProgressPanel.GetTasks() for information on how to use these.

' To mount an image:

' Image.Mount("whatever.wim", 2, "D:\mount", False, True, False)

' As you can see, Action files are easy to work on. This is because the scripting language is based on Visual Basic.

' You work with sections just like you would with procedures or functions.

Section Properties()
' The Properties section is always present. This is where the Actions ISE stores the file properties.
' In this section, you can ONLY access the properties of the Action namespace. You can modify these in here if you like,
' or use the property editor dialog, in "Actions -> Edit file properties..."
Action.Name = "My first Action script"
Action.Description = "This is my first Action script"
' Actions work with a concept called "test images". Test images let you **validate** your Action file. You can skip setting the test image,
' but the ISE will still ask. If you want to set the test image, you need to provide a valid WIM or VHDX file, and its index
'Action.TestImage.FileName = "whatever.wim"
'Action.TestImage.ImageIndex = 1
' This property, however, is not used when running the Action file outside of the ISE
End Section

Section Main()
' This is where your code would be in. Let's start by creating a project and mounting a Windows image you'd like, with the index you like, to it.
Project.Create("MyProject", "C:\MyProj")
' The first parameter is the project name, and the last one is its path
Image.Mount("whatever.wim", 2, "C:\MyProj", False, True, False)
' The first parameter is the source image, the second one is the index, the third one is the mount directory; and the last ones are parameters to specify additional operations to the function
End Section

' This has been the first Actions example.
24 changes: 21 additions & 3 deletions DISMTools.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
<Compile Include="Actions\Validation\Actions.Validation.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Elements\AppxPackage.vb" />
<Compile Include="Help\Help_RegisteredAppxPkgsDlg.Designer.vb">
<DependentUpon>Help_RegisteredAppxPkgsDlg.vb</DependentUpon>
</Compile>
Expand Down Expand Up @@ -213,6 +214,12 @@
<Compile Include="Panels\FirstUse\PrgSetup.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Panels\Get_Ops\Drivers\GetDriverInfo.Designer.vb">
<DependentUpon>GetDriverInfo.vb</DependentUpon>
</Compile>
<Compile Include="Panels\Get_Ops\Drivers\GetDriverInfo.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Panels\Get_Ops\GetImgInfoDlg.Designer.vb">
<DependentUpon>GetImgInfoDlg.vb</DependentUpon>
</Compile>
Expand Down Expand Up @@ -590,6 +597,9 @@
<EmbeddedResource Include="Panels\FirstUse\PrgSetup.resx">
<DependentUpon>PrgSetup.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Panels\Get_Ops\Drivers\GetDriverInfo.resx">
<DependentUpon>GetDriverInfo.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Panels\Get_Ops\GetImgInfoDlg.resx">
<DependentUpon>GetImgInfoDlg.vb</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -758,6 +768,7 @@
</ItemGroup>
<ItemGroup>
<None Include=".editorconfig" />
<None Include="Actions\example.dta" />
<None Include="app.config" />
<None Include="Helpers\dthelper.bat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down Expand Up @@ -855,6 +866,10 @@
<None Include="Resources\icons8_code_32px.png" />
</ItemGroup>
<ItemGroup>
<Content Include="7z\amd64\7z.dll" />
<Content Include="7z\amd64\7z.exe" />
<Content Include="7z\i386\7z.dll" />
<Content Include="7z\i386\7z.exe" />
<Content Include="Installer\dt.iss" />
<Content Include="Installer\ISCC.exe" />
<Content Include="Installer\ISCmplr.dll" />
Expand All @@ -875,6 +890,9 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\startup\dt_branding.png" />
<None Include="Resources\get_drv_info.png" />
<None Include="Resources\drv_info_from_image.png" />
<None Include="Resources\info_from_drv_file.png" />
<Content Include="ThemeVS2012\Resources\Dockindicator_PaneDiamond_Hotspot.png" />
<Content Include="ThemeVS2012\Resources\DockIndicator_PaneDiamond_HotspotIndex.png" />
<Content Include="ThemeVS2012\Resources\MaskArrowBottom.png" />
Expand Down Expand Up @@ -1188,9 +1206,9 @@ IF NOT EXIST bin (
) ELSE (
echo A bin folder already exists
)
IF EXIST "\Program Files\7-Zip" (
COPY "\Program Files\7-Zip\7z.exe" $(TargetDir)bin\utils\7z.exe
COPY "\Program Files\7-Zip\7z.dll" $(TargetDir)bin\utils\7z.dll
IF EXIST "$(SolutionDir)7z" (
XCOPY "$(SolutionDir)7z\amd64\*" "$(TargetDir)bin\utils\x64" /cehyi
XCOPY "$(SolutionDir)7z\i386\*" "$(TargetDir)bin\utils\x86" /cehyi
)
IF NOT EXIST logs (
md logs
Expand Down
86 changes: 86 additions & 0 deletions Elements/AppxPackage.vb
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
Imports System.Xml.Serialization

Namespace Elements

''' <summary>
''' Class for AppX package files
''' </summary>
''' <remarks></remarks>
<Serializable(), XmlRoot("Identity")>
Public Class AppxPackage
''' <summary>
''' The package file, in APPX, MSIX, APPXBUNDLE, or MSIXBUNDLE format
''' </summary>
''' <remarks></remarks>
Public Property PackageFile As String

''' <summary>
''' The name of the AppX package
''' </summary>
''' <remarks></remarks>
<XmlAttribute("Name")>
Public Property PackageName As String

''' <summary>
''' The publisher of the application, usually in "CN=..., O=..., L=..., S=..., C=..." or in "CN=..." forms
''' </summary>
''' <remarks></remarks>
<XmlAttribute("Publisher")>
Public Property PackagePublisher As String

''' <summary>
''' The version string of the application
''' </summary>
''' <remarks></remarks>
<XmlAttribute("Version")>
Public Property PackageVersion As String

<XmlAttribute("ProcessorArchitecture")>
Public Property PackageArchitecture As String

''' <summary>
''' The dependencies required by the application and specified in its manifest file
''' </summary>
''' <remarks></remarks>
Public Property PackageRequiredDependencies As New List(Of AppxDependency)

''' <summary>
''' The dependency packages specified by the user
''' </summary>
''' <remarks></remarks>
Public Property PackageSpecifiedDependencies As New List(Of AppxDependency)

Public Property PackageLicenseFile As String

Public Property PackageCustomDataFile As String

Public Property PackageRegions As String
End Class

''' <summary>
''' Class for AppX package dependency files
''' </summary>
''' <remarks></remarks>
<Serializable(), XmlRoot("Dependencies")>
Public Class AppxDependency

''' <summary>
''' The dependency file specified by the user
''' </summary>
''' <remarks></remarks>
Public Property DependencyFile As String

''' <summary>
''' The name of the AppX dependency
''' </summary>
''' <remarks></remarks>
Public Property DependencyName As String

''' <summary>
''' The version of the AppX dependency
''' </summary>
''' <remarks></remarks>
Public Property DependencyVersion As String
End Class
End Namespace

Binary file modified Installer/Output/dt_setup.exe
Binary file not shown.
50 changes: 21 additions & 29 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 ae8c530

Please sign in to comment.