Update tool to use DriverUpdater for installing drivers

Author: gus33000

DeviceProfiles/CitymanProfile.cs

@@ -12,10 +12,7 @@ public string Bootloader()
 
         public string DriverCommand(string DriverFolder)
         {
-            string definitionFile = $@"{DriverFolder}\definitions\950xl.txt";
-            string[] definitionPaths = File.ReadAllLines(definitionFile).Where(x => !string.IsNullOrEmpty(x)).ToArray();
-            string driverCommand = $"{string.Join(" ", definitionPaths.Select(x => $"/Driver:\"{DriverFolder}\\{x}\""))} /Recurse";
-            return driverCommand;
+            return $@"{DriverFolder}\definitions\950xl.txt";
         }
 
         public string FFUFileName(string OSVersion, string Language, string Sku)

DeviceProfiles/HapaneroAAProfile.cs

@@ -12,10 +12,7 @@ public string Bootloader()
 
         public string DriverCommand(string DriverFolder)
         {
-            string definitionFile = $@"{DriverFolder}\definitions\rx130aa.txt";
-            string[] definitionPaths = File.ReadAllLines(definitionFile).Where(x => !string.IsNullOrEmpty(x)).ToArray();
-            string driverCommand = $"{string.Join(" ", definitionPaths.Select(x => $"/Driver:\"{DriverFolder}\\{x}\""))} /Recurse";
-            return driverCommand;
+            return $@"{DriverFolder}\definitions\rx130aa.txt";
         }
 
         public string FFUFileName(string OSVersion, string Language, string Sku)

DeviceProfiles/HapaneroABProfile.cs

@@ -12,10 +12,7 @@ public string Bootloader()
 
         public string DriverCommand(string DriverFolder)
         {
-            string definitionFile = $@"{DriverFolder}\definitions\rx130ab.txt";
-            string[] definitionPaths = File.ReadAllLines(definitionFile).Where(x => !string.IsNullOrEmpty(x)).ToArray();
-            string driverCommand = $"{string.Join(" ", definitionPaths.Select(x => $"/Driver:\"{DriverFolder}\\{x}\""))} /Recurse";
-            return driverCommand;
+            return $@"{DriverFolder}\definitions\rx130ab.txt";
         }
 
         public string FFUFileName(string OSVersion, string Language, string Sku)

DeviceProfiles/TalkmanProfile.cs

@@ -12,10 +12,7 @@ public string Bootloader()
 
         public string DriverCommand(string DriverFolder)
         {
-            string definitionFile = $@"{DriverFolder}\definitions\950.txt";
-            string[] definitionPaths = File.ReadAllLines(definitionFile).Where(x => !string.IsNullOrEmpty(x)).ToArray();
-            string driverCommand = $"{string.Join(" ", definitionPaths.Select(x => $"/Driver:\"{DriverFolder}\\{x}\""))} /Recurse";
-            return driverCommand;
+            return $@"{DriverFolder}\definitions\950.txt";
         }
 
         public string FFUFileName(string OSVersion, string Language, string Sku)

MainLogic.cs

@@ -24,8 +24,9 @@ public static bool VerifyAllComponentsArePresent()
             var BlankVHD = @"blank.vhdx";
             var wimlib = @"wimlib-imagex.exe";
             var Img2Ffu = @"Img2Ffu.exe";
+            var DriverUpdater = @"DriverUpdater.exe";
 
-            if (!(File.Exists(wimlib) && File.Exists(Img2Ffu) && File.Exists(BlankVHD)))
+            if (!(File.Exists(wimlib) && File.Exists(Img2Ffu) && File.Exists(BlankVHD) && File.Exists(DriverUpdater)))
             {
                 Logging.Log("Some components could not be found", Logging.LoggingLevel.Error);
                 return false;
@@ -46,7 +47,6 @@ public static bool VerifyAllComponentsArePresent()
         public static string MountVHD(string VHDPath, bool readOnly)
         {
             Logging.Log("Mounting " + VHDPath + (readOnly ? " as read only" : "") + "...");
-            //RunProgram("powershell.exe", $"-command \"Import-module hyper-v; Mount-VHD -Path '{VHDPath}'" + (readOnly ? " -ReadOnly" : "") + "\"");
             var id = VHDUtils.MountVHD(VHDPath, readOnly);
             Logging.Log(id, Logging.LoggingLevel.Warning);
             return id;
@@ -55,7 +55,6 @@ public static string MountVHD(string VHDPath, bool readOnly)
         public static void DismountVHD(string VHDPath)
         {
             Logging.Log("Dismounting " + VHDPath + "...");
-            //RunProgram("powershell.exe", $"-command \"Import-module hyper-v; Dismount-VHD -Path '{VHDPath}'\"");
             VHDUtils.UnmountVHD(VHDPath);
         }
 
@@ -146,6 +145,7 @@ public static void GenerateWindowsFFU(GenerateWindowsFFUOptions options)
             var tmp = @"tmp";
             var SystemPartition = "Y:";
             var Img2Ffu = @"Img2Ffu.exe";
+            var DriverUpdater = @"DriverUpdater.exe";
 
             if (!Directory.Exists(tmp))
                 Directory.CreateDirectory(tmp);
@@ -183,17 +183,13 @@ public static void GenerateWindowsFFU(GenerateWindowsFFUOptions options)
                 }
 
                 Logging.Log("Adding drivers");
-                RunProgram("dism.exe", $"/Image:{TVHDLetter} /Add-Driver " + deviceProfile.DriverCommand(options.DriverPack));
+                RunProgram(DriverUpdater, $"{deviceProfile.DriverCommand(options.DriverPack)} {options.DriverPack} {TVHDLetter} DisablePostUpgrade");
 
                 DismountVHD(TmpVHD);
 
-                //DiskId = MountVHD(TmpVHD, true);
-
                 Logging.Log("Making FFU");
                 RunProgram(Img2Ffu, $"-i {TmpVHD} -f \"{options.Output + "\\" + deviceProfile.FFUFileName(options.WindowsVer, "EN-US", "PRO")}\" -p {deviceProfile.PlatformID()} -o {options.WindowsVer}");
 
-                //DismountVHD(TmpVHD);
-
                 Logging.Log("Deleting Temp VHD");
                 File.Delete(TmpVHD);
             }