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.

Sign up for GitHub

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

[Unattended answer file] Massive overhaul (Preview 4) #150

Merged
merged 20 commits into from
Aug 9, 2024
+3,399 −2,075
Merged

[Unattended answer file] Massive overhaul (Preview 4) #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cc1c29b
DISMTools Nightly Installer
CodingWonders Aug 7, 2024
6d22798
[Unattended answer file] Change WPA3-PSK to WPA3-SAE
CodingWonders Aug 7, 2024
454d596
DISMTools Nightly Installer
CodingWonders Aug 7, 2024
218227b
[Unattended answer file] Add explanation for "Skip connection"
CodingWonders Aug 7, 2024
c7f1ca6
[Unattended answer file] Add UnattendGen and finish basics
CodingWonders Aug 7, 2024
e1a6c6b
DISMTools Nightly Installer
CodingWonders Aug 7, 2024
9fe2603
[Unattended answer file] Polish creation wizard (part 1)
CodingWonders Aug 8, 2024
578b4ad
[Unattended answer file] Polish creation wizard (part 2)
CodingWonders Aug 8, 2024
de3ffe4
[Unattended answer file] Polish creation wizard (part 3)
CodingWonders Aug 8, 2024
6e94015
DISMTools Nightly Installer
CodingWonders Aug 8, 2024
939b8bb
[Unattended answer file] Remove Serbia in accordance to UnattendGen
CodingWonders Aug 8, 2024
0bba7b3
[Unattended answer file] Download Self-Contained UnattendGen if neces…
CodingWonders Aug 8, 2024
1ce6bd5
DISMTools Nightly Installer
CodingWonders Aug 8, 2024
e08ab40
[Unattended answer file] Remove UnattendGen installer when done
CodingWonders Aug 9, 2024
361b431
[Unattended answer file] Remove folders from older implementation
CodingWonders Aug 9, 2024
6dd163c
[Unattended answer file] Perform some final adjustments to creation
CodingWonders Aug 9, 2024
34a81fa
[Unattended answer file] Add basic manager
CodingWonders Aug 9, 2024
010de36
Merge branch 'dt_pre_2482_autounattend' of https://github.com/CodingW…
CodingWonders Aug 9, 2024
07f8eb6
[Unattended answer file] Finalize unattended features (Preview 4)
CodingWonders Aug 9, 2024
d7022fa
DISMTools Nightly Installer
CodingWonders Aug 9, 2024
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
69 changes: 69 additions & 0 deletions DISMTools.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,12 @@
<Compile Include="Panels\Img_Ops\Switch\SingleImageIndexError.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Panels\Img_Ops\Unattend\ApplyUnattendFile.Designer.vb">
<DependentUpon>ApplyUnattendFile.vb</DependentUpon>
</Compile>
<Compile Include="Panels\Img_Ops\Unattend\ApplyUnattendFile.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Panels\Img_Ops\WinPE\SetScratchSpace.Designer.vb">
<DependentUpon>SetScratchSpace.vb</DependentUpon>
</Compile>
Expand Down Expand Up @@ -964,6 +970,9 @@
<EmbeddedResource Include="Panels\Img_Ops\Switch\SingleImageIndexError.resx">
<DependentUpon>SingleImageIndexError.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Panels\Img_Ops\Unattend\ApplyUnattendFile.resx">
<DependentUpon>ApplyUnattendFile.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Panels\Img_Ops\WinPE\SetScratchSpace.resx">
<DependentUpon>SetScratchSpace.vb</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1138,6 +1147,18 @@
</None>
<None Include="Tools\DT_IEConfig.reg" />
<None Include="Tools\DT_WinADK.reg" />
<None Include="Tools\UnattendGen\win-arm64\publish\UnattendGen.deps.json" />
<None Include="Tools\UnattendGen\win-arm64\publish\UnattendGen.runtimeconfig.json" />
<None Include="Tools\UnattendGen\win-arm64\UnattendGen.deps.json" />
<None Include="Tools\UnattendGen\win-arm64\UnattendGen.runtimeconfig.json" />
<None Include="Tools\UnattendGen\win-x64\publish\UnattendGen.deps.json" />
<None Include="Tools\UnattendGen\win-x64\publish\UnattendGen.runtimeconfig.json" />
<None Include="Tools\UnattendGen\win-x64\UnattendGen.deps.json" />
<None Include="Tools\UnattendGen\win-x64\UnattendGen.runtimeconfig.json" />
<None Include="Tools\UnattendGen\win-x86\publish\UnattendGen.deps.json" />
<None Include="Tools\UnattendGen\win-x86\publish\UnattendGen.runtimeconfig.json" />
<None Include="Tools\UnattendGen\win-x86\UnattendGen.deps.json" />
<None Include="Tools\UnattendGen\win-x86\UnattendGen.runtimeconfig.json" />
</ItemGroup>
<ItemGroup>
<None Include="Panels\readme.md" />
Expand Down Expand Up @@ -1342,6 +1363,48 @@
<Content Include="ThemeVS2012\Resources\MaskWindowLeft.png" />
<Content Include="ThemeVS2012\Resources\MaskWindowRight.png" />
<Content Include="ThemeVS2012\Resources\MaskWindowTop.png" />
<Content Include="Tools\UnattendGen\win-arm64\Library-License.txt" />
<Content Include="Tools\UnattendGen\win-arm64\LICENSE.txt" />
<Content Include="Tools\UnattendGen\win-arm64\Newtonsoft.Json.dll" />
<Content Include="Tools\UnattendGen\win-arm64\publish\Newtonsoft.Json.dll" />
<Content Include="Tools\UnattendGen\win-arm64\publish\UnattendGen.dll" />
<Content Include="Tools\UnattendGen\win-arm64\publish\UnattendGen.exe" />
<Content Include="Tools\UnattendGen\win-arm64\publish\UnattendGen.pdb" />
<Content Include="Tools\UnattendGen\win-arm64\publish\UnattendGenerator.dll" />
<Content Include="Tools\UnattendGen\win-arm64\publish\UnattendGenerator.pdb" />
<Content Include="Tools\UnattendGen\win-arm64\UnattendGen.dll" />
<Content Include="Tools\UnattendGen\win-arm64\UnattendGen.exe" />
<Content Include="Tools\UnattendGen\win-arm64\UnattendGen.pdb" />
<Content Include="Tools\UnattendGen\win-arm64\UnattendGenerator.dll" />
<Content Include="Tools\UnattendGen\win-arm64\UnattendGenerator.pdb" />
<Content Include="Tools\UnattendGen\win-x64\Library-License.txt" />
<Content Include="Tools\UnattendGen\win-x64\LICENSE.txt" />
<Content Include="Tools\UnattendGen\win-x64\Newtonsoft.Json.dll" />
<Content Include="Tools\UnattendGen\win-x64\publish\Newtonsoft.Json.dll" />
<Content Include="Tools\UnattendGen\win-x64\publish\UnattendGen.dll" />
<Content Include="Tools\UnattendGen\win-x64\publish\UnattendGen.exe" />
<Content Include="Tools\UnattendGen\win-x64\publish\UnattendGen.pdb" />
<Content Include="Tools\UnattendGen\win-x64\publish\UnattendGenerator.dll" />
<Content Include="Tools\UnattendGen\win-x64\publish\UnattendGenerator.pdb" />
<Content Include="Tools\UnattendGen\win-x64\UnattendGen.dll" />
<Content Include="Tools\UnattendGen\win-x64\UnattendGen.exe" />
<Content Include="Tools\UnattendGen\win-x64\UnattendGen.pdb" />
<Content Include="Tools\UnattendGen\win-x64\UnattendGenerator.dll" />
<Content Include="Tools\UnattendGen\win-x64\UnattendGenerator.pdb" />
<Content Include="Tools\UnattendGen\win-x86\Library-License.txt" />
<Content Include="Tools\UnattendGen\win-x86\LICENSE.txt" />
<Content Include="Tools\UnattendGen\win-x86\Newtonsoft.Json.dll" />
<Content Include="Tools\UnattendGen\win-x86\publish\Newtonsoft.Json.dll" />
<Content Include="Tools\UnattendGen\win-x86\publish\UnattendGen.dll" />
<Content Include="Tools\UnattendGen\win-x86\publish\UnattendGen.exe" />
<Content Include="Tools\UnattendGen\win-x86\publish\UnattendGen.pdb" />
<Content Include="Tools\UnattendGen\win-x86\publish\UnattendGenerator.dll" />
<Content Include="Tools\UnattendGen\win-x86\publish\UnattendGenerator.pdb" />
<Content Include="Tools\UnattendGen\win-x86\UnattendGen.dll" />
<Content Include="Tools\UnattendGen\win-x86\UnattendGen.exe" />
<Content Include="Tools\UnattendGen\win-x86\UnattendGen.pdb" />
<Content Include="Tools\UnattendGen\win-x86\UnattendGenerator.dll" />
<Content Include="Tools\UnattendGen\win-x86\UnattendGenerator.pdb" />
<None Include="Resources\actions\validation.png" />
<None Include="Resources\setting_migration.ico" />
<None Include="Resources\secprogress_classic.png" />
Expand Down Expand Up @@ -1726,6 +1789,12 @@ IF EXIST "$(SolutionDir)Tools\UnpEax\bin\Debug\UnpEax.exe" (
copy /y "$(SolutionDir)Tools\UnpEax\bin\Debug\UnpEax.exe" "Tools\UnpEax\UnpEax.exe"
)

:: Copy UnattendGen
IF EXIST "$(SolutionDir)Tools\UnattendGen" (
md "Tools\UnattendGen"
xcopy "$(SolutionDir)Tools\UnattendGen\*" "Tools\UnattendGen" /cehyi
)

IF NOT EXIST AutoUnattend (
md AutoUnattend
copy /y "$(SolutionDir)Elements\AutoUnattend\*.xml" AutoUnattend
Expand Down
1 change: 0 additions & 1 deletion Elements/AutoUnattend/GeoId.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@
<GeoId Id="261" DisplayName="Yemen"/>
<GeoId Id="263" DisplayName="Zambia"/>
<GeoId Id="264" DisplayName="Zimbabwe"/>
<GeoId Id="269" DisplayName="Serbia"/>
<GeoId Id="270" DisplayName="Montenegro"/>
<GeoId Id="271" DisplayName="Serbia"/>
<GeoId Id="273" DisplayName="Curaçao"/>
Expand Down
2 changes: 1 addition & 1 deletion Elements/AutoUnattend/NetworkConnections/WirelessSettings.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
Public Enum WiFiAuthenticationMode As Integer
Open = 0
WPA2_PSK = 1
WPA3_PSK = 2
WPA3_SAE = 2
End Enum

Public Class WirelessValidator
Expand Down
4 changes: 2 additions & 2 deletions Elements/AutoUnattend/UnattendedWizardPage.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Public Class UnattendedWizardPage

Public Enum Page As Integer
DisclaimerPage = 0
WelcomePage = 0
RegionalPage = 1
SysConfigPage = 2
TimeZonePage = 3
Expand All @@ -24,7 +24,7 @@

Public Property WizardPage As Page

Public Const PageCount As Integer = 15
Public Const PageCount As Integer = 17
End Class

End Namespace
Binary file modified Installer/Nightly/dt_setup.exe
View file
Open in desktop
Binary file not shown.
49 changes: 32 additions & 17 deletions MainForm.Designer.vb
View file
Open in desktop

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

Loading