V1.4.9 initial functionality for testing

govido · Feb 3, 2021 · 253730e · 253730e
1 parent faa5618
commit 253730e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 92 deletions.
diff --git a/MDTp 1.5 installer/Changelog 1.5.txt b/MDTp 1.5 installer/Changelog 1.5.txt
diff --git a/MDTp 1.5 installer/MDTp-Import/MDTp-Templates/1.5_Audit_Mode_Template_SeWy.xml b/MDTp 1.5 installer/MDTp-Import/MDTp-Templates/1.5_Audit_Mode_Template_SeWy.xml
@@ -10,13 +10,16 @@
     <variable name="DestinationOSInstallType" property="DestinationOSInstallType">ByVariable</variable>
     <variable name="OSGUID" property="OSGUID">{258714ba-57bd-4a7b-bf56-c387e7c213fb}</variable>
   </globalVarList>
-  <step type="SMS_TaskSequence_SetVariableAction" name="AdminPassword_local" description="" disable="false" continueOnError="false" successCodeList="0 3010">
-    <defaultVarList>
-      <variable name="VariableName" property="VariableName">AdminPassword</variable>
-      <variable name="VariableValue" property="VariableValue">PASSW0RD</variable>
-    </defaultVarList>
-    <action>cscript.exe "%SCRIPTROOT%\ZTISetVariable.wsf"</action>
-  </step>
+  <group expand="true" name="MDTp_Set_Custom_Variables" description="" disable="false" continueOnError="false">
+    <action />
+    <step type="SMS_TaskSequence_SetVariableAction" name="AdminPassword_local" description="" disable="false" continueOnError="false" successCodeList="0 3010">
+      <defaultVarList>
+        <variable name="VariableName" property="VariableName">AdminPassword</variable>
+        <variable name="VariableValue" property="VariableValue">PASSW0RD</variable>
+      </defaultVarList>
+      <action>cscript.exe "%SCRIPTROOT%\ZTISetVariable.wsf"</action>
+    </step>
+  </group>
   <group name="Initialization" disable="false" continueOnError="false" description="Initialize the TS environment" expand="true">
     <step type="BDD_Gather" name="Gather local only" disable="false" continueOnError="false" successCodeList="0 3010" description="" startIn="">
       <defaultVarList>

diff --git a/....5 installer/MDTp-Import/MDTp-Templates/1.5_MDTp_special_1_partition_Install_W10_Sewy.xml b/....5 installer/MDTp-Import/MDTp-Templates/1.5_MDTp_special_1_partition_Install_W10_Sewy.xml
@@ -36,14 +36,14 @@
     <step type="SMS_TaskSequence_SetVariableAction" name="DomainAdminPassword" description="" disable="false" continueOnError="false" successCodeList="0 3010">
       <defaultVarList>
         <variable name="VariableName" property="VariableName">DomainAdminPassword</variable>
-        <variable name="VariableValue" property="VariableValue"></variable>
+        <variable name="VariableValue" property="VariableValue">SecretPassword</variable>
       </defaultVarList>
       <action>cscript.exe "%SCRIPTROOT%\ZTISetVariable.wsf"</action>
     </step>
     <step type="SMS_TaskSequence_SetVariableAction" name="AdminPassword_local" description="" disable="false" continueOnError="false" successCodeList="0 3010">
       <defaultVarList>
         <variable name="VariableName" property="VariableName">AdminPassword</variable>
-        <variable name="VariableValue" property="VariableValue"></variable>
+        <variable name="VariableValue" property="VariableValue">SecretPassword</variable>
       </defaultVarList>
       <action>cscript.exe "%SCRIPTROOT%\ZTISetVariable.wsf"</action>
     </step>
@@ -71,7 +71,7 @@
     <step type="SMS_TaskSequence_SetVariableAction" name="ProductKey" description="Windows_10_Key" disable="false" continueOnError="false" successCodeList="0 3010">
       <defaultVarList>
         <variable name="VariableName" property="VariableName">ProductKey</variable>
-        <variable name="VariableValue" property="VariableValue"></variable>
+        <variable name="VariableValue" property="VariableValue">YOURwindowsKEY</variable>
       </defaultVarList>
       <action>cscript.exe "%SCRIPTROOT%\ZTISetVariable.wsf"</action>
     </step>

diff --git a/...5 installer/MDTp-Import/MDTp-Templates/1.5_MDTp_special_2_partitions_Install_W10_Sewy.xml b/...5 installer/MDTp-Import/MDTp-Templates/1.5_MDTp_special_2_partitions_Install_W10_Sewy.xml
@@ -36,14 +36,14 @@
     <step type="SMS_TaskSequence_SetVariableAction" name="DomainAdminPassword" description="" disable="false" continueOnError="false" successCodeList="0 3010">
       <defaultVarList>
         <variable name="VariableName" property="VariableName">DomainAdminPassword</variable>
-        <variable name="VariableValue" property="VariableValue"></variable>
+        <variable name="VariableValue" property="VariableValue">SecretPassword</variable>
       </defaultVarList>
       <action>cscript.exe "%SCRIPTROOT%\ZTISetVariable.wsf"</action>
     </step>
     <step type="SMS_TaskSequence_SetVariableAction" name="AdminPassword_local" description="" disable="false" continueOnError="false" successCodeList="0 3010">
       <defaultVarList>
         <variable name="VariableName" property="VariableName">AdminPassword</variable>
-        <variable name="VariableValue" property="VariableValue"></variable>
+        <variable name="VariableValue" property="VariableValue">SecretPassword</variable>
       </defaultVarList>
       <action>cscript.exe "%SCRIPTROOT%\ZTISetVariable.wsf"</action>
     </step>
@@ -71,7 +71,7 @@
     <step type="SMS_TaskSequence_SetVariableAction" name="ProductKey" description="Windows_10_Key" disable="false" continueOnError="false" successCodeList="0 3010">
       <defaultVarList>
         <variable name="VariableName" property="VariableName">ProductKey</variable>
-        <variable name="VariableValue" property="VariableValue"></variable>
+        <variable name="VariableValue" property="VariableValue">YOURwindowsKEY</variable>
       </defaultVarList>
       <action>cscript.exe "%SCRIPTROOT%\ZTISetVariable.wsf"</action>
     </step>

diff --git a/MDTp 1.5 installer/MDTp_Tools/SW_MDTp_Tool/MDTp_Tool.ps1 b/MDTp 1.5 installer/MDTp_Tools/SW_MDTp_Tool/MDTp_Tool.ps1
diff --git a/MDTp 1.5 installer/MDTp_Tools/SW_MDTp_Tool/Main.xaml b/MDTp 1.5 installer/MDTp_Tools/SW_MDTp_Tool/Main.xaml
@@ -194,7 +194,7 @@
 						<ComboBox HorizontalAlignment="Left" VerticalAlignment="Top" Width="240" Margin="5,5,5,5" Name="ts_db_combobox"/>
 						<Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Custom drivers (NONE for automatic mainboard detection):" Margin="5,5,5,5" ToolTip="Select driver folder if some PCs use special driver packs (eg. GPU, special PCI-E Cards)"/>
 						<ComboBox HorizontalAlignment="Left" VerticalAlignment="Top" Width="240" Margin="5,5,5,5" Name="drivergroup_combobox"/>
-						<Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="PC domainjoin OU:" Margin="5,5,5,5" ToolTip="This OU MUST exist in AD, existing AD-PCs OU won't be affected"/>
+						<Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="PC domainjoin OU: (deprecated, TS is used for more flexibilty)" Margin="5,5,5,5" ToolTip="This OU MUST exist in AD, existing AD-PCs OU won't be affected"/>
 						<TextBox HorizontalAlignment="Left" VerticalAlignment="Top" Height="26" Width="390" TextWrapping="Wrap" Margin="5,5,5,5" Name="pc_ou_db_text"/>
 					</StackPanel>
 					<StackPanel Name="buttons" Grid.Row="0" Grid.Column="2" Orientation="Vertical" HorizontalAlignment="Stretch" Margin="5,5,5,5">