Skip to content

Commit b37744b

Browse files
committed
[Unattended answer file] Improvements for 0.6.1 P1
- Updated UnattendGen - Added configuration set/distribution share support
1 parent 0a82062 commit b37744b

13 files changed

+100
-53
lines changed

Panels/Unattend_Files/Addition/NewUnattendWiz.Designer.vb

+68-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Panels/Unattend_Files/Addition/NewUnattendWiz.resx

+6
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,9 @@ To begin creating your answer file, click Next.</value>
152152
<metadata name="DarkToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
153153
<value>17, 17</value>
154154
</metadata>
155+
<metadata name="DarkToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
156+
<value>17, 17</value>
157+
</metadata>
155158
<metadata name="TimeZonePageTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
156159
<value>150, 17</value>
157160
</metadata>
@@ -436,6 +439,9 @@ To begin creating your answer file, click Next.</value>
436439
<metadata name="CNameTTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
437440
<value>17, 56</value>
438441
</metadata>
442+
<data name="Label62.Text" xml:space="preserve">
443+
<value>Make sure that the configuration set or distribution share has been created before copying the resulting unattended answer file to an ISO file and installing the operating system. You can create configuration sets or distribution shares with the Windows System Image Manager (SIM)</value>
444+
</data>
439445
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
440446
<value>
441447
AAABAAMAEBAAAAEAIABoBAAANgAAACAgAAABACAAqBAAAJ4EAAAwMAAAAQAgAKglAABGFQAAKAAAABAA

Panels/Unattend_Files/Addition/NewUnattendWiz.vb

+16-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Public Class NewUnattendWiz
1616

1717
Dim DotNetRuntimeSupported As Boolean
1818
Dim PreferSelfContained As Boolean
19-
Dim UnattendGenReleaseTag As String = "24122"
19+
Dim UnattendGenReleaseTag As String = "2511"
2020

2121
' Regional Settings Page
2222
Dim ImageLanguages As New List(Of ImageLanguage)
@@ -33,6 +33,7 @@ Public Class NewUnattendWiz
3333
Dim SelectedArchitecture As New DismProcessorArchitecture()
3434
Dim Win11Config As New SVSettings()
3535
Dim PCName As New ComputerName()
36+
Dim UseConfigSet As Boolean
3637

3738
' Time Zone Panel
3839
Dim TimeOffsets As New List(Of TimeOffset)
@@ -339,6 +340,7 @@ Public Class NewUnattendWiz
339340
GenericKeys.Add(NewKeyVar("2B87N-8KFHP-DKV6R-Y2C8J-PKCKT")) ' Pro N
340341
GenericKeys.Add(NewKeyVar("WYPNQ-8C467-V2W6J-TX4WX-WT2RQ")) ' Pro N for Workstations
341342
GenericKeys.Add(NewKeyVar("XGVPP-NMH47-7TTHJ-W3FW7-8HV2C")) ' Enterprise
343+
GenericKeys.Add(NewKeyVar("WGGHN-J84D6-QYCPR-T7PJ7-X766F")) ' Enterprise N
342344

343345
DynaLog.LogMessage("Adding default users. 1 Admin and 4 unused Users...")
344346
UserAccountsList.Add(New User(True, "Admin", "", UserGroup.Administrators))
@@ -651,6 +653,7 @@ Public Class NewUnattendWiz
651653
CheckBox2.Checked = False
652654
CheckBox3.Checked = True
653655
TextBox1.Text = ""
656+
CheckBox19.Checked = False
654657
' Restore time zone
655658
ComboBox5.SelectedItem = DefaultOffset.DisplayName
656659
RadioButton1.Checked = True
@@ -929,7 +932,8 @@ Public Class NewUnattendWiz
929932
"- Windows 11 Settings:" & CrLf &
930933
" - Bypass System Requirements? " & If(Win11Config.LabConfig_BypassRequirements, "Yes", "No") & CrLf &
931934
" - Bypass Mandatory Network Connection? " & If(Win11Config.OOBE_BypassNRO, "Yes", "No") & CrLf &
932-
"- Computer name: " & If(PCName.DefaultName, "random by Windows", PCName.Name) & CrLf)
935+
"- Computer name: " & If(PCName.DefaultName, "random by Windows", PCName.Name) & CrLf &
936+
"- Will a configuration set or distribution share be used? " & If(UseConfigSet, "Yes", "No") & CrLf)
933937
' 3. -- TIME ZONE
934938
TextBox13.AppendText("Time zone configuration: " & If(TimeOffsetInteractive, "based on regional settings" & CrLf, CrLf))
935939
If Not TimeOffsetInteractive Then
@@ -1607,6 +1611,8 @@ Public Class NewUnattendWiz
16071611
Return "pro_workstations_n"
16081612
Case "Enterprise"
16091613
Return "enterprise"
1614+
Case "Enterprise N"
1615+
Return "enterprise_n"
16101616
End Select
16111617
Return ""
16121618
End Function
@@ -1690,6 +1696,10 @@ Public Class NewUnattendWiz
16901696
If Not PCName.DefaultName Then
16911697
UnattendGen.StartInfo.Arguments &= " /computername=" & PCName.Name
16921698
End If
1699+
DynaLog.LogMessage("Saving configuration set/distribution share settings...")
1700+
If UseConfigSet Then
1701+
UnattendGen.StartInfo.Arguments &= " /ConfigSet"
1702+
End If
16931703
ReportMessage("Saving user settings...", 10)
16941704
DynaLog.LogMessage("Saving time zone settings...")
16951705
If TimeOffsetInteractive Then
@@ -2306,4 +2316,8 @@ Public Class NewUnattendWiz
23062316
Private Sub Button3_MouseHover(sender As Object, e As EventArgs) Handles Button3.MouseHover
23072317
CNameTTip.Show("Uses the name of your computer as the computer name of the unattended answer file." & CrLf & "Only use this if the system you want to target is this one", sender)
23082318
End Sub
2319+
2320+
Private Sub CheckBox19_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox19.CheckedChanged
2321+
UseConfigSet = CheckBox19.Checked
2322+
End Sub
23092323
End Class

Tools/UnattendGen/win-x64/UnattendGen.deps.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"runtimeTarget": {
3-
"name": ".NETCoreApp,Version=v8.0/win-x64",
3+
"name": ".NETCoreApp,Version=v9.0/win-x64",
44
"signature": ""
55
},
66
"compilationOptions": {},
77
"targets": {
8-
".NETCoreApp,Version=v8.0": {},
9-
".NETCoreApp,Version=v8.0/win-x64": {
8+
".NETCoreApp,Version=v9.0": {},
9+
".NETCoreApp,Version=v9.0/win-x64": {
1010
"UnattendGen/1.0.0": {
1111
"dependencies": {
1212
"UnattendGenerator": "1.0.0"
2 KB
Binary file not shown.
7 KB
Binary file not shown.

Tools/UnattendGen/win-x64/UnattendGen.runtimeconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"runtimeOptions": {
3-
"tfm": "net8.0",
3+
"tfm": "net9.0",
44
"framework": {
55
"name": "Microsoft.NETCore.App",
6-
"version": "8.0.0"
6+
"version": "9.0.0"
77
},
88
"configProperties": {
99
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
Binary file not shown.

Tools/UnattendGen/win-x86/UnattendGen.deps.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"runtimeTarget": {
3-
"name": ".NETCoreApp,Version=v8.0/win-x86",
3+
"name": ".NETCoreApp,Version=v9.0/win-x86",
44
"signature": ""
55
},
66
"compilationOptions": {},
77
"targets": {
8-
".NETCoreApp,Version=v8.0": {},
9-
".NETCoreApp,Version=v8.0/win-x86": {
8+
".NETCoreApp,Version=v9.0": {},
9+
".NETCoreApp,Version=v9.0/win-x86": {
1010
"UnattendGen/1.0.0": {
1111
"dependencies": {
1212
"UnattendGenerator": "1.0.0"
2 KB
Binary file not shown.
6.5 KB
Binary file not shown.

Tools/UnattendGen/win-x86/UnattendGen.runtimeconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"runtimeOptions": {
3-
"tfm": "net8.0",
3+
"tfm": "net9.0",
44
"framework": {
55
"name": "Microsoft.NETCore.App",
6-
"version": "8.0.0"
6+
"version": "9.0.0"
77
},
88
"configProperties": {
99
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
Binary file not shown.

0 commit comments

Comments
 (0)