From ffe9ceb895f52a720967787287e95b709cc5a23f Mon Sep 17 00:00:00 2001
From: freedbygrace <freedbygrace@users.noreply.github.com>
Date: Mon, 13 Mar 2023 17:15:05 -0400
Subject: [PATCH] Fixed the generic driver packages filters

---
 Content/Templates/SettingsTemplate.xml | 94 --------------------------
 Invoke-DriverPackageDownload.ps1       |  2 +-
 Templates/TaskSequences/MDT/ts.xml     | 24 ++++++-
 3 files changed, 22 insertions(+), 98 deletions(-)
 delete mode 100644 Content/Templates/SettingsTemplate.xml

diff --git a/Content/Templates/SettingsTemplate.xml b/Content/Templates/SettingsTemplate.xml
deleted file mode 100644
index 8ea193c..0000000
--- a/Content/Templates/SettingsTemplate.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-16"?>
-
-<?xml-stylesheet type='text/xsl' href='style.xsl'?>
-
-<!--Please specify the configuration settings that will be used by the driver package creation powershell script.-->
-
-<!--
-
-By default, the settings XML will be automatically modified by the 'Invoke-DriverPackageCreation' script to include the model you execute the script on, but only if it matches one of the manufacturers within the XML.
-
-To add a model manually, copy and paste the following code into the  Powershell ISE on the specific model you want to add to this XML.
-
-The text will be automatically copied to the clipboard.
-
-Add the model under the desired manufacturer in order to the entry to be processed correctly.
-    
-### Begin Code Snippet ###
-    $PropertyList = New-Object -TypeName 'System.Collections.Generic.List[Object]'
-        $PropertyList.Add(@{Name = 'Enabled'; Expression = {$True}})
-        $PropertyList.Add('SystemProductName')
-        $PropertyList.Add(@{Name = 'ProductID'; Expression = {$_.BaseboardProduct}})
-        $PropertyList.Add('BaseboardProduct')
-        $PropertyList.Add('SystemSKU')
-        $PropertyList.Add('SystemVersion')
-        $PropertyList.Add('SystemFamily')    
-        $PropertyList.Add('SystemManufacturer')
-                   
-    $MSSystemInformation = Get-CIMInstance -Namespace "root\WMI" -Class "MS_SystemInformation" | Select-Object -Property ($PropertyList)
-
-    $XMLAttributes = $MSSystemInformation.PSObject.Properties | ForEach-Object {"$($_.Name)=`"$($_.Value)`""}
-
-    $XMLNode = "<Model $($XMLAttributes -Join ' ') />"
-
-    Write-Output -InputObject ($XMLNode)
-
-    $Null = $XMLNode | Set-Clipboard -Verbose
-### End Code Snippet ###
-
-<ModelList>
-    ### Copy and paste the generated text from the clipboard in between the 'ModelList' section for the desired manufacturer ###
-</ModelList>
-
-As an example, the following details are available from the following powershell command
-
-Get-CIMInstance -Namespace 'Root\WMI' -Class 'MS_SystemInformation'
-
-BaseBoardManufacturer  : Dell Inc.
-BaseBoardProduct       : 01Y2TP
-BaseBoardVersion       : A00
-BiosMajorRelease       : 1
-BiosMinorRelease       : 6
-BIOSReleaseDate        : 09/05/2022
-BIOSVendor             : Dell Inc.
-BIOSVersion            : 1.6.1
-ECFirmwareMajorRelease : 255
-ECFirmwareMinorRelease : 255
-InstanceName           : ROOT\mssmbios\0000_0
-SystemFamily           : Latitude
-SystemManufacturer     : Dell Inc.
-SystemProductName      : Latitude 5430
-SystemSKU              : 0B04
-SystemVersion          : 
-
--->
-
-<Settings>
-	<GeneratedBy>DSW\amote</GeneratedBy>
-	<GeneratedOn>NBAMOTE</GeneratedOn>
-	<GeneratedDate>2022-11-10T15:01</GeneratedDate>
-	<OperatingSystemList>
-		<OperatingSystem Enabled="True" Vendor="Microsoft" Name="Windows 10" NameExpression=".*10.*" ArchitectureExpression=".*64.*" ReleaseExpression=".*" LatestReleaseOnly="True" />
-		<OperatingSystem Enabled="True" Vendor="Microsoft" Name="Windows 11" NameExpression=".*11.*" ArchitectureExpression=".*64.*" ReleaseExpression=".*" LatestReleaseOnly="True" />
-	</OperatingSystemList>
-	<ManufacturerList>
-		<Manufacturer Enabled="True" Name="Dell" EligibilityExpression="(^.*Dell.*$)" ProductIDPropertyName="SystemSKU">
-			<URLs DriverPackCatalog="https://dl.dell.com/catalog/DriverPackCatalog.cab" DownloadBase="https://dl.dell.com" />
-			<ModelList>
-				<Model Enabled="False" SystemProductName="Latitude 5420" ProductID="0A20" BaseboardProduct="0M51J7" SystemSKU="0A20" SystemVersion="" SystemFamily="Latitude" SystemManufacturer="Dell" />
-			</ModelList>
-		</Manufacturer>
-		<Manufacturer Enabled="True" Name="HP" EligibilityExpression="(^.*HP.*$)|(^.*Hewlett.*Packard.*$)" ProductIDPropertyName="BaseboardProduct">
-			<URLs DriverPackCatalog="https://ftp.hp.com/pub/caps-softpaq/cmit/HPClientDriverPackCatalog.cab" DownloadBase="" />
-			<ModelList>
-				<Model Enabled="False" SystemProductName="HP ZBook Studio G7 Mobile Workstation" ProductID="8736" BaseboardProduct="8736" SystemSKU="8YP41AV" SystemVersion="" SystemFamily="103C_5336AN HP ZBook" SystemManufacturer="HP" />
-			</ModelList>
-		</Manufacturer>
-		<Manufacturer Enabled="True" Name="Lenovo" EligibilityExpression="(^.*LENOVO.*$)" ProductIDPropertyName="SystemProductName">
-			<URLs DriverPackCatalog="https://download.lenovo.com/cdrt/td/catalogv2.xml" DownloadBase="" />
-			<ModelList>
-				<Model Enabled="False" SystemProductName="10AXS2CQ00" ProductID="10AX" BaseboardProduct="10AXS2CQ00" SystemSKU="LENOVO_MT_10AX" SystemVersion="ThinkCentre M73" SystemFamily="To be filled by O.E.M." SystemManufacturer="Lenovo" />
-			</ModelList>
-		</Manufacturer>
-	</ManufacturerList>
-</Settings>
\ No newline at end of file
diff --git a/Invoke-DriverPackageDownload.ps1 b/Invoke-DriverPackageDownload.ps1
index e2bacf9..8bcc1ce 100644
--- a/Invoke-DriverPackageDownload.ps1
+++ b/Invoke-DriverPackageDownload.ps1
@@ -1064,7 +1064,7 @@ Else
 
                                                                                   Default
                                                                                   {
-                                                                                      $LoggingDetails.WarningMessage = "$($GetCurrentDateTimeMessageFormat.Invoke()) - The generic driver package of `"$($GenericDriverPackageDetails.Metadata.Name)`" is excluded because the minimum required operating system version of `"$($GenericDriverPackageOSVersion)`" is not less than or equal to the deployed operating system version of `"$($OperatingSystemCriteria.Version)`". Skipping..."
+                                                                                      $LoggingDetails.WarningMessage = "$($GetCurrentDateTimeMessageFormat.Invoke()) - The generic driver package of `"$($GenericDriverPackageDetails.Metadata.Name)`" is excluded because the minimum required operating system version of `"$($GenericDriverPackageOSVersion)`" is not less than or equal to the deployed operating system version of `"$($WindowsImageDetails.Version)`". Skipping..."
                                                                                       Write-Verbose -Message ($LoggingDetails.WarningMessage) -Verbose
                                                                                   }
                                                                             }
diff --git a/Templates/TaskSequences/MDT/ts.xml b/Templates/TaskSequences/MDT/ts.xml
index ffe1345..d6653a9 100644
--- a/Templates/TaskSequences/MDT/ts.xml
+++ b/Templates/TaskSequences/MDT/ts.xml
@@ -4,19 +4,37 @@
     <action />
     <group expand="true" name="Variables" description="" disable="false" continueOnError="false">
       <action />
-      <step type="SMS_TaskSequence_SetVariableAction" name="CustomContentPath" description="" disable="false" continueOnError="false" successCodeList="0 3010">
+      <step type="SMS_TaskSequence_SetVariableAction" name="CustomContentPath" description="Set this location to the path where " disable="false" continueOnError="false" successCodeList="0 3010">
         <defaultVarList>
           <variable name="VariableName" property="VariableName">CustomContentPath</variable>
           <variable name="VariableValue" property="VariableValue">%ScriptRoot%\Custom</variable>
         </defaultVarList>
         <action>cscript.exe "%SCRIPTROOT%\ZTISetVariable.wsf"</action>
+        <condition>
+          <operator type="not">
+            <expression type="SMS_TaskSequence_VariableConditionExpression">
+              <variable name="Variable">CustomContentPath</variable>
+              <variable name="Operator">exists</variable>
+              <variable name="Value"></variable>
+            </expression>
+          </operator>
+        </condition>
       </step>
-      <step type="SMS_TaskSequence_SetVariableAction" name="DownloadSegmentSize" description="" disable="false" continueOnError="false" successCodeList="0 3010">
+      <step type="SMS_TaskSequence_SetVariableAction" name="DownloadSegmentSize" description="Controls the download buffer for the script that performs the downloading of the driver package(s)." disable="false" continueOnError="false" successCodeList="0 3010">
         <defaultVarList>
           <variable name="VariableName" property="VariableName">DownloadSegmentSize</variable>
-          <variable name="VariableValue" property="VariableValue">16384</variable>
+          <variable name="VariableValue" property="VariableValue">102400</variable>
         </defaultVarList>
         <action>cscript.exe "%SCRIPTROOT%\ZTISetVariable.wsf"</action>
+        <condition>
+          <operator type="not">
+            <expression type="SMS_TaskSequence_VariableConditionExpression">
+              <variable name="Variable">DownloadSegmentSize</variable>
+              <variable name="Operator">exists</variable>
+              <variable name="Value"></variable>
+            </expression>
+          </operator>
+        </condition>
       </step>
       <step type="SMS_TaskSequence_SetVariableAction" name="DriverPackageRootDirectory" description="This is the root directory where driver package(s) will be retrieved for download." disable="false" continueOnError="false" successCodeList="0 3010">
         <defaultVarList>