Fix AppX package addition not working on Windows 8 images

Author: CodingWonders

Installer/Output/dt_setup.exe

@@ -220,6 +220,8 @@ Public Class MainForm
     Dim CapabilityInfoList As DismCapabilityCollection
     Dim DriverInfoList As DismDriverPackageCollection
 
+    Public imgVersionInfo As Version = Nothing
+
     Friend NotInheritable Class NativeMethods
 
         Private Sub New()
@@ -1696,6 +1698,7 @@ Public Class MainForm
         If Streamlined Then
             If OnlineMode Then
                 Label17.Text = Environment.OSVersion.Version.Major & "." & Environment.OSVersion.Version.Minor & "." & Environment.OSVersion.Version.Build & "." & FileVersionInfo.GetVersionInfo(Environment.GetFolderPath(Environment.SpecialFolder.Windows) & "\system32\ntoskrnl.exe").ProductPrivatePart
+                imgVersionInfo = Environment.OSVersion.Version
                 Select Case Language
                     Case 0
                         Select Case My.Computer.Info.InstalledUICulture.ThreeLetterWindowsLanguageName
@@ -1954,6 +1957,7 @@ Public Class MainForm
                                 Dim ImageInfoCollection As DismImageInfoCollection = DismApi.GetImageInfo(MountedImageImgFiles(x))
                                 For Each imageInfo As DismImageInfo In ImageInfoCollection
                                     If imageInfo.ImageIndex = MountedImageImgIndexes(x) Then
+                                        imgVersionInfo = imageInfo.ProductVersion
                                         imgMountedName = imageInfo.ImageName
                                         imgMountedDesc = imageInfo.ImageDescription
                                         imgHal = If(Not imageInfo.Hal = "", imageInfo.Hal, "Undefined by the image")

MainForm.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' mediante el asterisco ('*'), como se muestra a continuación:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("0.3.1.2385")> 
-<Assembly: AssemblyFileVersion("0.3.1.2385")> 
+<Assembly: AssemblyVersion("0.3.1.2394")> 
+<Assembly: AssemblyFileVersion("0.3.1.2394")> 

My Project/AssemblyInfo.vb

@@ -199,6 +199,8 @@ Public Class ProgressPanel
 
     Public ActionParameters As New List(Of String)
 
+    Dim ImgVersion As Version
+
     ' Initial settings
     Dim DismExe As String
     Dim AutoLogs As Boolean
@@ -2651,7 +2653,7 @@ Public Class ProgressPanel
                     LogView.AppendText(CrLf & _
                                        "Warning: the custom data file does not exist. Continuing without one...")
                 End If
-                If FileVersionInfo.GetVersionInfo(DismProgram).ProductMajorPart = 10 Then
+                If FileVersionInfo.GetVersionInfo(DismProgram).ProductMajorPart = 10 And ImgVersion.Major = 10 Then
                     If appxAdditionPackageList(x).PackageRegions = "" Then
                         CommandArgs &= " /region:all"
                     Else
@@ -4411,6 +4413,7 @@ Public Class ProgressPanel
         Language = MainForm.Language
         AllDrivers = MainForm.AllDrivers
         BodyPanel.BorderStyle = BorderStyle.None
+        ImgVersion = MainForm.imgVersionInfo
         ' Determine program colors
         If MainForm.BackColor = Color.FromArgb(48, 48, 48) Then
             BodyPanel.BackColor = Color.FromArgb(37, 37, 38)

Panels/DoWork/ProgressPanel.vb

@@ -356,7 +356,7 @@ Public Class AddProvAppxPackage
         Dim handle As IntPtr = MainForm.GetWindowHandle(Me)
         If MainForm.IsWindowsVersionOrGreater(10, 0, 18362) Then MainForm.EnableDarkTitleBar(handle, MainForm.BackColor = Color.FromArgb(48, 48, 48))
         AppxDetailsPanel.Height = If(ListView1.SelectedItems.Count <= 0, 520, 83)
-        GroupBox3.Enabled = If(FileVersionInfo.GetVersionInfo(MainForm.DismExe).ProductMajorPart < 10, False, True)
+        GroupBox3.Enabled = If(FileVersionInfo.GetVersionInfo(MainForm.DismExe).ProductMajorPart < 10 Or Not MainForm.imgVersionInfo.Major >= 10, False, True)
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click