From a98c74b733932d082f05893047760f29b0555db8 Mon Sep 17 00:00:00 2001
From: Elshiekh Ahmed <elahmed@microsoft.com>
Date: Mon, 2 Mar 2026 14:06:51 -0800
Subject: [PATCH 01/10] XGPM Main page - MSIXVC2 entry point

---
 .../Resources/Strings/MainPage.Designer.cs    | 27 ++++++++++++++++
 .../Resources/Strings/MainPage.resx           |  9 ++++++
 src/PackageUploader.UI/View/MainPageView.xaml | 31 ++++++++++++++++++-
 .../ViewModel/MainPageViewModel.cs            |  6 ++++
 4 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/src/PackageUploader.UI/Resources/Strings/MainPage.Designer.cs b/src/PackageUploader.UI/Resources/Strings/MainPage.Designer.cs
index 706e96b4..0d09d117 100644
--- a/src/PackageUploader.UI/Resources/Strings/MainPage.Designer.cs
+++ b/src/PackageUploader.UI/Resources/Strings/MainPage.Designer.cs
@@ -168,6 +168,33 @@ public static string MinimizeWindow {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Point to your loose file directory containing a MicrosoftGame.config for your PC game. Your files will be packaged and uploaded using the MSIXVC2 format — no pre-built package required..
+        /// </summary>
+        public static string Msixvc2BodyText {
+            get {
+                return ResourceManager.GetString("Msixvc2BodyText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Get started.
+        /// </summary>
+        public static string Msixvc2ButtonText {
+            get {
+                return ResourceManager.GetString("Msixvc2ButtonText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upload Loose Files (PC only).
+        /// </summary>
+        public static string Msixvc2TextBlockTitle {
+            get {
+                return ResourceManager.GetString("Msixvc2TextBlockTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Sign in.
         /// </summary>
diff --git a/src/PackageUploader.UI/Resources/Strings/MainPage.resx b/src/PackageUploader.UI/Resources/Strings/MainPage.resx
index 5f511d96..2bf5ae4b 100644
--- a/src/PackageUploader.UI/Resources/Strings/MainPage.resx
+++ b/src/PackageUploader.UI/Resources/Strings/MainPage.resx
@@ -188,4 +188,13 @@
     <value>Game packages speed up uploads, ensure secure installations, and optimize Xbox performance. Just add build files and a config file </value>
     <comment>The part of the string that needs to come before the hyperlink (if any)</comment>
   </data>
+  <data name="Msixvc2TextBlockTitle" xml:space="preserve">
+    <value>Upload Loose Files (PC only)</value>
+  </data>
+  <data name="Msixvc2BodyText" xml:space="preserve">
+    <value>Point to your loose file directory containing a MicrosoftGame.config for your PC game. Your files will be packaged and uploaded using the MSIXVC2 format — no pre-built package required.</value>
+  </data>
+  <data name="Msixvc2ButtonText" xml:space="preserve">
+    <value>Get started</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/PackageUploader.UI/View/MainPageView.xaml b/src/PackageUploader.UI/View/MainPageView.xaml
index 5e2646ac..5a86bc17 100644
--- a/src/PackageUploader.UI/View/MainPageView.xaml
+++ b/src/PackageUploader.UI/View/MainPageView.xaml
@@ -40,10 +40,12 @@
                 <ColumnDefinition />
                 <ColumnDefinition Width="0.05*"/>
                 <ColumnDefinition />
+                <ColumnDefinition Width="0.05*"/>
+                <ColumnDefinition />
             </Grid.ColumnDefinitions>
             
             <Border Grid.Row="0" 
-                    Grid.ColumnSpan="3"
+                    Grid.ColumnSpan="5"
                     BorderBrush="{DynamicResource BorderBrush}"
                     Background="{DynamicResource AppBackgroundBrush}"
                     Margin="0, 0, 0, 20"
@@ -178,6 +180,33 @@
                         Width="133" />
                 </StackPanel>
             </Border>
+
+            <Border Grid.Column="4"
+                    Grid.Row="2"
+                    Background="{DynamicResource AppBackgroundBrush}"
+                    Padding="10"
+                    CornerRadius="5">
+                <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center">
+                    <TextBlock Text="{x:Static strings:MainPage.Msixvc2TextBlockTitle}"
+                       d:Text="Upload Loose Files (PC only)"
+                       Style="{StaticResource SubHeadline}"
+                       Foreground="{DynamicResource PrimaryTextBrush}"
+                       HorizontalAlignment="Left" />
+
+                    <TextBlock Margin="0, 10, 0, 0" TextWrapping="Wrap"
+                       Text="{x:Static strings:MainPage.Msixvc2BodyText}"
+                       d:Text="Point to your loose file directory containing a MicrosoftGame.config for your PC game. Your files will be packaged and uploaded using the MSIXVC2 format — no pre-built package required."
+                       HorizontalAlignment="Left"
+                       Foreground="{DynamicResource SecondaryTextBrush}" />
+
+                    <Button Content="{x:Static strings:MainPage.Msixvc2ButtonText}"
+                        d:Content="Get started"
+                        Command="{Binding NavigateToMsixvc2Command}"
+                        HorizontalAlignment="Left"
+                        Margin="0,15,0,10"
+                        Width="128" />
+                </StackPanel>
+            </Border>
         </Grid>
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs b/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
index 46d32147..3e55524f 100644
--- a/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
@@ -25,6 +25,7 @@ public partial class MainPageViewModel : BaseViewModel
 
     public ICommand NavigateToPackageCreationCommand { get; }
     public ICommand NavigateToPackageUploadCommand { get; }
+    public ICommand NavigateToMsixvc2Command { get; }
     public ICommand SignInCommand { get; }
     public ICommand PackagingLearnMoreURL { get; }
     public ICommand ShowTenantSelectionCommand { get; }
@@ -190,6 +191,11 @@ public MainPageViewModel(
             LoadAvailableTenants();
         });
 
+        NavigateToMsixvc2Command = new RelayCommand(() =>
+        {
+            // TODO: Navigate to MSIXVC2 loose file upload view once implemented
+        });
+
         IsUserLoggedIn = false;
 
         string makePkgPath = ResolveFilePath("MakePkg.exe");

From 8d3484e11923a9ad5aace15a2cce052c665c2061 Mon Sep 17 00:00:00 2001
From: Elshiekh Ahmed <elahmed@microsoft.com>
Date: Mon, 2 Mar 2026 15:30:46 -0800
Subject: [PATCH 02/10] Msixvc2 specific page including build location,
 destination, browsing folder, and preview completed

---
 src/PackageUploader.UI/App.xaml.cs            |   2 +
 .../Strings/Msixvc2Upload.Designer.cs         | 315 +++++++++
 .../Resources/Strings/Msixvc2Upload.resx      | 204 ++++++
 .../View/Msixvc2UploadView.xaml               | 662 ++++++++++++++++++
 .../View/Msixvc2UploadView.xaml.cs            |  29 +
 .../ViewModel/MainPageViewModel.cs            |   2 +-
 .../ViewModel/Msixvc2UploadViewModel.cs       | 521 ++++++++++++++
 7 files changed, 1734 insertions(+), 1 deletion(-)
 create mode 100644 src/PackageUploader.UI/Resources/Strings/Msixvc2Upload.Designer.cs
 create mode 100644 src/PackageUploader.UI/Resources/Strings/Msixvc2Upload.resx
 create mode 100644 src/PackageUploader.UI/View/Msixvc2UploadView.xaml
 create mode 100644 src/PackageUploader.UI/View/Msixvc2UploadView.xaml.cs
 create mode 100644 src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs

diff --git a/src/PackageUploader.UI/App.xaml.cs b/src/PackageUploader.UI/App.xaml.cs
index 42db4f7d..d37048d1 100644
--- a/src/PackageUploader.UI/App.xaml.cs
+++ b/src/PackageUploader.UI/App.xaml.cs
@@ -64,6 +64,7 @@ public App()
                 services.AddSingleton<PackageUploadingViewModel>();
                 services.AddSingleton<UploadingFinishedViewModel>();
                 services.AddSingleton<ErrorScreenViewModel>();
+                services.AddSingleton<Msixvc2UploadViewModel>();
 
                 // Register Views
                 services.AddTransient<MainPageView>();
@@ -74,6 +75,7 @@ public App()
                 services.AddTransient<PackageUploadingView>();
                 services.AddTransient<UploadingFinishedView>();
                 services.AddTransient<ErrorPageView>();
+                services.AddTransient<Msixvc2UploadView>();
 
                 // Register the main window
                 services.AddSingleton<MainWindow>();
diff --git a/src/PackageUploader.UI/Resources/Strings/Msixvc2Upload.Designer.cs b/src/PackageUploader.UI/Resources/Strings/Msixvc2Upload.Designer.cs
new file mode 100644
index 00000000..365d7a8d
--- /dev/null
+++ b/src/PackageUploader.UI/Resources/Strings/Msixvc2Upload.Designer.cs
@@ -0,0 +1,315 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PackageUploader.UI.Resources.Strings {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Msixvc2Upload {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Msixvc2Upload() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PackageUploader.UI.Resources.Strings.Msixvc2Upload", typeof(Msixvc2Upload).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Additional details.
+        /// </summary>
+        public static string AdditionalDetailsTitle {
+            get {
+                return ResourceManager.GetString("AdditionalDetailsTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Browse to the content directory..
+        /// </summary>
+        public static string BrowseContentPathHelpText {
+            get {
+                return ResourceManager.GetString("BrowseContentPathHelpText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Browse.
+        /// </summary>
+        public static string BrowseText {
+            get {
+                return ResourceManager.GetString("BrowseText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Locate your loose file directory containing a MicrosoftGame.config. Add a layout file under Additional Details..
+        /// </summary>
+        public static string BuildLocationText {
+            get {
+                return ResourceManager.GetString("BuildLocationText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Build location.
+        /// </summary>
+        public static string BuildLocationTitle {
+            get {
+                return ResourceManager.GetString("BuildLocationTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cancel and return to the home page..
+        /// </summary>
+        public static string CancelButtonHelpText {
+            get {
+                return ResourceManager.GetString("CancelButtonHelpText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cancel.
+        /// </summary>
+        public static string CancelContentText {
+            get {
+                return ResourceManager.GetString("CancelContentText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select or enter the content map location.
+        /// </summary>
+        public static string ContentMapPathBoxDefaultText {
+            get {
+                return ResourceManager.GetString("ContentMapPathBoxDefaultText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select or enter the content directory.
+        /// </summary>
+        public static string ContentPathBoxDefaultText {
+            get {
+                return ResourceManager.GetString("ContentPathBoxDefaultText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Content path.
+        /// </summary>
+        public static string ContentPathTitleText {
+            get {
+                return ResourceManager.GetString("ContentPathTitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select a destination and market for the package upload..
+        /// </summary>
+        public static string DestinationSubtitleText {
+            get {
+                return ResourceManager.GetString("DestinationSubtitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Destination.
+        /// </summary>
+        public static string DestinationTitleText {
+            get {
+                return ResourceManager.GetString("DestinationTitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Family.
+        /// </summary>
+        public static string FamilyTitleText {
+            get {
+                return ResourceManager.GetString("FamilyTitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Folder size.
+        /// </summary>
+        public static string FolderSizeTitleText {
+            get {
+                return ResourceManager.GetString("FolderSizeTitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Layout file/content map.
+        /// </summary>
+        public static string LayoutFileMapTitle {
+            get {
+                return ResourceManager.GetString("LayoutFileMapTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Market.
+        /// </summary>
+        public static string MarketTitleText {
+            get {
+                return ResourceManager.GetString("MarketTitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Optional.
+        /// </summary>
+        public static string OptionalText {
+            get {
+                return ResourceManager.GetString("OptionalText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Package Identity name.
+        /// </summary>
+        public static string PackageIdentityNameTitleText {
+            get {
+                return ResourceManager.GetString("PackageIdentityNameTitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Product name.
+        /// </summary>
+        public static string ProductNameText {
+            get {
+                return ResourceManager.GetString("ProductNameText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Required.
+        /// </summary>
+        public static string RequiredText {
+            get {
+                return ResourceManager.GetString("RequiredText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Store ID.
+        /// </summary>
+        public static string StoreIdTitleText {
+            get {
+                return ResourceManager.GetString("StoreIdTitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Point to your loose file directory for your PC game containing a MicrosoftGame.config and we will package and upload using the MSIXVC2 format..
+        /// </summary>
+        public static string SubtitleText {
+            get {
+                return ResourceManager.GetString("SubtitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upload Loose Files (PC only).
+        /// </summary>
+        public static string TitleText {
+            get {
+                return ResourceManager.GetString("TitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upload Package.
+        /// </summary>
+        public static string UploadButtonContentText {
+            get {
+                return ResourceManager.GetString("UploadButtonContentText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Start packaging and uploading the loose files..
+        /// </summary>
+        public static string UploadButtonHelpText {
+            get {
+                return ResourceManager.GetString("UploadButtonHelpText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upload Preview.
+        /// </summary>
+        public static string UploadPreviewTitleText {
+            get {
+                return ResourceManager.GetString("UploadPreviewTitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select or enter the folder path for SubmissionValidator.dll.
+        /// </summary>
+        public static string ValidatorPathBoxDefaultText {
+            get {
+                return ResourceManager.GetString("ValidatorPathBoxDefaultText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Folder path for SubmissionValidator.dll.
+        /// </summary>
+        public static string ValidatorPathTitleText {
+            get {
+                return ResourceManager.GetString("ValidatorPathTitleText", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/PackageUploader.UI/Resources/Strings/Msixvc2Upload.resx b/src/PackageUploader.UI/Resources/Strings/Msixvc2Upload.resx
new file mode 100644
index 00000000..3a256f27
--- /dev/null
+++ b/src/PackageUploader.UI/Resources/Strings/Msixvc2Upload.resx
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdditionalDetailsTitle" xml:space="preserve">
+    <value>Additional details</value>
+  </data>
+  <data name="BrowseContentPathHelpText" xml:space="preserve">
+    <value>Browse to the content directory.</value>
+  </data>
+  <data name="BrowseText" xml:space="preserve">
+    <value>Browse</value>
+  </data>
+  <data name="BuildLocationText" xml:space="preserve">
+    <value>Locate your loose file directory containing a MicrosoftGame.config. Add a layout file under Additional Details.</value>
+  </data>
+  <data name="BuildLocationTitle" xml:space="preserve">
+    <value>Build location</value>
+  </data>
+  <data name="CancelButtonHelpText" xml:space="preserve">
+    <value>Cancel and return to the home page.</value>
+  </data>
+  <data name="CancelContentText" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="ContentMapPathBoxDefaultText" xml:space="preserve">
+    <value>Select or enter the content map location</value>
+  </data>
+  <data name="ContentPathBoxDefaultText" xml:space="preserve">
+    <value>Select or enter the content directory</value>
+  </data>
+  <data name="ContentPathTitleText" xml:space="preserve">
+    <value>Content path</value>
+  </data>
+  <data name="DestinationSubtitleText" xml:space="preserve">
+    <value>Select a destination and market for the package upload.</value>
+  </data>
+  <data name="DestinationTitleText" xml:space="preserve">
+    <value>Destination</value>
+  </data>
+  <data name="FamilyTitleText" xml:space="preserve">
+    <value>Family</value>
+  </data>
+  <data name="FolderSizeTitleText" xml:space="preserve">
+    <value>Folder size</value>
+  </data>
+  <data name="LayoutFileMapTitle" xml:space="preserve">
+    <value>Layout file/content map</value>
+  </data>
+  <data name="MarketTitleText" xml:space="preserve">
+    <value>Market</value>
+  </data>
+  <data name="OptionalText" xml:space="preserve">
+    <value>Optional</value>
+  </data>
+  <data name="PackageIdentityNameTitleText" xml:space="preserve">
+    <value>Package Identity name</value>
+  </data>
+  <data name="ProductNameText" xml:space="preserve">
+    <value>Product name</value>
+  </data>
+  <data name="RequiredText" xml:space="preserve">
+    <value>Required</value>
+  </data>
+  <data name="StoreIdTitleText" xml:space="preserve">
+    <value>Store ID</value>
+  </data>
+  <data name="SubtitleText" xml:space="preserve">
+    <value>Point to your loose file directory for your PC game containing a MicrosoftGame.config and we will package and upload using the MSIXVC2 format.</value>
+  </data>
+  <data name="TitleText" xml:space="preserve">
+    <value>Upload Loose Files (PC only)</value>
+  </data>
+  <data name="UploadButtonContentText" xml:space="preserve">
+    <value>Upload Package</value>
+  </data>
+  <data name="UploadButtonHelpText" xml:space="preserve">
+    <value>Start packaging and uploading the loose files.</value>
+  </data>
+  <data name="UploadPreviewTitleText" xml:space="preserve">
+    <value>Upload Preview</value>
+  </data>
+  <data name="ValidatorPathBoxDefaultText" xml:space="preserve">
+    <value>Select or enter the folder path for SubmissionValidator.dll</value>
+  </data>
+  <data name="ValidatorPathTitleText" xml:space="preserve">
+    <value>Folder path for SubmissionValidator.dll</value>
+  </data>
+</root>
diff --git a/src/PackageUploader.UI/View/Msixvc2UploadView.xaml b/src/PackageUploader.UI/View/Msixvc2UploadView.xaml
new file mode 100644
index 00000000..23a62ea0
--- /dev/null
+++ b/src/PackageUploader.UI/View/Msixvc2UploadView.xaml
@@ -0,0 +1,662 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:viewmodel="clr-namespace:PackageUploader.UI.ViewModel"
+             xmlns:strings="clr-namespace:PackageUploader.UI.Resources.Strings"
+             x:Class="PackageUploader.UI.View.Msixvc2UploadView"
+             mc:Ignorable="d"
+             d:DataContext="{d:DesignInstance Type=viewmodel:Msixvc2UploadViewModel}">
+    <UserControl.Resources>
+        <Storyboard x:Key="RotateAnimation">
+            <DoubleAnimation
+            Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+            From="0"
+            To="360"
+            Duration="0:0:5"
+            RepeatBehavior="Forever" />
+        </Storyboard>
+    </UserControl.Resources>
+    <Grid Background="{DynamicResource AppBackgroundBrush}">
+        <StackPanel Margin="32">
+            <!-- Back Arrow -->
+            <StackPanel Orientation="Horizontal"
+                        VerticalAlignment="Top"
+                        Margin="0, 0, 0, 15">
+                <Button Width="16"
+                        Height="16"
+                        Command="{Binding CancelButtonCommand}"
+                        Style="{StaticResource WindowControlButtonStyle}"
+                        AutomationProperties.HelpText="Back to home">
+                    <Path Data="M16,8 L4,8 M4,8 L8,4 M4,8 L8,12" 
+                          Stroke="{DynamicResource PrimaryTextBrush}" 
+                          StrokeThickness="1.5" 
+                          Stretch="None" 
+                          VerticalAlignment="Center" 
+                          HorizontalAlignment="Center"/>
+                </Button>
+            </StackPanel>
+
+            <!-- Title -->
+            <TextBlock Text="{x:Static strings:Msixvc2Upload.TitleText}"
+                       d:Text="Upload Loose Files (PC only)"
+                       Style="{StaticResource Headline}"
+                       Foreground="{DynamicResource PrimaryTextBrush}"
+                       HorizontalAlignment="Left"/>
+            <TextBlock Text="{x:Static strings:Msixvc2Upload.SubtitleText}"
+                       d:Text="Point to your loose file directory for your PC game containing a MicrosoftGame.config and we will package and upload using the MSIXVC2 format."
+                       HorizontalAlignment="Left"
+                       Foreground="{DynamicResource PrimaryTextBrush}"
+                       TextWrapping="Wrap"
+                       Margin="0,5,0,20"/>
+
+            <!-- Main Grid: 4 columns, 2 rows -->
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="30" />
+                    <ColumnDefinition Width="607"/>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="468" />
+                </Grid.ColumnDefinitions>
+
+                <!-- ============================================ -->
+                <!-- Step 1 — Build location                      -->
+                <!-- ============================================ -->
+                <StackPanel Grid.Row="0"
+                            Grid.Column="0"
+                            Orientation="Horizontal">
+                    <Border Width="24"
+                            Height="24"
+                            CornerRadius="12"
+                            VerticalAlignment="Top"
+                            Padding="2"
+                            BorderBrush="{DynamicResource LightPurplishBlueBrush}"
+                            BorderThickness="1">
+                        <TextBlock Text="1" Foreground="{DynamicResource LightPurplishBlueBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold"/>
+                    </Border>
+                </StackPanel>
+                <StackPanel Grid.Row="0"
+                            Grid.Column="1"
+                            Orientation="Vertical">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="476"/>
+                            <ColumnDefinition Width="12" />
+                            <ColumnDefinition Width="96"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Grid.Row="0" Grid.Column="0"
+                                   Text="{x:Static strings:Msixvc2Upload.BuildLocationTitle}"
+                                   d:Text="Build location"
+                                   Style="{StaticResource SubHeadline}"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"
+                                   HorizontalAlignment="Left"
+                                   Margin="0,0,0,5"/>
+                        <TextBlock Grid.Row="1" Grid.ColumnSpan="2"
+                                   Text="{x:Static strings:Msixvc2Upload.BuildLocationText}"
+                                   d:Text="Locate your loose file directory containing a MicrosoftGame.config. Add a layout file under Additional Details."
+                                   HorizontalAlignment="Left"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"
+                                   TextWrapping="Wrap"
+                                   Margin="0,0,0,10"/>
+                        <TextBlock Grid.Row="2" Grid.Column="0"
+                                   Text="{x:Static strings:Msixvc2Upload.ContentPathTitleText}"
+                                   d:Text="Content path"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"
+                                   HorizontalAlignment="Left"
+                                   Margin="0,0,0,5"/>
+                        <TextBlock Grid.Row="2" Grid.Column="0"
+                                   Text="{x:Static strings:Msixvc2Upload.RequiredText}"
+                                   d:Text="Required"
+                                   Foreground="{DynamicResource SecondaryTextBrush}"
+                                   HorizontalAlignment="Right"
+                                   Margin="0,0,0,5"/>
+                        <TextBox Grid.Row="3" Grid.Column="0"
+                                 x:Name="ContentPathTextBox"
+                                 AutomationProperties.HelpText="Path to content directory"
+                                 Text="{Binding ContentPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                 Foreground="{DynamicResource PrimaryTextBrush}"
+                                 Background="{DynamicResource SecondaryButtonBrush}"
+                                 Margin="0,0,0,10">
+                            <TextBox.Style>
+                                <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate TargetType="TextBox">
+                                                <Border x:Name="Border"
+                                                        Background="{TemplateBinding Background}" 
+                                                        BorderBrush="{TemplateBinding BorderBrush}" 
+                                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                                        CornerRadius="6">
+                                                    <Grid>
+                                                        <TextBlock Text="{x:Static strings:Msixvc2Upload.ContentPathBoxDefaultText}"
+                                                                   d:Text="Select or enter the content directory" 
+                                                                   Foreground="{DynamicResource SecondaryTextBrush}" 
+                                                                   VerticalAlignment="Center"
+                                                                   Visibility="{Binding Text.IsEmpty, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" 
+                                                                   Margin="15,2"/>
+                                                        <ScrollViewer x:Name="PART_ContentHost" 
+                                                                      Margin="5,2" 
+                                                                      VerticalAlignment="Center"/>
+                                                    </Grid>
+                                                </Border>
+                                                <ControlTemplate.Triggers>
+                                                    <Trigger Property="IsFocused" Value="True">
+                                                        <Setter TargetName="Border" Property="Background" Value="{DynamicResource TextEntryHighlightedBackgroundBrush}" />
+                                                    </Trigger>
+                                                    <DataTrigger Binding="{Binding ContentPathError, Converter={StaticResource StringNotEmptyToVisibilityConverter}}" Value="Visible">
+                                                        <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource ErrorRedBrush}" />
+                                                    </DataTrigger>
+                                                </ControlTemplate.Triggers>
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
+                            </TextBox.Style>
+                        </TextBox>
+                        <Button Grid.Row="3" Grid.Column="2"
+                                Content="{x:Static strings:Msixvc2Upload.BrowseText}"
+                                d:Content="Browse"
+                                AutomationProperties.HelpText="{x:Static strings:Msixvc2Upload.BrowseContentPathHelpText}"
+                                Command="{Binding BrowseContentPathCommand}"
+                                IsEnabled="True"
+                                Width="90"
+                                Height="32"
+                                Margin="0,0,0,10"/>
+                        <StackPanel Grid.Row="4" Grid.Column="0"
+                                    Orientation="Horizontal"
+                                    HorizontalAlignment="Left"
+                                    Visibility="{Binding ContentPathError, Converter={StaticResource StringNotEmptyToVisibilityConverter}}">
+                            <Image Source="/Resources/AppIcon/ErrorIcon.png"
+                                   Width="16" Height="16"
+                                   VerticalAlignment="Top"
+                                   Margin="0,0,5,0"/>
+                            <TextBlock Text="{Binding ContentPathError}"
+                                       Foreground="{DynamicResource PrimaryTextBrush}"
+                                       HorizontalAlignment="Left"
+                                       TextWrapping="Wrap"/>
+                        </StackPanel>
+                    </Grid>
+
+                    <!-- Additional Details Expander -->
+                    <Expander Style="{StaticResource CustomExpanderStyle}"
+                              Margin="0,10,0,20"
+                              IsExpanded="{Binding IsAdditionalDetailsExpanded, Mode=TwoWay}">
+                        <Expander.Header>
+                            <TextBlock Text="{x:Static strings:Msixvc2Upload.AdditionalDetailsTitle}"
+                                       d:Text="Additional details"
+                                       Foreground="{DynamicResource PrimaryTextBrush}"/>
+                        </Expander.Header>
+                        <Grid Margin="0,10,0,0">
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="476"/>
+                                <ColumnDefinition Width="96" />
+                            </Grid.ColumnDefinitions>
+
+                            <!-- Layout file/content map -->
+                            <TextBlock Grid.Row="0" Grid.Column="0"
+                                       Text="{x:Static strings:Msixvc2Upload.LayoutFileMapTitle}"
+                                       d:Text="Layout file/content map"
+                                       Foreground="{DynamicResource PrimaryTextBrush}"
+                                       HorizontalAlignment="Left"
+                                       Margin="0,0,0,5"/>
+                            <TextBlock Grid.Row="0" Grid.Column="0"
+                                       Text="{x:Static strings:Msixvc2Upload.OptionalText}"
+                                       d:Text="Optional"
+                                       Foreground="{DynamicResource SecondaryTextBrush}"
+                                       HorizontalAlignment="Right"
+                                       Margin="0,0,10,5"/>
+                            <TextBox Grid.Row="1" Grid.Column="0"
+                                     x:Name="MappingDataTextBox"
+                                     AutomationProperties.HelpText="Path to layout file"
+                                     Text="{Binding MappingDataXmlPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                     Foreground="{DynamicResource PrimaryTextBrush}"
+                                     Background="{DynamicResource SecondaryButtonBrush}"
+                                     Margin="0,0,10,10">
+                                <TextBox.Style>
+                                    <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="TextBox">
+                                                    <Border x:Name="Border"
+                                                            Background="{TemplateBinding Background}" 
+                                                            BorderBrush="{TemplateBinding BorderBrush}" 
+                                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                                            CornerRadius="6">
+                                                        <Grid>
+                                                            <TextBlock Text="{x:Static strings:Msixvc2Upload.ContentMapPathBoxDefaultText}"
+                                                                       d:Text="Select or enter the content map location" 
+                                                                       Foreground="{DynamicResource SecondaryTextBrush}" 
+                                                                       VerticalAlignment="Center"
+                                                                       Visibility="{Binding Text.IsEmpty, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" 
+                                                                       Margin="15,2"/>
+                                                            <ScrollViewer x:Name="PART_ContentHost" 
+                                                                          Margin="5,2" 
+                                                                          VerticalAlignment="Center"/>
+                                                        </Grid>
+                                                    </Border>
+                                                    <ControlTemplate.Triggers>
+                                                        <Trigger Property="IsFocused" Value="True">
+                                                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource TextEntryHighlightedBackgroundBrush}" />
+                                                        </Trigger>
+                                                    </ControlTemplate.Triggers>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </TextBox.Style>
+                            </TextBox>
+                            <Button Grid.Row="1" Grid.Column="1"
+                                    Content="{x:Static strings:Msixvc2Upload.BrowseText}"
+                                    d:Content="Browse"
+                                    AutomationProperties.HelpText="Browse to layout file"
+                                    Command="{Binding BrowseMappingDataXmlPathCommand}"
+                                    IsEnabled="True"
+                                    Width="90"
+                                    Height="32"
+                                    Margin="0,0,0,10"/>
+
+                            <!-- Validator path -->
+                            <TextBlock Grid.Row="2" Grid.Column="0"
+                                       Text="{x:Static strings:Msixvc2Upload.ValidatorPathTitleText}"
+                                       d:Text="Folder path for SubmissionValidator.dll"
+                                       Foreground="{DynamicResource PrimaryTextBrush}"
+                                       HorizontalAlignment="Left"
+                                       Margin="0,0,0,5"/>
+                            <TextBlock Grid.Row="2" Grid.Column="0"
+                                       Text="{x:Static strings:Msixvc2Upload.OptionalText}"
+                                       d:Text="Optional"
+                                       Foreground="{DynamicResource SecondaryTextBrush}"
+                                       HorizontalAlignment="Right"
+                                       Margin="0,0,10,5"/>
+                            <TextBox Grid.Row="3" Grid.Column="0"
+                                     x:Name="SubValPathTextBox"
+                                     AutomationProperties.HelpText="Submission Validator folder path"
+                                     Text="{Binding SubValPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                     Foreground="{DynamicResource PrimaryTextBrush}"
+                                     Background="{DynamicResource SecondaryButtonBrush}"
+                                     Margin="0,0,10,0">
+                                <TextBox.Style>
+                                    <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="TextBox">
+                                                    <Border x:Name="Border"
+                                                            Background="{TemplateBinding Background}" 
+                                                            BorderBrush="{TemplateBinding BorderBrush}" 
+                                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                                            CornerRadius="6">
+                                                        <Grid>
+                                                            <TextBlock Text="{x:Static strings:Msixvc2Upload.ValidatorPathBoxDefaultText}"
+                                                                       d:Text="Select or enter the folder path for SubmissionValidator.dll" 
+                                                                       Foreground="{DynamicResource SecondaryTextBrush}"
+                                                                       VerticalAlignment="Center"
+                                                                       Visibility="{Binding Text.IsEmpty, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" 
+                                                                       Margin="15,2"/>
+                                                            <ScrollViewer x:Name="PART_ContentHost" 
+                                                                          Margin="5,2" 
+                                                                          VerticalAlignment="Center"/>
+                                                        </Grid>
+                                                    </Border>
+                                                    <ControlTemplate.Triggers>
+                                                        <Trigger Property="IsFocused" Value="True">
+                                                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource TextEntryHighlightedBackgroundBrush}" />
+                                                        </Trigger>
+                                                    </ControlTemplate.Triggers>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </TextBox.Style>
+                            </TextBox>
+                            <Button Grid.Row="3" Grid.Column="1"
+                                    Content="{x:Static strings:Msixvc2Upload.BrowseText}"
+                                    d:Content="Browse"
+                                    AutomationProperties.HelpText="Browse to Submission Validator folder path"
+                                    Command="{Binding BrowseSubValPathCommand}"
+                                    Width="90"
+                                    Height="32"/>
+                        </Grid>
+                    </Expander>
+                </StackPanel>
+
+                <!-- ============================================ -->
+                <!-- Step 2 — Destination                         -->
+                <!-- ============================================ -->
+                <StackPanel Grid.Row="1"
+                            Grid.Column="0"
+                            Orientation="Horizontal">
+                    <Border Width="24"
+                            Height="24"
+                            CornerRadius="12"
+                            VerticalAlignment="Top"
+                            Padding="2"
+                            BorderBrush="{DynamicResource LightPurplishBlueBrush}"
+                            BorderThickness="1">
+                        <TextBlock Text="2" Foreground="{DynamicResource LightPurplishBlueBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold"/>
+                    </Border>
+                </StackPanel>
+                <StackPanel Grid.Row="1"
+                            Grid.Column="1"
+                            Orientation="Vertical">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="476"/>
+                            <ColumnDefinition Width="12" />
+                            <ColumnDefinition Width="96"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Grid.Row="0" Grid.Column="0"
+                                   Text="{x:Static strings:Msixvc2Upload.DestinationTitleText}"
+                                   d:Text="Destination"
+                                   Style="{StaticResource SubHeadline}"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"
+                                   HorizontalAlignment="Left"
+                                   Margin="0,0,0,5"/>
+                        <TextBlock Grid.Row="1" Grid.ColumnSpan="2"
+                                   Text="{x:Static strings:Msixvc2Upload.DestinationSubtitleText}"
+                                   d:Text="Select a destination and market for the package upload."
+                                   HorizontalAlignment="Left"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"
+                                   TextWrapping="Wrap"
+                                   Margin="0,0,0,10"/>
+                        <!-- Destination combo -->
+                        <TextBlock Grid.Row="2" Grid.Column="0"
+                                   Text="{x:Static strings:Msixvc2Upload.DestinationTitleText}"
+                                   d:Text="Destination"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"
+                                   HorizontalAlignment="Left"
+                                   Margin="0,0,0,5"/>
+                        <TextBlock Grid.Row="2" Grid.Column="0"
+                                   Text="{x:Static strings:Msixvc2Upload.RequiredText}"
+                                   d:Text="Required"
+                                   Foreground="{DynamicResource SecondaryTextBrush}"
+                                   HorizontalAlignment="Right"
+                                   Margin="0,0,0,5"/>
+                        <ComboBox Grid.Row="3" Grid.Column="0"
+                                  AutomationProperties.Name="Destination"
+                                  AutomationProperties.HelpText="Choose branch or flight"
+                                  x:Name="flightName"
+                                  ItemsSource="{Binding BranchAndFlightNames, Mode=OneWay}"
+                                  SelectedItem="{Binding BranchOrFlightDisplayName, Mode=TwoWay}"
+                                  IsEnabled="{Binding IsLoadingBranchesAndFlights, Converter={StaticResource InverseBooleanConverter}}"
+                                  Style="{StaticResource CustomComboBoxStyle}"
+                                  IsTabStop="True"
+                                  TabIndex="1" />
+                        <Border Grid.Row="3" Grid.Column="0"
+                                BorderBrush="{DynamicResource ErrorRedBrush}"
+                                CornerRadius="6"
+                                BorderThickness="1"
+                                Visibility="{Binding BranchOrFlightErrorMessage, Converter={StaticResource StringNotEmptyToVisibilityConverter}}" />
+                        <StackPanel Grid.Row="3" Grid.Column="2"
+                                    HorizontalAlignment="Left"
+                                    Width="16" Height="16">
+                            <Image Source="/Resources/AppIcon/Settings.png"
+                                   Visibility="{Binding IsLoadingBranchesAndFlights, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <Image.RenderTransform>
+                                    <RotateTransform CenterX="8" CenterY="8" />
+                                </Image.RenderTransform>
+                                <Image.Triggers>
+                                    <EventTrigger RoutedEvent="Image.Loaded">
+                                        <BeginStoryboard Storyboard="{StaticResource RotateAnimation}" />
+                                    </EventTrigger>
+                                </Image.Triggers>
+                            </Image>
+                        </StackPanel>
+                        <StackPanel Grid.Row="4" Grid.Column="0"
+                                    Margin="0, 5, 0, 0"
+                                    Orientation="Horizontal"
+                                    HorizontalAlignment="Left"
+                                    Visibility="{Binding BranchOrFlightErrorMessage, Converter={StaticResource StringNotEmptyToVisibilityConverter}}">
+                            <Image Source="/Resources/AppIcon/ErrorIcon.png"
+                                   Width="16" Height="16"
+                                   VerticalAlignment="Top"
+                                   Margin="0,0,5,0"/>
+                            <TextBlock Text="{Binding BranchOrFlightErrorMessage}"
+                                       Foreground="{DynamicResource PrimaryTextBrush}"
+                                       Width="450"
+                                       HorizontalAlignment="Left"
+                                       TextWrapping="Wrap"/>
+                        </StackPanel>
+                        <!-- Market combo -->
+                        <TextBlock Grid.Row="5" Grid.Column="0"
+                                   Text="{x:Static strings:Msixvc2Upload.MarketTitleText}"
+                                   d:Text="Market"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"
+                                   HorizontalAlignment="Left"
+                                   Margin="0,10,0,5"/>
+                        <TextBlock Grid.Row="5" Grid.Column="0"
+                                   Text="{x:Static strings:Msixvc2Upload.RequiredText}"
+                                   d:Text="Required"
+                                   Foreground="{DynamicResource SecondaryTextBrush}"
+                                   HorizontalAlignment="Right"
+                                   Margin="0,10,0,5"/>
+                        <ComboBox Grid.Row="6" Grid.Column="0"
+                                  x:Name="marketName"
+                                  AutomationProperties.Name="Market"
+                                  AutomationProperties.HelpText="Choose market"
+                                  ItemsSource="{Binding MarketGroupNames, Mode=OneWay}"
+                                  SelectedItem="{Binding MarketGroupName, Mode=TwoWay}"
+                                  Style="{StaticResource CustomComboBoxStyle}"
+                                  IsTabStop="True"
+                                  TabIndex="2">
+                            <ComboBox.IsEnabled>
+                                <MultiBinding Converter="{StaticResource BooleanAndConverter}">
+                                    <Binding Path="IsLoadingMarkets" Converter="{StaticResource InverseBooleanConverter}"/>
+                                    <Binding Path="IsLoadingBranchesAndFlights" Converter="{StaticResource InverseBooleanConverter}"/>
+                                </MultiBinding>
+                            </ComboBox.IsEnabled>
+                        </ComboBox>
+                        <Border Grid.Row="6" Grid.Column="0"
+                                BorderBrush="{DynamicResource ErrorRedBrush}"
+                                CornerRadius="6"
+                                BorderThickness="1"
+                                Visibility="{Binding MarketGroupErrorMessage, Converter={StaticResource StringNotEmptyToVisibilityConverter}}" />
+                        <StackPanel Grid.Row="6" Grid.Column="2"
+                                    HorizontalAlignment="Left"
+                                    Width="16" Height="16">
+                            <Image Source="/Resources/AppIcon/Settings.png"
+                                   Visibility="{Binding IsLoadingMarkets, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <Image.RenderTransform>
+                                    <RotateTransform CenterX="8" CenterY="8" />
+                                </Image.RenderTransform>
+                                <Image.Triggers>
+                                    <EventTrigger RoutedEvent="Image.Loaded">
+                                        <BeginStoryboard Storyboard="{StaticResource RotateAnimation}" />
+                                    </EventTrigger>
+                                </Image.Triggers>
+                            </Image>
+                        </StackPanel>
+                        <StackPanel Grid.Row="7" Grid.Column="0"
+                                    Margin="0, 5, 0, 0"
+                                    Orientation="Horizontal"
+                                    HorizontalAlignment="Left"
+                                    Visibility="{Binding MarketGroupErrorMessage, Converter={StaticResource StringNotEmptyToVisibilityConverter}}">
+                            <Image Source="/Resources/AppIcon/ErrorIcon.png"
+                                   Width="16" Height="16"
+                                   VerticalAlignment="Top"
+                                   Margin="0,0,5,0"/>
+                            <TextBlock Text="{Binding MarketGroupErrorMessage}"
+                                       Foreground="{DynamicResource PrimaryTextBrush}"
+                                       Width="450"
+                                       HorizontalAlignment="Left"
+                                       TextWrapping="Wrap"/>
+                        </StackPanel>
+                    </Grid>
+                </StackPanel>
+
+                <!-- ============================================ -->
+                <!-- Vertical divider                             -->
+                <!-- ============================================ -->
+                <Rectangle Grid.Column="2" Grid.RowSpan="2" Width="1" Fill="{DynamicResource BorderBrush}" Margin="10,0" />
+
+                <!-- ============================================ -->
+                <!-- Upload Preview (right panel)                 -->
+                <!-- ============================================ -->
+                <StackPanel Grid.Column="3" Grid.Row="0" Grid.RowSpan="2" Margin="10,0,0,0">
+                    <TextBlock Text="{x:Static strings:Msixvc2Upload.UploadPreviewTitleText}"
+                               d:Text="Upload Preview"
+                               Style="{StaticResource SubHeadline}"
+                               Foreground="{DynamicResource PrimaryTextBrush}"
+                               HorizontalAlignment="Left"
+                               Margin="0,0,0,10"/>
+                    <Border BorderBrush="{DynamicResource BorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="6"
+                            Padding="6"
+                            Margin="0, 20, 0, 0"
+                            Visibility="{Binding ProductName, Converter={StaticResource StringNotEmptyToVisibilityConverter}}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <Image Grid.Row="0"
+                                   Grid.Column="0"
+                                   Grid.RowSpan="4"
+                                   Source="{Binding PackagePreviewImage}"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   Height="65"
+                                   Width="65"
+                                   Margin="0,0,10,0"/>
+                            <!-- Product name -->
+                            <StackPanel Grid.Row="0"
+                                        Grid.Column="1"
+                                        Orientation="Vertical"
+                                        HorizontalAlignment="Left"
+                                        Margin="0, 0, 0, 10">
+                                <TextBlock Text="{x:Static strings:Msixvc2Upload.ProductNameText}"
+                                           d:Text="Product name"
+                                           Foreground="{DynamicResource SecondaryTextBrush}"/>
+                                <TextBlock Text="{Binding ProductName}"
+                                           Foreground="{DynamicResource PrimaryTextBrush}"/>
+                            </StackPanel>
+                            <!-- Destination + Market -->
+                            <Grid Grid.Row="1" Grid.Column="1" Margin="0,0,0,15">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="50*" />
+                                    <ColumnDefinition Width="50*" />
+                                </Grid.ColumnDefinitions>
+                                <StackPanel Grid.Column="0" Orientation="Vertical" HorizontalAlignment="Left">
+                                    <TextBlock Text="{x:Static strings:Msixvc2Upload.DestinationTitleText}"
+                                               d:Text="Destination"
+                                               Foreground="{DynamicResource SecondaryTextBrush}"/>
+                                    <TextBlock Text="{Binding BranchOrFlightDisplayName}" 
+                                               Foreground="{DynamicResource PrimaryTextBrush}"/>
+                                </StackPanel>
+                                <StackPanel Grid.Column="1" Orientation="Vertical" HorizontalAlignment="Left">
+                                    <TextBlock Text="{x:Static strings:Msixvc2Upload.MarketTitleText}"
+                                               d:Text="Market"
+                                               Foreground="{DynamicResource SecondaryTextBrush}"/>
+                                    <TextBlock Text="{Binding MarketGroupName}" 
+                                               Foreground="{DynamicResource PrimaryTextBrush}"/>
+                                </StackPanel>
+                            </Grid>
+                            <!-- Package Identity name -->
+                            <StackPanel Grid.Row="2"
+                                        Grid.Column="1"
+                                        Orientation="Vertical" 
+                                        HorizontalAlignment="Left"
+                                        Margin="0,0,0,10">
+                                <TextBlock Text="{x:Static strings:Msixvc2Upload.PackageIdentityNameTitleText}"
+                                           d:Text="Package Identity name"
+                                           Foreground="{DynamicResource SecondaryTextBrush}"/>
+                                <TextBlock Text="{Binding PackageIdentityName}"
+                                           Foreground="{DynamicResource PrimaryTextBrush}"
+                                           TextWrapping="Wrap"/>
+                            </StackPanel>
+                            <!-- Store ID, Folder size, Family -->
+                            <Grid Grid.Row="3" Grid.Column="1">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="33*" />
+                                    <ColumnDefinition Width="33*" />
+                                    <ColumnDefinition Width="33*" />
+                                </Grid.ColumnDefinitions>
+                                <StackPanel Grid.Column="0" Orientation="Vertical" HorizontalAlignment="Left">
+                                    <TextBlock Text="{x:Static strings:Msixvc2Upload.StoreIdTitleText}"
+                                               d:Text="Store ID"
+                                               Foreground="{DynamicResource SecondaryTextBrush}"/>
+                                    <TextBlock Text="{Binding BigId}" 
+                                               Foreground="{DynamicResource PrimaryTextBrush}"/>
+                                </StackPanel>
+                                <StackPanel Grid.Column="1" Orientation="Vertical" HorizontalAlignment="Left">
+                                    <TextBlock Text="{x:Static strings:Msixvc2Upload.FolderSizeTitleText}"
+                                               d:Text="Folder size"
+                                               Foreground="{DynamicResource SecondaryTextBrush}"/>
+                                    <TextBlock Text="{Binding EstimatedFolderSize}" 
+                                               Foreground="{DynamicResource PrimaryTextBrush}"/>
+                                </StackPanel>
+                                <StackPanel Grid.Column="2" Orientation="Vertical" HorizontalAlignment="Left">
+                                    <TextBlock Text="{x:Static strings:Msixvc2Upload.FamilyTitleText}"
+                                               d:Text="Family"
+                                               Foreground="{DynamicResource SecondaryTextBrush}"/>
+                                    <TextBlock Text="{Binding PackageType}" 
+                                               Foreground="{DynamicResource PrimaryTextBrush}"/>
+                                </StackPanel>
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </StackPanel>
+            </Grid>
+
+            <!-- ============================================ -->
+            <!-- Button panel                                 -->
+            <!-- ============================================ -->
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,20,0,0">
+                <Button d:Content="Cancel"
+                        Content="{x:Static strings:Msixvc2Upload.CancelContentText}"
+                        Command="{Binding CancelButtonCommand}"
+                        Width="90"
+                        Height="32"
+                        Margin="0,0,10,0"
+                        AutomationProperties.Name="Cancel Button"
+                        AutomationProperties.HelpText="{x:Static strings:Msixvc2Upload.CancelButtonHelpText}"
+                        TabIndex="3" />
+                <Button d:Content="Upload Package"
+                        Content="{x:Static strings:Msixvc2Upload.UploadButtonContentText}"
+                        Command="{Binding UploadPackageCommand}"
+                        Style="{StaticResource PrimaryButtonStyle}"
+                        Width="133"
+                        Height="34"
+                        AutomationProperties.Name="Upload Package Button"
+                        AutomationProperties.HelpText="{x:Static strings:Msixvc2Upload.UploadButtonHelpText}"
+                        TabIndex="4" />
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/src/PackageUploader.UI/View/Msixvc2UploadView.xaml.cs b/src/PackageUploader.UI/View/Msixvc2UploadView.xaml.cs
new file mode 100644
index 00000000..b99208e1
--- /dev/null
+++ b/src/PackageUploader.UI/View/Msixvc2UploadView.xaml.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using PackageUploader.UI.Utility;
+using PackageUploader.UI.ViewModel;
+
+namespace PackageUploader.UI.View;
+
+public partial class Msixvc2UploadView : System.Windows.Controls.UserControl
+{
+    private readonly Msixvc2UploadViewModel _viewModel;
+
+    public Msixvc2UploadView(Msixvc2UploadViewModel viewModel)
+    {
+        InitializeComponent();
+        DataContext = viewModel;
+        _viewModel = viewModel;
+
+        // Register drag drop event handlers after control is initialized
+        this.Loaded += (s, e) => RegisterDragDropHandlers();
+    }
+
+    private void RegisterDragDropHandlers()
+    {
+        DragDropHelper.RegisterTextBoxDragDrop(ContentPathTextBox, _viewModel.ContentPathDroppedCommand, true);
+        DragDropHelper.RegisterTextBoxDragDrop(MappingDataTextBox, path => _viewModel.MappingDataXmlPath = path, false);
+        DragDropHelper.RegisterTextBoxDragDrop(SubValPathTextBox, path => _viewModel.SubValPath = path, true);
+    }
+}
diff --git a/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs b/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
index 3e55524f..6932b660 100644
--- a/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
@@ -193,7 +193,7 @@ public MainPageViewModel(
 
         NavigateToMsixvc2Command = new RelayCommand(() =>
         {
-            // TODO: Navigate to MSIXVC2 loose file upload view once implemented
+            windowService.NavigateTo(typeof(Msixvc2UploadView));
         });
 
         IsUserLoggedIn = false;
diff --git a/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
new file mode 100644
index 00000000..3359a860
--- /dev/null
+++ b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
@@ -0,0 +1,521 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.IO;
+using System.Windows.Forms;
+using System.Windows.Input;
+using System.Windows.Media.Imaging;
+using System.Xml;
+using Microsoft.Extensions.Logging;
+using PackageUploader.ClientApi;
+using PackageUploader.ClientApi.Client.Ingestion.Models;
+using PackageUploader.UI.Model;
+using PackageUploader.UI.Utility;
+using PackageUploader.UI.View;
+
+namespace PackageUploader.UI.ViewModel;
+
+public partial class Msixvc2UploadViewModel : BaseViewModel
+{
+    private readonly IWindowService _windowService;
+    private readonly IPackageUploaderService _uploaderService;
+    private readonly ILogger<Msixvc2UploadViewModel> _logger;
+
+    private GameProduct? _gameProduct = null;
+    private IReadOnlyCollection<IGamePackageBranch>? _branchesAndFlights = null;
+
+    // Step 1 — Build location
+    private string _contentPath = string.Empty;
+    public string ContentPath
+    {
+        get => _contentPath;
+        set
+        {
+            if (_contentPath != value)
+            {
+                _contentPath = value;
+                OnPropertyChanged(nameof(ContentPath));
+                LoadGameConfigValues();
+                EstimateFolderSize();
+            }
+        }
+    }
+
+    private string _contentPathError = string.Empty;
+    public string ContentPathError
+    {
+        get => _contentPathError;
+        set => SetProperty(ref _contentPathError, value);
+    }
+
+    private bool _isAdditionalDetailsExpanded = false;
+    public bool IsAdditionalDetailsExpanded
+    {
+        get => _isAdditionalDetailsExpanded;
+        set => SetProperty(ref _isAdditionalDetailsExpanded, value);
+    }
+
+    private string _mappingDataXmlPath = string.Empty;
+    public string MappingDataXmlPath
+    {
+        get => _mappingDataXmlPath;
+        set
+        {
+            if (_mappingDataXmlPath != value)
+            {
+                _mappingDataXmlPath = value;
+                OnPropertyChanged(nameof(MappingDataXmlPath));
+                EstimateFolderSize();
+            }
+        }
+    }
+
+    private string _subValPath = string.Empty;
+    public string SubValPath
+    {
+        get => _subValPath;
+        set => SetProperty(ref _subValPath, value);
+    }
+
+    // Step 2 — Destination
+    private string _branchOrFlightDisplayName = string.Empty;
+    public string BranchOrFlightDisplayName
+    {
+        get => _branchOrFlightDisplayName;
+        set
+        {
+            if (SetProperty(ref _branchOrFlightDisplayName, value) && value != null)
+            {
+                UpdateMarketGroups();
+            }
+        }
+    }
+
+    private string[] _branchAndFlightNames = [];
+    public string[] BranchAndFlightNames
+    {
+        get => _branchAndFlightNames;
+        set => SetProperty(ref _branchAndFlightNames, value);
+    }
+
+    private bool _isLoadingBranchesAndFlights = false;
+    public bool IsLoadingBranchesAndFlights
+    {
+        get => _isLoadingBranchesAndFlights;
+        set => SetProperty(ref _isLoadingBranchesAndFlights, value);
+    }
+
+    private string _branchOrFlightErrorMessage = string.Empty;
+    public string BranchOrFlightErrorMessage
+    {
+        get => _branchOrFlightErrorMessage;
+        set => SetProperty(ref _branchOrFlightErrorMessage, value);
+    }
+
+    private string _marketGroupName = string.Empty;
+    public string MarketGroupName
+    {
+        get => _marketGroupName;
+        set => SetProperty(ref _marketGroupName, value);
+    }
+
+    private string[] _marketGroupNames = [];
+    public string[] MarketGroupNames
+    {
+        get => _marketGroupNames;
+        set => SetProperty(ref _marketGroupNames, value);
+    }
+
+    private bool _isLoadingMarkets = false;
+    public bool IsLoadingMarkets
+    {
+        get => _isLoadingMarkets;
+        set => SetProperty(ref _isLoadingMarkets, value);
+    }
+
+    private string _marketGroupErrorMessage = string.Empty;
+    public string MarketGroupErrorMessage
+    {
+        get => _marketGroupErrorMessage;
+        set => SetProperty(ref _marketGroupErrorMessage, value);
+    }
+
+    // Upload preview
+    private string _productName = string.Empty;
+    public string ProductName
+    {
+        get => _productName;
+        set => SetProperty(ref _productName, value);
+    }
+
+    private string _packageIdentityName = string.Empty;
+    public string PackageIdentityName
+    {
+        get => _packageIdentityName;
+        set => SetProperty(ref _packageIdentityName, value);
+    }
+
+    private string _estimatedFolderSize = string.Empty;
+    public string EstimatedFolderSize
+    {
+        get => _estimatedFolderSize;
+        set => SetProperty(ref _estimatedFolderSize, value);
+    }
+
+    private string _bigId = string.Empty;
+    public string BigId
+    {
+        get => _bigId;
+        set => SetProperty(ref _bigId, value);
+    }
+
+    private string _packageType = string.Empty;
+    public string PackageType
+    {
+        get => _packageType;
+        set => SetProperty(ref _packageType, value);
+    }
+
+    private BitmapImage? _packagePreviewImage = null;
+    public BitmapImage? PackagePreviewImage
+    {
+        get => _packagePreviewImage;
+        set => SetProperty(ref _packagePreviewImage, value);
+    }
+
+    // Commands
+    public ICommand BrowseContentPathCommand { get; }
+    public ICommand BrowseMappingDataXmlPathCommand { get; }
+    public ICommand BrowseSubValPathCommand { get; }
+    public ICommand ContentPathDroppedCommand { get; }
+    public ICommand UploadPackageCommand { get; }
+    public ICommand CancelButtonCommand { get; }
+
+    public Msixvc2UploadViewModel(IWindowService windowService,
+                                  IPackageUploaderService uploaderService,
+                                  ILogger<Msixvc2UploadViewModel> logger)
+    {
+        _windowService = windowService;
+        _uploaderService = uploaderService;
+        _logger = logger;
+
+        BrowseContentPathCommand = new RelayCommand(OnBrowseContentPath);
+        BrowseMappingDataXmlPathCommand = new RelayCommand(OnBrowseMappingDataXml);
+        BrowseSubValPathCommand = new RelayCommand(OnBrowseSubValPath);
+        ContentPathDroppedCommand = new RelayCommand<string>(path =>
+        {
+            if (!string.IsNullOrEmpty(path))
+            {
+                ContentPath = path;
+            }
+        });
+        // TODO: Wire actual upload logic
+        UploadPackageCommand = new RelayCommand(() => { });
+        CancelButtonCommand = new RelayCommand(() =>
+        {
+            _windowService.NavigateTo(typeof(MainPageView));
+        });
+    }
+
+    private void OnBrowseContentPath()
+    {
+        var folderDialog = new FolderBrowserDialog();
+        if (folderDialog.ShowDialog() == DialogResult.OK)
+        {
+            ContentPath = folderDialog.SelectedPath;
+        }
+    }
+
+    private void OnBrowseMappingDataXml()
+    {
+        var dialog = new Microsoft.Win32.OpenFileDialog
+        {
+            Filter = "XML files (*.xml)|*.xml|All files (*.*)|*.*",
+            Title = "Select Layout File"
+        };
+
+        if (dialog.ShowDialog() == true)
+        {
+            MappingDataXmlPath = dialog.FileName;
+        }
+    }
+
+    private void OnBrowseSubValPath()
+    {
+        var folderDialog = new FolderBrowserDialog();
+        if (folderDialog.ShowDialog() == DialogResult.OK)
+        {
+            SubValPath = folderDialog.SelectedPath;
+        }
+    }
+
+    private void LoadGameConfigValues()
+    {
+        ContentPathError = string.Empty;
+        ProductName = string.Empty;
+        PackageIdentityName = string.Empty;
+        BigId = string.Empty;
+        PackageType = string.Empty;
+        PackagePreviewImage = null;
+
+        if (string.IsNullOrEmpty(ContentPath) || !Directory.Exists(ContentPath))
+        {
+            return;
+        }
+
+        string gameConfigPath = Path.Combine(ContentPath, "MicrosoftGame.config");
+        if (!File.Exists(gameConfigPath))
+        {
+            ContentPathError = Resources.Strings.PackageCreation.FolderDoesNotContainConfigErrMsg;
+            return;
+        }
+
+        PartialGameConfigModel gameConfig;
+        try
+        {
+            gameConfig = new PartialGameConfigModel(gameConfigPath);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error loading game config.");
+            ContentPathError = Resources.Strings.PackageCreation.MicrosoftGameConfigInvalidErrMsg;
+            return;
+        }
+
+        if (string.IsNullOrEmpty(gameConfig.Identity.Name))
+        {
+            ContentPathError = Resources.Strings.PackageCreation.MsftGameCOnfigLacksValidIdentityErrMsg;
+            return;
+        }
+
+        PackageIdentityName = gameConfig.Identity.Name;
+        ProductName = !string.IsNullOrEmpty(gameConfig.ShellVisuals.DefaultDisplayName)
+            ? gameConfig.ShellVisuals.DefaultDisplayName
+            : gameConfig.Identity.Name;
+        BigId = !string.IsNullOrEmpty(gameConfig.StoreId) ? gameConfig.StoreId : "None";
+
+        if (!string.IsNullOrEmpty(gameConfig.ShellVisuals.Square150x150Logo) &&
+            File.Exists(gameConfig.ShellVisuals.Square150x150Logo))
+        {
+            PackagePreviewImage = LoadBitmapImage(gameConfig.ShellVisuals.Square150x150Logo);
+        }
+
+        try
+        {
+            PackageType = gameConfig.GetDeviceFamily();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error getting device family from game config.");
+            ContentPathError = ex.Message;
+        }
+
+        // Fetch branches/flights from API if we have a valid StoreId
+        if (!string.IsNullOrEmpty(gameConfig.StoreId))
+        {
+            GetProductInfoAsync();
+        }
+    }
+
+    private async void GetProductInfoAsync()
+    {
+        if (string.IsNullOrEmpty(BigId) || BigId == "None")
+        {
+            return;
+        }
+
+        IsLoadingBranchesAndFlights = true;
+        BranchOrFlightErrorMessage = string.Empty;
+
+        try
+        {
+            _gameProduct = await _uploaderService.GetProductByBigIdAsync(BigId, CancellationToken.None);
+
+            if (_gameProduct != null)
+            {
+                ProductName = _gameProduct.ProductName;
+            }
+
+            _branchesAndFlights = await _uploaderService.GetPackageBranchesAsync(_gameProduct, CancellationToken.None);
+
+            List<string> displayNames = [];
+            foreach (var branch in _branchesAndFlights)
+            {
+                if (branch.BranchType == GamePackageBranchType.Branch)
+                    displayNames.Add("Branch: " + branch.Name);
+                else if (branch.BranchType == GamePackageBranchType.Flight)
+                    displayNames.Add("Flight: " + branch.Name);
+            }
+            BranchAndFlightNames = [.. displayNames];
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error getting product info for BigId {BigId}.", BigId);
+            BranchOrFlightErrorMessage = $"Error loading branches: {ex.Message}";
+        }
+        finally
+        {
+            IsLoadingBranchesAndFlights = false;
+        }
+    }
+
+    private async void UpdateMarketGroups()
+    {
+        if (_branchesAndFlights == null)
+        {
+            return;
+        }
+
+        IsLoadingMarkets = true;
+        MarketGroupErrorMessage = string.Empty;
+
+        try
+        {
+            IGamePackageBranch? branchOrFlight = GetBranchOrFlightFromUISelection();
+
+            if (branchOrFlight != null)
+            {
+                var config = await _uploaderService.GetPackageConfigurationAsync(
+                    _gameProduct, branchOrFlight, CancellationToken.None);
+
+                List<string> marketNames = [];
+                foreach (var market in config.MarketGroupPackages)
+                {
+                    marketNames.Add(market.Name);
+                }
+                MarketGroupNames = [.. marketNames];
+                MarketGroupName = MarketGroupNames.FirstOrDefault(string.Empty);
+            }
+            else
+            {
+                MarketGroupNames = [];
+                MarketGroupName = string.Empty;
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error loading market groups.");
+            MarketGroupErrorMessage = $"Error loading market groups: {ex.Message}";
+        }
+        finally
+        {
+            IsLoadingMarkets = false;
+        }
+    }
+
+    private IGamePackageBranch? GetBranchOrFlightFromUISelection()
+    {
+        if (_branchesAndFlights == null || string.IsNullOrEmpty(BranchOrFlightDisplayName))
+        {
+            return null;
+        }
+
+        return _branchesAndFlights.FirstOrDefault(x =>
+        {
+            bool isBranch = BranchOrFlightDisplayName.StartsWith("Branch: ");
+            var name = BranchOrFlightDisplayName[(BranchOrFlightDisplayName.IndexOf(':') + 2)..];
+            return x.Name == name &&
+                   x.BranchType == (isBranch ? GamePackageBranchType.Branch : GamePackageBranchType.Flight);
+        });
+    }
+
+    private void EstimateFolderSize()
+    {
+        if (string.IsNullOrEmpty(ContentPath) || !Directory.Exists(ContentPath))
+        {
+            EstimatedFolderSize = string.Empty;
+            return;
+        }
+
+        try
+        {
+            long sizeInBytes;
+            if (!string.IsNullOrEmpty(MappingDataXmlPath) && File.Exists(MappingDataXmlPath))
+            {
+                sizeInBytes = ParseLayoutFileForFileSize(MappingDataXmlPath);
+            }
+            else
+            {
+                sizeInBytes = GetDirectorySizeInBytes(ContentPath);
+            }
+
+            double sizeInGB = sizeInBytes / (1024.0 * 1024.0 * 1024.0);
+            EstimatedFolderSize = sizeInGB < 1 ? "< 1 GB" : $"{sizeInGB:F2} GB";
+        }
+        catch (Exception ex)
+        {
+            EstimatedFolderSize = "Unknown";
+            _logger.LogError(ex, "Error calculating folder size.");
+        }
+    }
+
+    private static long GetDirectorySizeInBytes(string path)
+    {
+        long size = 0;
+        DirectoryInfo dirInfo = new(path);
+        FileInfo[] files = dirInfo.GetFiles("*", SearchOption.AllDirectories);
+        foreach (FileInfo file in files)
+        {
+            size += file.Length;
+        }
+        return size;
+    }
+
+    private long ParseLayoutFileForFileSize(string mappingDataXmlPath)
+    {
+        try
+        {
+            XmlDocument xmlDoc = new();
+            xmlDoc.Load(mappingDataXmlPath);
+
+            XmlNodeList? fileGroups = xmlDoc.SelectNodes("//FileGroup");
+            if (fileGroups == null || fileGroups.Count == 0)
+            {
+                return 0;
+            }
+
+            long totalSize = 0;
+            HashSet<string> processedFiles = new(StringComparer.OrdinalIgnoreCase);
+
+            foreach (XmlNode fileGroup in fileGroups)
+            {
+                string? sourcePath = fileGroup.Attributes?["SourcePath"]?.Value;
+                string? include = fileGroup.Attributes?["Include"]?.Value;
+
+                if (string.IsNullOrEmpty(sourcePath) || string.IsNullOrEmpty(include))
+                {
+                    continue;
+                }
+
+                string fullPath = Path.Combine(sourcePath, include);
+                if (!processedFiles.Add(fullPath))
+                {
+                    continue;
+                }
+
+                if (File.Exists(fullPath))
+                {
+                    totalSize += new FileInfo(fullPath).Length;
+                }
+            }
+
+            return totalSize;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error parsing layout file for size.");
+            return GetDirectorySizeInBytes(ContentPath);
+        }
+    }
+
+    private static BitmapImage LoadBitmapImage(string imagePath)
+    {
+        var image = new BitmapImage();
+        image.BeginInit();
+        image.CacheOption = BitmapCacheOption.OnLoad;
+        image.UriSource = new Uri(imagePath);
+        image.EndInit();
+        image.Freeze();
+        return image;
+    }
+}

From 94aad8208fb42770a6854ef8c1ef02c780966661 Mon Sep 17 00:00:00 2001
From: Elshiekh Ahmed <elahmed@microsoft.com>
Date: Tue, 10 Mar 2026 12:49:16 -0700
Subject: [PATCH 03/10] Move Upload a Loose File card below other two files to
 allow spcae for Stub package card

---
 src/PackageUploader.UI/View/MainPageView.xaml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/PackageUploader.UI/View/MainPageView.xaml b/src/PackageUploader.UI/View/MainPageView.xaml
index 5a86bc17..99fe8164 100644
--- a/src/PackageUploader.UI/View/MainPageView.xaml
+++ b/src/PackageUploader.UI/View/MainPageView.xaml
@@ -35,17 +35,17 @@
                 <RowDefinition />
                 <RowDefinition Height="0.2*"/>
                 <RowDefinition />
+                <RowDefinition Height="0.05*"/>
+                <RowDefinition />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition Width="0.05*"/>
                 <ColumnDefinition />
-                <ColumnDefinition Width="0.05*"/>
-                <ColumnDefinition />
             </Grid.ColumnDefinitions>
             
             <Border Grid.Row="0" 
-                    Grid.ColumnSpan="5"
+                    Grid.ColumnSpan="3"
                     BorderBrush="{DynamicResource BorderBrush}"
                     Background="{DynamicResource AppBackgroundBrush}"
                     Margin="0, 0, 0, 20"
@@ -117,6 +117,7 @@
             <Border Grid.Column="0"
                     Grid.Row="2"
                     Background="{DynamicResource AppBackgroundBrush}"
+                    Margin="0, 0, 0, 20"
                     Padding="10"
                     CornerRadius="5">
                 <StackPanel HorizontalAlignment="Left"
@@ -157,6 +158,7 @@
             <Border Grid.Column="2"
                     Grid.Row="2"
                     Background="{DynamicResource AppBackgroundBrush}"
+                    Margin="0, 0, 0, 20"
                     Padding="10"
                     CornerRadius="5">
                 <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center">
@@ -181,8 +183,8 @@
                 </StackPanel>
             </Border>
 
-            <Border Grid.Column="4"
-                    Grid.Row="2"
+            <Border Grid.Column="0"
+                    Grid.Row="4"
                     Background="{DynamicResource AppBackgroundBrush}"
                     Padding="10"
                     CornerRadius="5">

From 81757122f59d6ed54b91b1d8a5c79669a3b550aa Mon Sep 17 00:00:00 2001
From: Elshiekh Ahmed <elahmed@microsoft.com>
Date: Mon, 16 Mar 2026 14:01:05 -0700
Subject: [PATCH 04/10] Initial uploading loose file complete

---
 .../ViewModel/Msixvc2UploadViewModelTest.cs   | 235 ++++++++++++++
 .../Providers/PathConfigurationProvider.cs    |  14 +
 .../View/Msixvc2UploadView.xaml               |  14 +
 .../ViewModel/MainPageViewModel.cs            |  54 ++++
 .../ViewModel/Msixvc2UploadViewModel.cs       | 287 +++++++++++++++++-
 .../ViewModel/UploadingFinishedViewModel.cs   |  15 +-
 6 files changed, 610 insertions(+), 9 deletions(-)
 create mode 100644 src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs

diff --git a/src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs b/src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs
new file mode 100644
index 00000000..6172d06e
--- /dev/null
+++ b/src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs
@@ -0,0 +1,235 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.Extensions.Logging;
+using Moq;
+using PackageUploader.ClientApi;
+using PackageUploader.UI.Providers;
+using PackageUploader.UI.Utility;
+using PackageUploader.UI.View;
+using PackageUploader.UI.ViewModel;
+
+namespace PackageUploader.UI.Test.ViewModel;
+
+[TestClass]
+public class Msixvc2UploadViewModelTest
+{
+    private Mock<IWindowService> _mockWindowService;
+    private Mock<IPackageUploaderService> _mockUploaderService;
+    private Mock<ILogger<Msixvc2UploadViewModel>> _mockLogger;
+    private ErrorModelProvider _errorModelProvider;
+    private PathConfigurationProvider _pathConfigurationProvider;
+    private PackageModelProvider _packageModelProvider;
+
+    private Msixvc2UploadViewModel _viewModel;
+
+    [TestInitialize]
+    public void Setup()
+    {
+        _mockWindowService = new Mock<IWindowService>();
+        _mockUploaderService = new Mock<IPackageUploaderService>();
+        _mockLogger = new Mock<ILogger<Msixvc2UploadViewModel>>();
+        _errorModelProvider = new ErrorModelProvider();
+        _pathConfigurationProvider = new PathConfigurationProvider();
+        _packageModelProvider = new PackageModelProvider();
+
+        _viewModel = new Msixvc2UploadViewModel(
+            _mockWindowService.Object,
+            _mockUploaderService.Object,
+            _mockLogger.Object,
+            _errorModelProvider,
+            _pathConfigurationProvider,
+            _packageModelProvider
+        );
+    }
+
+    #region Constructor & Property initialization
+
+    [TestMethod]
+    public void Constructor_InitializesProperties()
+    {
+        Assert.AreEqual(string.Empty, _viewModel.ContentPath);
+        Assert.AreEqual(string.Empty, _viewModel.StatusMessage);
+        Assert.AreEqual(0, _viewModel.ProgressValue);
+        Assert.IsFalse(_viewModel.IsOperationInProgress);
+        Assert.IsNotNull(_viewModel.UploadPackageCommand);
+        Assert.IsNotNull(_viewModel.CancelButtonCommand);
+        Assert.IsNotNull(_viewModel.BrowseContentPathCommand);
+    }
+
+    [TestMethod]
+    public void IsOperationInProgress_SetAndGet()
+    {
+        _viewModel.IsOperationInProgress = true;
+        Assert.IsTrue(_viewModel.IsOperationInProgress);
+
+        _viewModel.IsOperationInProgress = false;
+        Assert.IsFalse(_viewModel.IsOperationInProgress);
+    }
+
+    [TestMethod]
+    public void StatusMessage_SetAndGet()
+    {
+        _viewModel.StatusMessage = "Packaging...";
+        Assert.AreEqual("Packaging...", _viewModel.StatusMessage);
+    }
+
+    [TestMethod]
+    public void ProgressValue_SetAndGet()
+    {
+        _viewModel.ProgressValue = 50;
+        Assert.AreEqual(50, _viewModel.ProgressValue);
+    }
+    #endregion
+
+    #region BuildUploadArguments Tests
+
+    [TestMethod]
+    public void BuildUploadArguments_WithBranch()
+    {
+        _viewModel.ContentPath = @"C:\game\content";
+        _viewModel.BranchOrFlightDisplayName = "Branch: Main";
+        _viewModel.MarketGroupName = "default";
+        _viewModel.BigId = "9ABC123DEF456";
+
+        string args = _viewModel.BuildUploadArguments();
+
+        Assert.IsTrue(args.StartsWith("upload /d \"C:\\game\\content\" /msixvc2"));
+        Assert.IsTrue(args.Contains("/branch \"Main\""));
+        Assert.IsFalse(args.Contains("/flight"));
+        Assert.IsTrue(args.Contains("/market \"default\""));
+        Assert.IsTrue(args.Contains("/storeid \"9ABC123DEF456\""));
+        Assert.IsTrue(args.Contains("/auth Browser"));
+    }
+
+    [TestMethod]
+    public void BuildUploadArguments_WithFlight()
+    {
+        _viewModel.ContentPath = @"C:\game\content";
+        _viewModel.BranchOrFlightDisplayName = "Flight: TestFlight";
+        _viewModel.MarketGroupName = "default";
+        _viewModel.BigId = "None";
+
+        string args = _viewModel.BuildUploadArguments();
+
+        Assert.IsTrue(args.Contains("/flight \"TestFlight\""));
+        Assert.IsFalse(args.Contains("/branch"));
+        Assert.IsFalse(args.Contains("/storeid"));
+    }
+
+    [TestMethod]
+    public void BuildUploadArguments_NoStoreId_NotIncluded()
+    {
+        _viewModel.ContentPath = @"C:\game\content";
+        _viewModel.BranchOrFlightDisplayName = "Branch: Dev";
+        _viewModel.MarketGroupName = "default";
+        _viewModel.BigId = string.Empty;
+
+        string args = _viewModel.BuildUploadArguments();
+
+        Assert.IsFalse(args.Contains("/storeid"));
+    }
+
+    [TestMethod]
+    public void BuildUploadArguments_WithSubValPath()
+    {
+        _viewModel.ContentPath = @"C:\game\content";
+        _viewModel.BranchOrFlightDisplayName = "Branch: Main";
+        _viewModel.MarketGroupName = "default";
+
+        string tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+        Directory.CreateDirectory(tempDir);
+
+        try
+        {
+            _viewModel.SubValPath = tempDir;
+
+            string args = _viewModel.BuildUploadArguments();
+
+            Assert.IsTrue(args.Contains($"/validationpath \"{tempDir}\""));
+        }
+        finally
+        {
+            Directory.Delete(tempDir);
+        }
+    }
+    #endregion
+
+    #region CanUpload (via UploadPackageCommand.CanExecute) Tests
+
+    [TestMethod]
+    public void CanUpload_ReturnsFalse_WhenContentPathEmpty()
+    {
+        _viewModel.ContentPath = string.Empty;
+
+        Assert.IsFalse(_viewModel.UploadPackageCommand.CanExecute(null));
+    }
+
+    [TestMethod]
+    public void CanUpload_ReturnsFalse_WhenOperationInProgress()
+    {
+        _viewModel.IsOperationInProgress = true;
+
+        Assert.IsFalse(_viewModel.UploadPackageCommand.CanExecute(null));
+    }
+
+    [TestMethod]
+    public void CanUpload_ReturnsFalse_WhenNoBranchSelected()
+    {
+        _viewModel.BranchOrFlightDisplayName = string.Empty;
+
+        Assert.IsFalse(_viewModel.UploadPackageCommand.CanExecute(null));
+    }
+
+    [TestMethod]
+    public void CanUpload_ReturnsFalse_WhenNoMarketSelected()
+    {
+        _viewModel.MarketGroupName = string.Empty;
+
+        Assert.IsFalse(_viewModel.UploadPackageCommand.CanExecute(null));
+    }
+
+    [TestMethod]
+    public void CanUpload_ReturnsFalse_WhenLoadingBranches()
+    {
+        _viewModel.IsLoadingBranchesAndFlights = true;
+
+        Assert.IsFalse(_viewModel.UploadPackageCommand.CanExecute(null));
+    }
+
+    [TestMethod]
+    public void CanUpload_ReturnsFalse_WhenLoadingMarkets()
+    {
+        _viewModel.IsLoadingMarkets = true;
+
+        Assert.IsFalse(_viewModel.UploadPackageCommand.CanExecute(null));
+    }
+
+    [TestMethod]
+    public void CanUpload_ReturnsFalse_WhenContentPathHasError()
+    {
+        _viewModel.ContentPathError = "Some error";
+
+        Assert.IsFalse(_viewModel.UploadPackageCommand.CanExecute(null));
+    }
+    #endregion
+
+    #region Error Handling Tests
+
+    [TestMethod]
+    public void CancelButton_NavigatesToMainPage()
+    {
+        _viewModel.CancelButtonCommand.Execute(null);
+
+        _mockWindowService.Verify(x => x.NavigateTo(typeof(MainPageView)), Times.Once);
+    }
+
+    [TestMethod]
+    public void ErrorModelProvider_ReceivesCorrectValues_OnError()
+    {
+        // Verify the error model provider is the one we injected
+        Assert.IsNotNull(_errorModelProvider);
+        Assert.AreEqual(string.Empty, _errorModelProvider.Error.MainMessage);
+    }
+    #endregion
+}
diff --git a/src/PackageUploader.UI/Providers/PathConfigurationProvider.cs b/src/PackageUploader.UI/Providers/PathConfigurationProvider.cs
index f74d3044..ac67bb76 100644
--- a/src/PackageUploader.UI/Providers/PathConfigurationProvider.cs
+++ b/src/PackageUploader.UI/Providers/PathConfigurationProvider.cs
@@ -36,6 +36,20 @@ public string BaseSubValPath
         }
     }
 
+    private string _makePkg2Path = string.Empty;
+    public string MakePkg2Path
+    {
+        get => _makePkg2Path;
+        set
+        {
+            if (_makePkg2Path != value)
+            {
+                _makePkg2Path = value;
+                OnPropertyChanged();
+            }
+        }
+    }
+
     private string _packageUploaderPath = string.Empty;
     public string PackageUploaderPath
     {
diff --git a/src/PackageUploader.UI/View/Msixvc2UploadView.xaml b/src/PackageUploader.UI/View/Msixvc2UploadView.xaml
index 23a62ea0..520620bf 100644
--- a/src/PackageUploader.UI/View/Msixvc2UploadView.xaml
+++ b/src/PackageUploader.UI/View/Msixvc2UploadView.xaml
@@ -634,6 +634,20 @@
                 </StackPanel>
             </Grid>
 
+            <!-- ============================================ -->
+            <!-- Progress section (visible during operation) -->
+            <!-- ============================================ -->
+            <StackPanel Margin="0,20,0,0"
+                        Visibility="{Binding IsOperationInProgress, Converter={StaticResource BooleanToVisibilityConverter}}">
+                <TextBlock Text="{Binding StatusMessage}"
+                           Foreground="{DynamicResource PrimaryTextBrush}"
+                           Margin="0,0,0,8"/>
+                <ProgressBar Value="{Binding ProgressValue}"
+                             Minimum="0"
+                             Maximum="100"
+                             Height="8"/>
+            </StackPanel>
+
             <!-- ============================================ -->
             <!-- Button panel                                 -->
             <!-- ============================================ -->
diff --git a/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs b/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
index 6932b660..98239bba 100644
--- a/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
@@ -219,6 +219,13 @@ public MainPageViewModel(
             _pathConfigurationService.BaseSubValPath = subValPath;
         }
 
+        string makePkg2Path = ResolveMakePkg2Path();
+
+        if (File.Exists(makePkg2Path))
+        {
+            _pathConfigurationService.MakePkg2Path = makePkg2Path;
+        }
+
         // Log version of the tool
         _logger.LogInformation("PackageUploader.UI version {version} is starting from location {location}.", GetVersion(), AppContext.BaseDirectory);
 
@@ -230,6 +237,13 @@ public MainPageViewModel(
 
             _logger.LogInformation("Using MakePkg.exe version: {makePkgVersion} from location {makePkgLocation}.", makePkgVersion, makePkgPath);
         }
+
+        if (File.Exists(makePkg2Path))
+        {
+            var makePkg2VersionInfo = System.Diagnostics.FileVersionInfo.GetVersionInfo(makePkg2Path);
+            string makePkg2Version = makePkg2VersionInfo.FileVersion ?? string.Empty;
+            _logger.LogInformation("Using makepkg2.exe version: {makePkg2Version} from location {makePkg2Location}.", makePkg2Version, makePkg2Path);
+        }
     }
 
     private async void LoadAvailableTenants()
@@ -376,4 +390,44 @@ private static string ResolveFilePath(string fileName)
         }
         return null;
     }
+
+    private static string ResolveMakePkg2Path()
+    {
+        string localPath = ResolveFilePath("makepkg2.exe");
+        if (File.Exists(localPath))
+        {
+            return localPath;
+        }
+
+        string nugetPackagesDir = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+            ".nuget", "packages", "microsoft.xbox.packaging.tools.makepkg2");
+
+        if (Directory.Exists(nugetPackagesDir))
+        {
+            string? bestPath = null;
+            Version? bestVersion = null;
+
+            foreach (var versionDir in Directory.GetDirectories(nugetPackagesDir))
+            {
+                string dirName = Path.GetFileName(versionDir);
+                if (Version.TryParse(dirName, out var version))
+                {
+                    string candidate = Path.Combine(versionDir, "tools", "any", "win-x64", "makepkg2.exe");
+                    if (File.Exists(candidate) && (bestVersion == null || version > bestVersion))
+                    {
+                        bestVersion = version;
+                        bestPath = candidate;
+                    }
+                }
+            }
+
+            if (bestPath != null)
+            {
+                return bestPath;
+            }
+        }
+
+        return string.Empty;
+    }
 }
diff --git a/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
index 3359a860..55b7f9f2 100644
--- a/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Diagnostics;
 using System.IO;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
@@ -10,6 +12,7 @@
 using PackageUploader.ClientApi;
 using PackageUploader.ClientApi.Client.Ingestion.Models;
 using PackageUploader.UI.Model;
+using PackageUploader.UI.Providers;
 using PackageUploader.UI.Utility;
 using PackageUploader.UI.View;
 
@@ -20,10 +23,17 @@ public partial class Msixvc2UploadViewModel : BaseViewModel
     private readonly IWindowService _windowService;
     private readonly IPackageUploaderService _uploaderService;
     private readonly ILogger<Msixvc2UploadViewModel> _logger;
+    private readonly ErrorModelProvider _errorModelProvider;
+    private readonly PathConfigurationProvider _pathConfigurationService;
+    private readonly PackageModelProvider _packageModelProvider;
 
     private GameProduct? _gameProduct = null;
     private IReadOnlyCollection<IGamePackageBranch>? _branchesAndFlights = null;
 
+    private Process? _makePkg2Process;
+    private string _operationLogOutput = string.Empty;
+    private string _lastLogFilePath = string.Empty;
+
     // Step 1 — Build location
     private string _contentPath = string.Empty;
     public string ContentPath
@@ -37,6 +47,7 @@ public string ContentPath
                 OnPropertyChanged(nameof(ContentPath));
                 LoadGameConfigValues();
                 EstimateFolderSize();
+                CheckCanExecuteUploadCommand();
             }
         }
     }
@@ -87,6 +98,7 @@ public string BranchOrFlightDisplayName
             if (SetProperty(ref _branchOrFlightDisplayName, value) && value != null)
             {
                 UpdateMarketGroups();
+                CheckCanExecuteUploadCommand();
             }
         }
     }
@@ -102,7 +114,13 @@ public string[] BranchAndFlightNames
     public bool IsLoadingBranchesAndFlights
     {
         get => _isLoadingBranchesAndFlights;
-        set => SetProperty(ref _isLoadingBranchesAndFlights, value);
+        set
+        {
+            if (SetProperty(ref _isLoadingBranchesAndFlights, value))
+            {
+                CheckCanExecuteUploadCommand();
+            }
+        }
     }
 
     private string _branchOrFlightErrorMessage = string.Empty;
@@ -116,7 +134,13 @@ public string BranchOrFlightErrorMessage
     public string MarketGroupName
     {
         get => _marketGroupName;
-        set => SetProperty(ref _marketGroupName, value);
+        set
+        {
+            if (SetProperty(ref _marketGroupName, value))
+            {
+                CheckCanExecuteUploadCommand();
+            }
+        }
     }
 
     private string[] _marketGroupNames = [];
@@ -130,7 +154,13 @@ public string[] MarketGroupNames
     public bool IsLoadingMarkets
     {
         get => _isLoadingMarkets;
-        set => SetProperty(ref _isLoadingMarkets, value);
+        set
+        {
+            if (SetProperty(ref _isLoadingMarkets, value))
+            {
+                CheckCanExecuteUploadCommand();
+            }
+        }
     }
 
     private string _marketGroupErrorMessage = string.Empty;
@@ -183,6 +213,33 @@ public BitmapImage? PackagePreviewImage
         set => SetProperty(ref _packagePreviewImage, value);
     }
 
+    private bool _isOperationInProgress = false;
+    public bool IsOperationInProgress
+    {
+        get => _isOperationInProgress;
+        set
+        {
+            if (SetProperty(ref _isOperationInProgress, value))
+            {
+                CheckCanExecuteUploadCommand();
+            }
+        }
+    }
+
+    private string _statusMessage = string.Empty;
+    public string StatusMessage
+    {
+        get => _statusMessage;
+        set => SetProperty(ref _statusMessage, value);
+    }
+
+    private int _progressValue;
+    public int ProgressValue
+    {
+        get => _progressValue;
+        set => SetProperty(ref _progressValue, value);
+    }
+
     // Commands
     public ICommand BrowseContentPathCommand { get; }
     public ICommand BrowseMappingDataXmlPathCommand { get; }
@@ -193,11 +250,17 @@ public BitmapImage? PackagePreviewImage
 
     public Msixvc2UploadViewModel(IWindowService windowService,
                                   IPackageUploaderService uploaderService,
-                                  ILogger<Msixvc2UploadViewModel> logger)
+                                  ILogger<Msixvc2UploadViewModel> logger,
+                                  ErrorModelProvider errorModelProvider,
+                                  PathConfigurationProvider pathConfigurationService,
+                                  PackageModelProvider packageModelProvider)
     {
         _windowService = windowService;
         _uploaderService = uploaderService;
         _logger = logger;
+        _errorModelProvider = errorModelProvider;
+        _pathConfigurationService = pathConfigurationService;
+        _packageModelProvider = packageModelProvider;
 
         BrowseContentPathCommand = new RelayCommand(OnBrowseContentPath);
         BrowseMappingDataXmlPathCommand = new RelayCommand(OnBrowseMappingDataXml);
@@ -209,10 +272,13 @@ public Msixvc2UploadViewModel(IWindowService windowService,
                 ContentPath = path;
             }
         });
-        // TODO: Wire actual upload logic
-        UploadPackageCommand = new RelayCommand(() => { });
+        UploadPackageCommand = new RelayCommand(StartPackAndUploadAsync, CanUpload);
         CancelButtonCommand = new RelayCommand(() =>
         {
+            if (IsOperationInProgress && _makePkg2Process != null && !_makePkg2Process.HasExited)
+            {
+                _makePkg2Process.Kill(true);
+            }
             _windowService.NavigateTo(typeof(MainPageView));
         });
     }
@@ -508,6 +574,215 @@ private long ParseLayoutFileForFileSize(string mappingDataXmlPath)
         }
     }
 
+    private bool CanUpload()
+    {
+        return !string.IsNullOrEmpty(ContentPath)
+            && Directory.Exists(ContentPath)
+            && string.IsNullOrEmpty(ContentPathError)
+            && _gameProduct != null
+            && !string.IsNullOrEmpty(BranchOrFlightDisplayName)
+            && !string.IsNullOrEmpty(MarketGroupName)
+            && !IsOperationInProgress
+            && !IsLoadingBranchesAndFlights
+            && !IsLoadingMarkets;
+    }
+
+    private void CheckCanExecuteUploadCommand()
+    {
+        if (UploadPackageCommand is RelayCommand command)
+        {
+            command.RaiseCanExecuteChanged();
+        }
+    }
+
+    private async void StartPackAndUploadAsync()
+    {
+        if (IsOperationInProgress) return;
+
+        string makePkg2Path = _pathConfigurationService.MakePkg2Path;
+        if (string.IsNullOrEmpty(makePkg2Path) || !File.Exists(makePkg2Path))
+        {
+            SetErrorAndGoToErrorPage("makepkg2 Not Found",
+                "makepkg2.exe was not found. Please install the Microsoft.Xbox.Packaging.Tools.makepkg2 NuGet package.");
+            return;
+        }
+
+        IsOperationInProgress = true;
+        StatusMessage = "Uploading loose content to Partner Center...";
+        ProgressValue = 0;
+        _operationLogOutput = string.Empty;
+
+        try
+        {
+            string uploadArgs = BuildUploadArguments();
+            _logger.LogInformation("Starting makepkg2 loose upload: {Arguments}", uploadArgs);
+
+            int uploadExitCode = await RunMakePkg2ProcessAsync(uploadArgs, "Upload", line =>
+            {
+                var match = Regex.Match(line, @"([\d.]+ \S+) / ([\d.]+ \S+) read \(([\d.]+)%\).*?([\d.]+ \S+) / ([\d.]+ \S+) written \(([\d.]+)%\)");
+                if (match.Success)
+                {
+                    string readAmount = match.Groups[1].Value;
+                    string readTotal = match.Groups[2].Value;
+                    string readPct = match.Groups[3].Value;
+                    string writtenAmount = match.Groups[4].Value;
+                    string writtenTotal = match.Groups[5].Value;
+                    string writtenPct = match.Groups[6].Value;
+
+                    if (double.TryParse(writtenPct, out double wp))
+                    {
+                        ProgressValue = (int)wp;
+                    }
+
+                    StatusMessage = $"Read: {readAmount}/{readTotal} ({readPct}%)  |  Written: {writtenAmount}/{writtenTotal} ({writtenPct}%)";
+                }
+            });
+
+            if (uploadExitCode != 0)
+            {
+                _logger.LogError("makepkg2 upload failed with exit code {ExitCode}.", uploadExitCode);
+                SetErrorAndGoToErrorPage("Upload Failed",
+                    $"makepkg2 upload exited with code {uploadExitCode}.\n\n{_operationLogOutput}");
+                return;
+            }
+
+            ProgressValue = 100;
+            StatusMessage = "Upload complete!";
+            _logger.LogInformation("MSIXVC2 loose upload completed successfully.");
+
+            var branchOrFlight = GetBranchOrFlightFromUISelection();
+            _packageModelProvider.Package.BigId = BigId;
+            _packageModelProvider.Package.PackageType = "MSIXVC2";
+            _packageModelProvider.Package.PackagePreviewImage = PackagePreviewImage;
+            if (branchOrFlight != null)
+            {
+                _packageModelProvider.Package.BranchId = branchOrFlight.CurrentDraftInstanceId;
+            }
+
+            NavigateOnUIThread(typeof(UploadingFinishedView));
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Unexpected error during MSIXVC2 upload.");
+            SetErrorAndGoToErrorPage("Unexpected Error", ex.ToString());
+        }
+        finally
+        {
+            IsOperationInProgress = false;
+        }
+    }
+
+    internal string BuildUploadArguments()
+    {
+        var args = $"upload /d \"{ContentPath}\" /msixvc2";
+
+        if (BranchOrFlightDisplayName.StartsWith("Branch: "))
+        {
+            string branchName = BranchOrFlightDisplayName[(BranchOrFlightDisplayName.IndexOf(':') + 2)..];
+            args += $" /branch \"{branchName}\"";
+        }
+        else if (BranchOrFlightDisplayName.StartsWith("Flight: "))
+        {
+            string flightName = BranchOrFlightDisplayName[(BranchOrFlightDisplayName.IndexOf(':') + 2)..];
+            args += $" /flight \"{flightName}\"";
+        }
+
+        if (!string.IsNullOrEmpty(MarketGroupName))
+        {
+            args += $" /market \"{MarketGroupName}\"";
+        }
+
+        if (!string.IsNullOrEmpty(BigId) && BigId != "None")
+        {
+            args += $" /storeid \"{BigId}\"";
+        }
+
+        if (!string.IsNullOrEmpty(SubValPath) && Directory.Exists(SubValPath))
+        {
+            args += $" /validationpath \"{SubValPath}\"";
+        }
+
+        args += " /auth Browser";
+
+        return args;
+    }
+
+    private Task<int> RunMakePkg2ProcessAsync(string arguments, string operationName, Action<string>? onOutputLine = null)
+    {
+        var tcs = new TaskCompletionSource<int>();
+        var processOutput = new List<string>();
+        var processErrors = new List<string>();
+
+        _makePkg2Process = new Process();
+        _makePkg2Process.StartInfo.FileName = _pathConfigurationService.MakePkg2Path;
+        _makePkg2Process.StartInfo.Arguments = arguments;
+        _makePkg2Process.StartInfo.RedirectStandardOutput = true;
+        _makePkg2Process.StartInfo.RedirectStandardError = true;
+        _makePkg2Process.StartInfo.CreateNoWindow = true;
+        _makePkg2Process.EnableRaisingEvents = true;
+
+        _makePkg2Process.OutputDataReceived += (s, e) =>
+        {
+            if (!string.IsNullOrEmpty(e.Data))
+            {
+                processOutput.Add(e.Data);
+                _logger.LogTrace("[{Op}] {Data}", operationName, e.Data);
+                onOutputLine?.Invoke(e.Data);
+            }
+        };
+
+        _makePkg2Process.ErrorDataReceived += (s, e) =>
+        {
+            if (!string.IsNullOrEmpty(e.Data))
+            {
+                processErrors.Add(e.Data);
+                _logger.LogWarning("[{Op}] stderr: {Data}", operationName, e.Data);
+            }
+        };
+
+        _makePkg2Process.Exited += (s, e) =>
+        {
+            _operationLogOutput = string.Join("\n", processOutput) + "\n" + string.Join("\n", processErrors);
+            WriteLogFile(operationName, _operationLogOutput);
+
+            if (!_makePkg2Process.HasExited)
+            {
+                _makePkg2Process.WaitForExit();
+            }
+            tcs.TrySetResult(_makePkg2Process.ExitCode);
+        };
+
+        _makePkg2Process.Start();
+        _makePkg2Process.BeginOutputReadLine();
+        _makePkg2Process.BeginErrorReadLine();
+
+        return tcs.Task;
+    }
+
+    private void SetErrorAndGoToErrorPage(string title, string detail)
+    {
+        _errorModelProvider.Error.MainMessage = title;
+        _errorModelProvider.Error.DetailMessage = detail;
+        _errorModelProvider.Error.OriginPage = typeof(Msixvc2UploadView);
+        _errorModelProvider.Error.LogsPath = _lastLogFilePath;
+        NavigateOnUIThread(typeof(ErrorPageView));
+    }
+
+    private void NavigateOnUIThread(Type viewType)
+    {
+        System.Windows.Application.Current.Dispatcher.Invoke(() =>
+        {
+            _windowService.NavigateTo(viewType);
+        });
+    }
+
+    private void WriteLogFile(string operationName, string content)
+    {
+        _lastLogFilePath = Path.Combine(Path.GetTempPath(),
+            $"PackageUploader_UI_Msixvc2_{operationName}_{DateTime.Now:yyyyMMddHHmmss}.log");
+        File.WriteAllText(_lastLogFilePath, content);
+    }
+
     private static BitmapImage LoadBitmapImage(string imagePath)
     {
         var image = new BitmapImage();
diff --git a/src/PackageUploader.UI/ViewModel/UploadingFinishedViewModel.cs b/src/PackageUploader.UI/ViewModel/UploadingFinishedViewModel.cs
index e3b7fd07..594b33af 100644
--- a/src/PackageUploader.UI/ViewModel/UploadingFinishedViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/UploadingFinishedViewModel.cs
@@ -90,9 +90,18 @@ public void OnAppearing()
             VersionNum = _packageModelProvider.Package.Version;
             StoreId = _packageModelProvider.Package.BigId;
 
-            FileInfo packageInfo = new(_packageModelProvider.Package.PackageFilePath);
-            PackageFileName = packageInfo.Name;
-            PackageSize = TranslateFileSize(packageInfo.Length);
+            string packageFilePath = _packageModelProvider.Package.PackageFilePath;
+            if (!string.IsNullOrEmpty(packageFilePath) && File.Exists(packageFilePath))
+            {
+                FileInfo packageInfo = new(packageFilePath);
+                PackageFileName = packageInfo.Name;
+                PackageSize = TranslateFileSize(packageInfo.Length);
+            }
+            else
+            {
+                PackageFileName = "Loose content upload";
+                PackageSize = string.Empty;
+            }
             PackageType = _packageModelProvider.Package.PackageType;
         }
 

From c32124330541684329b98d4c17f7df5a5ac8bbce Mon Sep 17 00:00:00 2001
From: Elshiekh Ahmed <elahmed@microsoft.com>
Date: Wed, 18 Mar 2026 09:49:31 -0700
Subject: [PATCH 05/10] Package Information upon completion & navigation to
 partner center

---
 .../UploadingFinishedViewModelTest.cs         | 153 ++++++++----------
 src/PackageUploader.UI/Model/PackageModel.cs  |   6 +
 .../Strings/UploadingFinished.Designer.cs     |  63 ++++++++
 .../Resources/Strings/UploadingFinished.resx  |  21 +++
 .../View/UploadingFinishedView.xaml           | 128 +++++++++------
 .../ViewModel/Msixvc2UploadViewModel.cs       |  40 ++++-
 .../ViewModel/UploadingFinishedViewModel.cs   | 109 ++++++++-----
 7 files changed, 337 insertions(+), 183 deletions(-)

diff --git a/src/PackageUploader.UI.Test/ViewModel/UploadingFinishedViewModelTest.cs b/src/PackageUploader.UI.Test/ViewModel/UploadingFinishedViewModelTest.cs
index f71ea5bf..fc6ae3b9 100644
--- a/src/PackageUploader.UI.Test/ViewModel/UploadingFinishedViewModelTest.cs
+++ b/src/PackageUploader.UI.Test/ViewModel/UploadingFinishedViewModelTest.cs
@@ -39,17 +39,20 @@ public void Setup()
             // Setup mock package
             _mockPackage = new PackageModel
             {
-                PackageFilePath = Path.GetTempFileName(),
-                Version = "1.0.0.0",
                 BigId = "12345678",
-                PackageType = "Xbox Game Package",
+                PackageType = "PC",
                 BranchId = "branch-123",
-                PackagePreviewImage = new BitmapImage()
+                PackagePreviewImage = new BitmapImage(),
+                PackageName = "Test Game",
+                Destination = "Branch: main",
+                Market = "default",
+                PackageIdentityName = "Publisher.TestGame",
+                FolderSize = "1.04 GB",
+                UploadSize = "1.001 GB"
             };
             
             _packageModelProvider.Package = _mockPackage;
             
-            
             // Setup App.GetLogFilePath for log tests
             typeof(App).GetField("_logFilePath", BindingFlags.NonPublic | BindingFlags.Static)?.SetValue(null, @"C:\test\logs\app.log");
             
@@ -72,26 +75,71 @@ public void Constructor_InitializesCommands()
         }
 
         [TestMethod]
-        public void OnAppearing_LoadsPackageInformation()
+        public void OnAppearing_LoadsAllPreviewFields()
         {
-            // Arrange
-            var packagePath = _mockPackage.PackageFilePath;
-            var fileInfo = new FileInfo(packagePath);
-            var mockFileLength = 1024 * 1024 * 10; // 10 MB
-            
-            // Use reflection to set private field values if necessary for file info
-            SetFileInfoLength(fileInfo, mockFileLength);
-            
             // Act
             _viewModel.OnAppearing();
             
             // Assert
             Assert.AreEqual(_mockPackage.PackagePreviewImage, _viewModel.PackagePreviewImage);
-            Assert.AreEqual(_mockPackage.Version, _viewModel.VersionNum);
-            Assert.AreEqual(_mockPackage.BigId, _viewModel.StoreId);
-            Assert.AreEqual(Path.GetFileName(packagePath), _viewModel.PackageFileName);
-            Assert.AreEqual("0 B", _viewModel.PackageSize); // temp file is empty
-            Assert.AreEqual(_mockPackage.PackageType, _viewModel.PackageType);
+            Assert.AreEqual("Test Game", _viewModel.ProductName);
+            Assert.AreEqual("Branch: main", _viewModel.Destination);
+            Assert.AreEqual("default", _viewModel.Market);
+            Assert.AreEqual("Publisher.TestGame", _viewModel.PackageIdentityName);
+            Assert.AreEqual("12345678", _viewModel.StoreId);
+            Assert.AreEqual("1.04 GB", _viewModel.FolderSize);
+            Assert.AreEqual("PC", _viewModel.PackageType);
+            Assert.IsTrue(_viewModel.HasUploadSize);
+            Assert.AreEqual("1.001 GB", _viewModel.UploadSize);
+        }
+
+        [TestMethod]
+        public void OnAppearing_WithoutUploadSize_HidesUploadSize()
+        {
+            // Arrange
+            _mockPackage.UploadSize = string.Empty;
+
+            // Act
+            _viewModel.OnAppearing();
+
+            // Assert
+            Assert.IsFalse(_viewModel.HasUploadSize);
+        }
+
+        [TestMethod]
+        public void OnAppearing_WithoutPackageName_FallsBackToFileName()
+        {
+            // Arrange - legacy path with file but no package name
+            string tempFile = Path.GetTempFileName();
+            try
+            {
+                _mockPackage.PackageName = string.Empty;
+                _mockPackage.PackageFilePath = tempFile;
+
+                // Act
+                _viewModel.OnAppearing();
+
+                // Assert
+                Assert.AreEqual(Path.GetFileName(tempFile), _viewModel.ProductName);
+            }
+            finally
+            {
+                File.Delete(tempFile);
+            }
+        }
+
+        [TestMethod]
+        public void OnAppearing_WithNoNameOrFile_ShowsFallbackText()
+        {
+            // Arrange
+            _mockPackage.PackageName = string.Empty;
+            _mockPackage.PackageFilePath = string.Empty;
+
+            // Act
+            _viewModel.OnAppearing();
+
+            // Assert
+            Assert.AreEqual("Loose content upload", _viewModel.ProductName);
         }
 
         [TestMethod]
@@ -149,76 +197,9 @@ public void OnViewInPartnerCenter_OpensBrowserWithCorrectUrl()
                 Times.Once);
         }
 
-        [TestMethod]
-        public void TranslateFileSize_FormatsCorrectly()
-        {
-            // Arrange & Act - Use reflection to call private static method
-            string bytesResult = InvokePrivateStaticMethod<string>(
-                typeof(UploadingFinishedViewModel), "TranslateFileSize", 500L);
-                
-            string kbResult = InvokePrivateStaticMethod<string>(
-                typeof(UploadingFinishedViewModel), "TranslateFileSize", 1500L);
-                
-            string mbResult = InvokePrivateStaticMethod<string>(
-                typeof(UploadingFinishedViewModel), "TranslateFileSize", 1500 * 1024L);
-                
-            string gbResult = InvokePrivateStaticMethod<string>(
-                typeof(UploadingFinishedViewModel), "TranslateFileSize", 1500 * 1024 * 1024L);
-
-            // Assert
-            Assert.AreEqual("500 B", bytesResult);
-            Assert.AreEqual("1 KB", kbResult);
-            Assert.AreEqual("1 MB", mbResult);
-            Assert.AreEqual("1.46 GB", gbResult);
-        }
-
         [TestCleanup]
         public void Cleanup()
         {
-            // Delete temp file
-            if (File.Exists(_mockPackage.PackageFilePath))
-            {
-                File.Delete(_mockPackage.PackageFilePath);
-            }
         }
-
-        #region Helper Methods
-
-        private static void SetStaticProperty(Type type, string propertyName, object value)
-        {
-            var propertyInfo = type.GetProperty(
-                propertyName,
-                BindingFlags.Public | BindingFlags.Static);
-                
-            if (propertyInfo != null && propertyInfo.CanWrite)
-            {
-                propertyInfo.SetValue(null, value);
-            }
-        }
-
-        private static void SetFileInfoLength(FileInfo fileInfo, long length)
-        {
-            // This is a hack for testing purposes since FileInfo length is read-only
-            // In real tests, you'd use a file system abstraction instead
-            var fieldInfo = typeof(FileInfo).GetField(
-                "length", 
-                BindingFlags.NonPublic | BindingFlags.Instance);
-                
-            if (fieldInfo != null)
-            {
-                fieldInfo.SetValue(fileInfo, length);
-            }
-        }
-
-        private static T InvokePrivateStaticMethod<T>(Type type, string methodName, params object[] parameters)
-        {
-            var method = type.GetMethod(
-                methodName,
-                BindingFlags.NonPublic | BindingFlags.Static);
-                
-            return (T)method?.Invoke(null, parameters);
-        }
-
-        #endregion
     }
 }
\ No newline at end of file
diff --git a/src/PackageUploader.UI/Model/PackageModel.cs b/src/PackageUploader.UI/Model/PackageModel.cs
index de7b3a5d..eb441201 100644
--- a/src/PackageUploader.UI/Model/PackageModel.cs
+++ b/src/PackageUploader.UI/Model/PackageModel.cs
@@ -19,4 +19,10 @@ public class PackageModel
     public string PackageType { get; set; } = string.Empty;
     public BitmapImage? PackagePreviewImage { get; set; } = null;
     public string BranchId { get; internal set; } = string.Empty;
+    public string PackageName { get; set; } = string.Empty;
+    public string UploadSize { get; set; } = string.Empty;
+    public string Destination { get; set; } = string.Empty;
+    public string Market { get; set; } = string.Empty;
+    public string PackageIdentityName { get; set; } = string.Empty;
+    public string FolderSize { get; set; } = string.Empty;
 }
diff --git a/src/PackageUploader.UI/Resources/Strings/UploadingFinished.Designer.cs b/src/PackageUploader.UI/Resources/Strings/UploadingFinished.Designer.cs
index 9c7f9d9c..be2c445c 100644
--- a/src/PackageUploader.UI/Resources/Strings/UploadingFinished.Designer.cs
+++ b/src/PackageUploader.UI/Resources/Strings/UploadingFinished.Designer.cs
@@ -60,6 +60,15 @@ internal UploadingFinished() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Destination.
+        /// </summary>
+        public static string DestinationTitleText {
+            get {
+                return ResourceManager.GetString("DestinationTitleText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Family.
         /// </summary>
@@ -78,6 +87,15 @@ public static string FileNameTitleText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Folder size.
+        /// </summary>
+        public static string FolderSizeTitleText {
+            get {
+                return ResourceManager.GetString("FolderSizeTitleText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Home.
         /// </summary>
@@ -87,6 +105,42 @@ public static string GoHomeButtonContent {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Market.
+        /// </summary>
+        public static string MarketTitleText {
+            get {
+                return ResourceManager.GetString("MarketTitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Package Identity name.
+        /// </summary>
+        public static string PackageIdentityNameTitleText {
+            get {
+                return ResourceManager.GetString("PackageIdentityNameTitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Package Name.
+        /// </summary>
+        public static string PackageNameTitleText {
+            get {
+                return ResourceManager.GetString("PackageNameTitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Product name.
+        /// </summary>
+        public static string ProductNameTitleText {
+            get {
+                return ResourceManager.GetString("ProductNameTitleText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Size.
         /// </summary>
@@ -114,6 +168,15 @@ public static string UploadCompleteTitleText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Upload Size.
+        /// </summary>
+        public static string UploadSizeTitleText {
+            get {
+                return ResourceManager.GetString("UploadSizeTitleText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to View logs.
         /// </summary>
diff --git a/src/PackageUploader.UI/Resources/Strings/UploadingFinished.resx b/src/PackageUploader.UI/Resources/Strings/UploadingFinished.resx
index b0be8fd1..a26997b4 100644
--- a/src/PackageUploader.UI/Resources/Strings/UploadingFinished.resx
+++ b/src/PackageUploader.UI/Resources/Strings/UploadingFinished.resx
@@ -117,15 +117,33 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="DestinationTitleText" xml:space="preserve">
+    <value>Destination</value>
+  </data>
   <data name="FamilyTitleText" xml:space="preserve">
     <value>Family</value>
   </data>
   <data name="FileNameTitleText" xml:space="preserve">
     <value>File name</value>
   </data>
+  <data name="FolderSizeTitleText" xml:space="preserve">
+    <value>Folder size</value>
+  </data>
   <data name="GoHomeButtonContent" xml:space="preserve">
     <value>Home</value>
   </data>
+  <data name="MarketTitleText" xml:space="preserve">
+    <value>Market</value>
+  </data>
+  <data name="PackageIdentityNameTitleText" xml:space="preserve">
+    <value>Package Identity name</value>
+  </data>
+  <data name="PackageNameTitleText" xml:space="preserve">
+    <value>Package Name</value>
+  </data>
+  <data name="ProductNameTitleText" xml:space="preserve">
+    <value>Product name</value>
+  </data>
   <data name="SizeTitleText" xml:space="preserve">
     <value>Size</value>
   </data>
@@ -135,6 +153,9 @@
   <data name="UploadCompleteTitleText" xml:space="preserve">
     <value>Upload complete</value>
   </data>
+  <data name="UploadSizeTitleText" xml:space="preserve">
+    <value>Upload Size</value>
+  </data>
   <data name="ViewLogsButtonContent" xml:space="preserve">
     <value>View logs</value>
   </data>
diff --git a/src/PackageUploader.UI/View/UploadingFinishedView.xaml b/src/PackageUploader.UI/View/UploadingFinishedView.xaml
index e014d02d..59cc8b09 100644
--- a/src/PackageUploader.UI/View/UploadingFinishedView.xaml
+++ b/src/PackageUploader.UI/View/UploadingFinishedView.xaml
@@ -43,79 +43,109 @@
                 BorderBrush="{DynamicResource BorderBrush}"
                 BorderThickness="1"
                 CornerRadius="6"
-                Height="100"
-                Padding="6">
+                Padding="10">
             <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="auto"/>
-                    <RowDefinition Height="auto"/>
-                </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="auto"/>
-                    <!-- image -->
+                    <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition />
-                    <!-- text -->
-                    <ColumnDefinition Width="auto"/>
-                    <!-- button -->
+                    <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                <Image Grid.Row="0"
-                       Grid.Column="0"
-                       Grid.RowSpan="4"
+
+                <!-- Package Image -->
+                <Image Grid.Column="0"
                        Source="{Binding PackagePreviewImage}"
-                       HorizontalAlignment="Left"
+                       HorizontalAlignment="Center"
                        VerticalAlignment="Center"
-                       Height="80"
-                       Width="80"
-                       Margin="10,0,15,0"/>
-                <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Vertical">
-                    <TextBlock HorizontalAlignment="Left"
-                               Text="{x:Static strings:UploadingFinished.FileNameTitleText}"
-                               d:Text="File name" 
-                               Foreground="{DynamicResource SecondaryTextBrush}"/>
-                    <TextBlock HorizontalAlignment="Left"
-                               Text="{Binding PackageFileName}" 
-                               Foreground="{DynamicResource PrimaryTextBrush}"/>
-                </StackPanel>
-                <Grid Margin="0, 10, 0, 0" Grid.Row="1" Grid.Column="1">
+                       Height="65" Width="65"
+                       Margin="0,0,15,0"/>
+
+                <!-- 3x3 Metadata Grid -->
+                <Grid Grid.Column="1">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="33*" />
-                        <ColumnDefinition Width="33*" />
-                        <ColumnDefinition Width="33*" />
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
-                    <StackPanel Grid.Column="0"
-                                Orientation="Vertical"
-                                HorizontalAlignment="Left"
-                                Margin="0, 0, 50, 0">
-                        <TextBlock HorizontalAlignment="Left"
-                                   Text="{x:Static strings:UploadingFinished.StoreIdTitleText}"
-                                   d:Text="Store ID" 
+
+                    <!-- Row 0 -->
+                    <StackPanel Grid.Row="0" Grid.Column="0" Margin="0,0,0,10">
+                        <TextBlock Text="{x:Static strings:UploadingFinished.ProductNameTitleText}"
+                                   d:Text="Product name"
+                                   Foreground="{DynamicResource SecondaryTextBrush}"/>
+                        <TextBlock Text="{Binding ProductName}"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"/>
+                    </StackPanel>
+                    <StackPanel Grid.Row="0" Grid.Column="1" Margin="0,0,0,10">
+                        <TextBlock Text="{x:Static strings:UploadingFinished.PackageIdentityNameTitleText}"
+                                   d:Text="Package Identity name"
+                                   Foreground="{DynamicResource SecondaryTextBrush}"/>
+                        <TextBlock Text="{Binding PackageIdentityName}"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"
+                                   TextWrapping="Wrap"/>
+                    </StackPanel>
+                    <StackPanel Grid.Row="0" Grid.Column="2" Margin="0,0,0,10">
+                        <TextBlock Text="{x:Static strings:UploadingFinished.StoreIdTitleText}"
+                                   d:Text="Store ID"
                                    Foreground="{DynamicResource SecondaryTextBrush}"/>
                         <TextBlock Text="{Binding StoreId}"
                                    Foreground="{DynamicResource PrimaryTextBrush}"/>
                     </StackPanel>
-                    <StackPanel Grid.Column="1" Orientation="Vertical" HorizontalAlignment="Left">
-                        <TextBlock Text="{x:Static strings:UploadingFinished.SizeTitleText}"
-                                   d:Text="Size" 
+
+                    <!-- Row 1 -->
+                    <StackPanel Grid.Row="1" Grid.Column="0" Margin="0,0,0,10">
+                        <TextBlock Text="{x:Static strings:UploadingFinished.DestinationTitleText}"
+                                   d:Text="Destination"
+                                   Foreground="{DynamicResource SecondaryTextBrush}"/>
+                        <TextBlock Text="{Binding Destination}"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"/>
+                    </StackPanel>
+                    <StackPanel Grid.Row="1" Grid.Column="1" Margin="0,0,0,10">
+                        <TextBlock Text="{x:Static strings:UploadingFinished.MarketTitleText}"
+                                   d:Text="Market"
                                    Foreground="{DynamicResource SecondaryTextBrush}"/>
-                        <TextBlock Text="{Binding PackageSize}" 
+                        <TextBlock Text="{Binding Market}"
                                    Foreground="{DynamicResource PrimaryTextBrush}"/>
                     </StackPanel>
-                    <StackPanel Grid.Column="2" Orientation="Vertical" HorizontalAlignment="Left">
+                    <StackPanel Grid.Row="1" Grid.Column="2" Margin="0,0,0,10">
                         <TextBlock Text="{x:Static strings:UploadingFinished.FamilyTitleText}"
-                                   d:Text="Family" 
+                                   d:Text="Family"
+                                   Foreground="{DynamicResource SecondaryTextBrush}"/>
+                        <TextBlock Text="{Binding PackageType}"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"/>
+                    </StackPanel>
+
+                    <!-- Row 2 -->
+                    <StackPanel Grid.Row="2" Grid.Column="0">
+                        <TextBlock Text="{x:Static strings:UploadingFinished.FolderSizeTitleText}"
+                                   d:Text="Folder size"
                                    Foreground="{DynamicResource SecondaryTextBrush}"/>
-                        <TextBlock Text="{Binding PackageType}" 
+                        <TextBlock Text="{Binding FolderSize}"
+                                   Foreground="{DynamicResource PrimaryTextBrush}"/>
+                    </StackPanel>
+                    <StackPanel Grid.Row="2" Grid.Column="1"
+                                Visibility="{Binding HasUploadSize, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <TextBlock Text="{x:Static strings:UploadingFinished.UploadSizeTitleText}"
+                                   d:Text="Upload Size"
+                                   Foreground="{DynamicResource SecondaryTextBrush}"/>
+                        <TextBlock Text="{Binding UploadSize}"
                                    Foreground="{DynamicResource PrimaryTextBrush}"/>
                     </StackPanel>
                 </Grid>
-                <Button Grid.RowSpan="4" Grid.Column="2"
+
+                <!-- View in Partner Center Button -->
+                <Button Grid.Column="2"
                         Content="{x:Static strings:UploadingFinished.ViewPartnerCenterButtonContent}"
                         d:Content="View in Partner Center"
                         Command="{Binding ViewInPartnerCenterCommand}"
                         IsEnabled="True"
-                        Width="150"
-                        Height="30"
-                        Margin="10, 0, 10, 0"/>
+                        Width="150" Height="30"
+                        VerticalAlignment="Center"
+                        Margin="10,0,0,0"/>
             </Grid>
         </Border>
         <StackPanel Grid.Row="3"
diff --git a/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
index 55b7f9f2..e43c641b 100644
--- a/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
@@ -612,6 +612,10 @@ private async void StartPackAndUploadAsync()
         ProgressValue = 0;
         _operationLogOutput = string.Empty;
 
+        int lastReportedPct = -1;
+        string? lastErrorMessage = null;
+        string lastWrittenTotal = string.Empty;
+
         try
         {
             string uploadArgs = BuildUploadArguments();
@@ -622,8 +626,6 @@ private async void StartPackAndUploadAsync()
                 var match = Regex.Match(line, @"([\d.]+ \S+) / ([\d.]+ \S+) read \(([\d.]+)%\).*?([\d.]+ \S+) / ([\d.]+ \S+) written \(([\d.]+)%\)");
                 if (match.Success)
                 {
-                    string readAmount = match.Groups[1].Value;
-                    string readTotal = match.Groups[2].Value;
                     string readPct = match.Groups[3].Value;
                     string writtenAmount = match.Groups[4].Value;
                     string writtenTotal = match.Groups[5].Value;
@@ -631,18 +633,36 @@ private async void StartPackAndUploadAsync()
 
                     if (double.TryParse(writtenPct, out double wp))
                     {
-                        ProgressValue = (int)wp;
+                        int wholePct = (int)wp;
+                        if (wholePct != lastReportedPct)
+                        {
+                            lastReportedPct = wholePct;
+                            ProgressValue = wholePct;
+
+                            string phase = double.TryParse(readPct, out double rp) && rp < 100.0
+                                ? "Packaging & uploading"
+                                : "Uploading";
+                            StatusMessage = $"{phase}... {writtenAmount} / {writtenTotal} ({writtenPct}%)";
+                        }
+                        lastWrittenTotal = writtenTotal;
                     }
+                }
 
-                    StatusMessage = $"Read: {readAmount}/{readTotal} ({readPct}%)  |  Written: {writtenAmount}/{writtenTotal} ({writtenPct}%)";
+                if (line.Contains("fail:", StringComparison.OrdinalIgnoreCase)
+                    || line.Contains("Exception:", StringComparison.OrdinalIgnoreCase))
+                {
+                    lastErrorMessage = line;
                 }
             });
 
             if (uploadExitCode != 0)
             {
                 _logger.LogError("makepkg2 upload failed with exit code {ExitCode}.", uploadExitCode);
-                SetErrorAndGoToErrorPage("Upload Failed",
-                    $"makepkg2 upload exited with code {uploadExitCode}.\n\n{_operationLogOutput}");
+
+                string errorDetail = !string.IsNullOrEmpty(lastErrorMessage)
+                    ? lastErrorMessage
+                    : $"makepkg2 upload exited with code {uploadExitCode}.";
+                SetErrorAndGoToErrorPage("Upload Failed", errorDetail);
                 return;
             }
 
@@ -652,8 +672,14 @@ private async void StartPackAndUploadAsync()
 
             var branchOrFlight = GetBranchOrFlightFromUISelection();
             _packageModelProvider.Package.BigId = BigId;
-            _packageModelProvider.Package.PackageType = "MSIXVC2";
+            _packageModelProvider.Package.PackageType = "PC";
             _packageModelProvider.Package.PackagePreviewImage = PackagePreviewImage;
+            _packageModelProvider.Package.PackageName = ProductName;
+            _packageModelProvider.Package.UploadSize = lastWrittenTotal;
+            _packageModelProvider.Package.Destination = BranchOrFlightDisplayName;
+            _packageModelProvider.Package.Market = MarketGroupName;
+            _packageModelProvider.Package.PackageIdentityName = PackageIdentityName;
+            _packageModelProvider.Package.FolderSize = EstimatedFolderSize;
             if (branchOrFlight != null)
             {
                 _packageModelProvider.Package.BranchId = branchOrFlight.CurrentDraftInstanceId;
diff --git a/src/PackageUploader.UI/ViewModel/UploadingFinishedViewModel.cs b/src/PackageUploader.UI/ViewModel/UploadingFinishedViewModel.cs
index 594b33af..20cb3b48 100644
--- a/src/PackageUploader.UI/ViewModel/UploadingFinishedViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/UploadingFinishedViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
 using Microsoft.Extensions.Logging;
@@ -27,25 +27,32 @@ public BitmapImage? PackagePreviewImage
             set => SetProperty(ref _packagePreviewImage, value);
         }
 
-        private string _packageFileName = string.Empty;
-        public string PackageFileName
+        private string _productName = string.Empty;
+        public string ProductName
         {
-            get => _packageFileName;
-            set => SetProperty(ref _packageFileName, value);
+            get => _productName;
+            set => SetProperty(ref _productName, value);
         }
 
-        private string _packageSize = string.Empty;
-        public string PackageSize
+        private string _destination = string.Empty;
+        public string Destination
         {
-            get => _packageSize;
-            set => SetProperty(ref _packageSize, value);
+            get => _destination;
+            set => SetProperty(ref _destination, value);
         }
 
-        private string _versionNum = string.Empty;
-        public string VersionNum
+        private string _market = string.Empty;
+        public string Market
         {
-            get => _versionNum;
-            set => SetProperty(ref _versionNum, value);
+            get => _market;
+            set => SetProperty(ref _market, value);
+        }
+
+        private string _packageIdentityName = string.Empty;
+        public string PackageIdentityName
+        {
+            get => _packageIdentityName;
+            set => SetProperty(ref _packageIdentityName, value);
         }
 
         private string _storeId = string.Empty;
@@ -55,6 +62,27 @@ public string StoreId
             set => SetProperty(ref _storeId, value);
         }
 
+        private string _folderSize = string.Empty;
+        public string FolderSize
+        {
+            get => _folderSize;
+            set => SetProperty(ref _folderSize, value);
+        }
+
+        private string _uploadSize = string.Empty;
+        public string UploadSize
+        {
+            get => _uploadSize;
+            set => SetProperty(ref _uploadSize, value);
+        }
+
+        private bool _hasUploadSize;
+        public bool HasUploadSize
+        {
+            get => _hasUploadSize;
+            set => SetProperty(ref _hasUploadSize, value);
+        }
+
         private string _packageType = string.Empty;
         public string PackageType
         {
@@ -87,22 +115,41 @@ public UploadingFinishedViewModel(
         public void OnAppearing()
         {
             PackagePreviewImage = _packageModelProvider.Package.PackagePreviewImage;
-            VersionNum = _packageModelProvider.Package.Version;
             StoreId = _packageModelProvider.Package.BigId;
+            PackageType = _packageModelProvider.Package.PackageType;
 
+            string packageName = _packageModelProvider.Package.PackageName;
             string packageFilePath = _packageModelProvider.Package.PackageFilePath;
-            if (!string.IsNullOrEmpty(packageFilePath) && File.Exists(packageFilePath))
+            if (!string.IsNullOrEmpty(packageName))
+            {
+                ProductName = packageName;
+            }
+            else if (!string.IsNullOrEmpty(packageFilePath) && File.Exists(packageFilePath))
             {
-                FileInfo packageInfo = new(packageFilePath);
-                PackageFileName = packageInfo.Name;
-                PackageSize = TranslateFileSize(packageInfo.Length);
+                ProductName = new FileInfo(packageFilePath).Name;
             }
             else
             {
-                PackageFileName = "Loose content upload";
-                PackageSize = string.Empty;
+                ProductName = "Loose content upload";
+            }
+
+            Destination = _packageModelProvider.Package.Destination;
+            Market = _packageModelProvider.Package.Market;
+
+            PackageIdentityName = _packageModelProvider.Package.PackageIdentityName;
+
+            FolderSize = _packageModelProvider.Package.FolderSize;
+
+            string uploadSize = _packageModelProvider.Package.UploadSize;
+            if (!string.IsNullOrEmpty(uploadSize))
+            {
+                UploadSize = uploadSize;
+                HasUploadSize = true;
+            }
+            else
+            {
+                HasUploadSize = false;
             }
-            PackageType = _packageModelProvider.Package.PackageType;
         }
 
         public void OnHome()
@@ -125,25 +172,5 @@ public void OnViewInPartnerCenter()
             string partnerCenterUrl = $"https://partner.microsoft.com/en-us/dashboard/products/{StoreId}/packages/{branchId}";
             _processStarterService.Start(new ProcessStartInfo(partnerCenterUrl) { UseShellExecute = true });
         }
-
-        private static string TranslateFileSize(long size)
-        {
-            if (size > 1024 * 1024 * 1024)
-            {
-                return $"{(size / 1024d / 1024d / 1024d):F2} GB"; // Format to 2 decimal places
-            }
-            else if (size > 1024 * 1024)
-            {
-                return $"{size / 1024 / 1024} MB"; // No need to include decimal places if the package is less than 1 GB.
-            }
-            else if (size > 1024)
-            {
-                return $"{size / 1024} KB";
-            }
-            else
-            {
-                return $"{size} B";
-            }
-        }
     }
 }

From fbb9c16a27b0c0547cf0e1562a4bbc5543f4567f Mon Sep 17 00:00:00 2001
From: Elshiekh Ahmed <elahmed@microsoft.com>
Date: Wed, 18 Mar 2026 14:08:53 -0700
Subject: [PATCH 06/10] MSIXVC2 Progress upload view

---
 .../ViewModel/Msixvc2UploadViewModelTest.cs   |  58 ---
 src/PackageUploader.UI/App.xaml.cs            |   2 +
 ...Msixvc2UploadStageToVisibilityConverter.cs |  39 ++
 .../Model/Msixvc2UploadStage.cs               |  14 +
 src/PackageUploader.UI/Model/PackageModel.cs  |   2 +
 .../Strings/Msixvc2Uploading.Designer.cs      | 135 +++++++
 .../Resources/Strings/Msixvc2Uploading.resx   |  85 ++++
 .../View/Msixvc2UploadView.xaml               |  79 ----
 .../View/Msixvc2UploadView.xaml.cs            |   1 -
 .../View/Msixvc2UploadingView.xaml            | 264 +++++++++++++
 .../View/Msixvc2UploadingView.xaml.cs         |  20 +
 .../ViewModel/Msixvc2UploadViewModel.cs       | 241 +-----------
 .../ViewModel/Msixvc2UploadingViewModel.cs    | 364 ++++++++++++++++++
 13 files changed, 946 insertions(+), 358 deletions(-)
 create mode 100644 src/PackageUploader.UI/Converters/Msixvc2UploadStageToVisibilityConverter.cs
 create mode 100644 src/PackageUploader.UI/Model/Msixvc2UploadStage.cs
 create mode 100644 src/PackageUploader.UI/Resources/Strings/Msixvc2Uploading.Designer.cs
 create mode 100644 src/PackageUploader.UI/Resources/Strings/Msixvc2Uploading.resx
 create mode 100644 src/PackageUploader.UI/View/Msixvc2UploadingView.xaml
 create mode 100644 src/PackageUploader.UI/View/Msixvc2UploadingView.xaml.cs
 create mode 100644 src/PackageUploader.UI/ViewModel/Msixvc2UploadingViewModel.cs

diff --git a/src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs b/src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs
index 6172d06e..3b8cb87b 100644
--- a/src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs
+++ b/src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs
@@ -49,37 +49,11 @@ public void Setup()
     public void Constructor_InitializesProperties()
     {
         Assert.AreEqual(string.Empty, _viewModel.ContentPath);
-        Assert.AreEqual(string.Empty, _viewModel.StatusMessage);
-        Assert.AreEqual(0, _viewModel.ProgressValue);
-        Assert.IsFalse(_viewModel.IsOperationInProgress);
         Assert.IsNotNull(_viewModel.UploadPackageCommand);
         Assert.IsNotNull(_viewModel.CancelButtonCommand);
         Assert.IsNotNull(_viewModel.BrowseContentPathCommand);
     }
 
-    [TestMethod]
-    public void IsOperationInProgress_SetAndGet()
-    {
-        _viewModel.IsOperationInProgress = true;
-        Assert.IsTrue(_viewModel.IsOperationInProgress);
-
-        _viewModel.IsOperationInProgress = false;
-        Assert.IsFalse(_viewModel.IsOperationInProgress);
-    }
-
-    [TestMethod]
-    public void StatusMessage_SetAndGet()
-    {
-        _viewModel.StatusMessage = "Packaging...";
-        Assert.AreEqual("Packaging...", _viewModel.StatusMessage);
-    }
-
-    [TestMethod]
-    public void ProgressValue_SetAndGet()
-    {
-        _viewModel.ProgressValue = 50;
-        Assert.AreEqual(50, _viewModel.ProgressValue);
-    }
     #endregion
 
     #region BuildUploadArguments Tests
@@ -129,30 +103,6 @@ public void BuildUploadArguments_NoStoreId_NotIncluded()
 
         Assert.IsFalse(args.Contains("/storeid"));
     }
-
-    [TestMethod]
-    public void BuildUploadArguments_WithSubValPath()
-    {
-        _viewModel.ContentPath = @"C:\game\content";
-        _viewModel.BranchOrFlightDisplayName = "Branch: Main";
-        _viewModel.MarketGroupName = "default";
-
-        string tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-        Directory.CreateDirectory(tempDir);
-
-        try
-        {
-            _viewModel.SubValPath = tempDir;
-
-            string args = _viewModel.BuildUploadArguments();
-
-            Assert.IsTrue(args.Contains($"/validationpath \"{tempDir}\""));
-        }
-        finally
-        {
-            Directory.Delete(tempDir);
-        }
-    }
     #endregion
 
     #region CanUpload (via UploadPackageCommand.CanExecute) Tests
@@ -165,14 +115,6 @@ public void CanUpload_ReturnsFalse_WhenContentPathEmpty()
         Assert.IsFalse(_viewModel.UploadPackageCommand.CanExecute(null));
     }
 
-    [TestMethod]
-    public void CanUpload_ReturnsFalse_WhenOperationInProgress()
-    {
-        _viewModel.IsOperationInProgress = true;
-
-        Assert.IsFalse(_viewModel.UploadPackageCommand.CanExecute(null));
-    }
-
     [TestMethod]
     public void CanUpload_ReturnsFalse_WhenNoBranchSelected()
     {
diff --git a/src/PackageUploader.UI/App.xaml.cs b/src/PackageUploader.UI/App.xaml.cs
index d37048d1..0d8a78e2 100644
--- a/src/PackageUploader.UI/App.xaml.cs
+++ b/src/PackageUploader.UI/App.xaml.cs
@@ -65,6 +65,7 @@ public App()
                 services.AddSingleton<UploadingFinishedViewModel>();
                 services.AddSingleton<ErrorScreenViewModel>();
                 services.AddSingleton<Msixvc2UploadViewModel>();
+                services.AddSingleton<Msixvc2UploadingViewModel>();
 
                 // Register Views
                 services.AddTransient<MainPageView>();
@@ -76,6 +77,7 @@ public App()
                 services.AddTransient<UploadingFinishedView>();
                 services.AddTransient<ErrorPageView>();
                 services.AddTransient<Msixvc2UploadView>();
+                services.AddTransient<Msixvc2UploadingView>();
 
                 // Register the main window
                 services.AddSingleton<MainWindow>();
diff --git a/src/PackageUploader.UI/Converters/Msixvc2UploadStageToVisibilityConverter.cs b/src/PackageUploader.UI/Converters/Msixvc2UploadStageToVisibilityConverter.cs
new file mode 100644
index 00000000..608b1d35
--- /dev/null
+++ b/src/PackageUploader.UI/Converters/Msixvc2UploadStageToVisibilityConverter.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using PackageUploader.UI.Model;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace PackageUploader.UI.Converters;
+
+internal class Msixvc2UploadStageToVisibilityConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is Msixvc2UploadStage stage && parameter is string stageName)
+        {
+            string[] range = stageName.Split('-');
+            if (range.Length == 2)
+            {
+                if (Enum.TryParse<Msixvc2UploadStage>(range[0], out var start) &&
+                    Enum.TryParse<Msixvc2UploadStage>(range[1], out var stop))
+                {
+                    return stage >= start && stage <= stop ? Visibility.Visible : Visibility.Collapsed;
+                }
+            }
+            else if (Enum.TryParse<Msixvc2UploadStage>(stageName, out var exact))
+            {
+                return stage == exact ? Visibility.Visible : Visibility.Collapsed;
+            }
+        }
+
+        return Visibility.Collapsed;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/src/PackageUploader.UI/Model/Msixvc2UploadStage.cs b/src/PackageUploader.UI/Model/Msixvc2UploadStage.cs
new file mode 100644
index 00000000..05e0fe4a
--- /dev/null
+++ b/src/PackageUploader.UI/Model/Msixvc2UploadStage.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace PackageUploader.UI.Model;
+
+public enum Msixvc2UploadStage
+{
+    NotStarted,
+    Preparing,
+    Uploading,
+    Validating,
+    Finalizing,
+    Done
+}
diff --git a/src/PackageUploader.UI/Model/PackageModel.cs b/src/PackageUploader.UI/Model/PackageModel.cs
index eb441201..d9caa6a4 100644
--- a/src/PackageUploader.UI/Model/PackageModel.cs
+++ b/src/PackageUploader.UI/Model/PackageModel.cs
@@ -25,4 +25,6 @@ public class PackageModel
     public string Market { get; set; } = string.Empty;
     public string PackageIdentityName { get; set; } = string.Empty;
     public string FolderSize { get; set; } = string.Empty;
+    public string UploadArguments { get; set; } = string.Empty;
+    public string MakePkg2Path { get; set; } = string.Empty;
 }
diff --git a/src/PackageUploader.UI/Resources/Strings/Msixvc2Uploading.Designer.cs b/src/PackageUploader.UI/Resources/Strings/Msixvc2Uploading.Designer.cs
new file mode 100644
index 00000000..28ce404e
--- /dev/null
+++ b/src/PackageUploader.UI/Resources/Strings/Msixvc2Uploading.Designer.cs
@@ -0,0 +1,135 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PackageUploader.UI.Resources.Strings {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Msixvc2Uploading {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Msixvc2Uploading() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PackageUploader.UI.Resources.Strings.Msixvc2Uploading", typeof(Msixvc2Uploading).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cancel upload.
+        /// </summary>
+        public static string CancelUploadButtonText {
+            get {
+                return ResourceManager.GetString("CancelUploadButtonText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Finalizing upload....
+        /// </summary>
+        public static string FinalizingText {
+            get {
+                return ResourceManager.GetString("FinalizingText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to % complete.
+        /// </summary>
+        public static string PercentCompleteText {
+            get {
+                return ResourceManager.GetString("PercentCompleteText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Preparing package....
+        /// </summary>
+        public static string PreparingText {
+            get {
+                return ResourceManager.GetString("PreparingText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Uploading package to Partner Center.
+        /// </summary>
+        public static string TitleText {
+            get {
+                return ResourceManager.GetString("TitleText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Uploading content....
+        /// </summary>
+        public static string UploadingContentText {
+            get {
+                return ResourceManager.GetString("UploadingContentText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Uploading.
+        /// </summary>
+        public static string UploadingText {
+            get {
+                return ResourceManager.GetString("UploadingText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Validating package....
+        /// </summary>
+        public static string ValidatingText {
+            get {
+                return ResourceManager.GetString("ValidatingText", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/PackageUploader.UI/Resources/Strings/Msixvc2Uploading.resx b/src/PackageUploader.UI/Resources/Strings/Msixvc2Uploading.resx
new file mode 100644
index 00000000..c331803f
--- /dev/null
+++ b/src/PackageUploader.UI/Resources/Strings/Msixvc2Uploading.resx
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="TitleText" xml:space="preserve">
+    <value>Uploading package to Partner Center</value>
+  </data>
+  <data name="UploadingText" xml:space="preserve">
+    <value>Uploading</value>
+  </data>
+  <data name="PercentCompleteText" xml:space="preserve">
+    <value>% complete</value>
+  </data>
+  <data name="PreparingText" xml:space="preserve">
+    <value>Preparing package...</value>
+  </data>
+  <data name="UploadingContentText" xml:space="preserve">
+    <value>Uploading content...</value>
+  </data>
+  <data name="ValidatingText" xml:space="preserve">
+    <value>Validating package...</value>
+  </data>
+  <data name="FinalizingText" xml:space="preserve">
+    <value>Finalizing upload...</value>
+  </data>
+  <data name="CancelUploadButtonText" xml:space="preserve">
+    <value>Cancel upload</value>
+  </data>
+</root>
diff --git a/src/PackageUploader.UI/View/Msixvc2UploadView.xaml b/src/PackageUploader.UI/View/Msixvc2UploadView.xaml
index 520620bf..ef0fa5e2 100644
--- a/src/PackageUploader.UI/View/Msixvc2UploadView.xaml
+++ b/src/PackageUploader.UI/View/Msixvc2UploadView.xaml
@@ -202,10 +202,6 @@
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="476"/>
@@ -274,67 +270,6 @@
                                     Width="90"
                                     Height="32"
                                     Margin="0,0,0,10"/>
-
-                            <!-- Validator path -->
-                            <TextBlock Grid.Row="2" Grid.Column="0"
-                                       Text="{x:Static strings:Msixvc2Upload.ValidatorPathTitleText}"
-                                       d:Text="Folder path for SubmissionValidator.dll"
-                                       Foreground="{DynamicResource PrimaryTextBrush}"
-                                       HorizontalAlignment="Left"
-                                       Margin="0,0,0,5"/>
-                            <TextBlock Grid.Row="2" Grid.Column="0"
-                                       Text="{x:Static strings:Msixvc2Upload.OptionalText}"
-                                       d:Text="Optional"
-                                       Foreground="{DynamicResource SecondaryTextBrush}"
-                                       HorizontalAlignment="Right"
-                                       Margin="0,0,10,5"/>
-                            <TextBox Grid.Row="3" Grid.Column="0"
-                                     x:Name="SubValPathTextBox"
-                                     AutomationProperties.HelpText="Submission Validator folder path"
-                                     Text="{Binding SubValPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                     Foreground="{DynamicResource PrimaryTextBrush}"
-                                     Background="{DynamicResource SecondaryButtonBrush}"
-                                     Margin="0,0,10,0">
-                                <TextBox.Style>
-                                    <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
-                                        <Setter Property="Template">
-                                            <Setter.Value>
-                                                <ControlTemplate TargetType="TextBox">
-                                                    <Border x:Name="Border"
-                                                            Background="{TemplateBinding Background}" 
-                                                            BorderBrush="{TemplateBinding BorderBrush}" 
-                                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                                            CornerRadius="6">
-                                                        <Grid>
-                                                            <TextBlock Text="{x:Static strings:Msixvc2Upload.ValidatorPathBoxDefaultText}"
-                                                                       d:Text="Select or enter the folder path for SubmissionValidator.dll" 
-                                                                       Foreground="{DynamicResource SecondaryTextBrush}"
-                                                                       VerticalAlignment="Center"
-                                                                       Visibility="{Binding Text.IsEmpty, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" 
-                                                                       Margin="15,2"/>
-                                                            <ScrollViewer x:Name="PART_ContentHost" 
-                                                                          Margin="5,2" 
-                                                                          VerticalAlignment="Center"/>
-                                                        </Grid>
-                                                    </Border>
-                                                    <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsFocused" Value="True">
-                                                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource TextEntryHighlightedBackgroundBrush}" />
-                                                        </Trigger>
-                                                    </ControlTemplate.Triggers>
-                                                </ControlTemplate>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </Style>
-                                </TextBox.Style>
-                            </TextBox>
-                            <Button Grid.Row="3" Grid.Column="1"
-                                    Content="{x:Static strings:Msixvc2Upload.BrowseText}"
-                                    d:Content="Browse"
-                                    AutomationProperties.HelpText="Browse to Submission Validator folder path"
-                                    Command="{Binding BrowseSubValPathCommand}"
-                                    Width="90"
-                                    Height="32"/>
                         </Grid>
                     </Expander>
                 </StackPanel>
@@ -634,20 +569,6 @@
                 </StackPanel>
             </Grid>
 
-            <!-- ============================================ -->
-            <!-- Progress section (visible during operation) -->
-            <!-- ============================================ -->
-            <StackPanel Margin="0,20,0,0"
-                        Visibility="{Binding IsOperationInProgress, Converter={StaticResource BooleanToVisibilityConverter}}">
-                <TextBlock Text="{Binding StatusMessage}"
-                           Foreground="{DynamicResource PrimaryTextBrush}"
-                           Margin="0,0,0,8"/>
-                <ProgressBar Value="{Binding ProgressValue}"
-                             Minimum="0"
-                             Maximum="100"
-                             Height="8"/>
-            </StackPanel>
-
             <!-- ============================================ -->
             <!-- Button panel                                 -->
             <!-- ============================================ -->
diff --git a/src/PackageUploader.UI/View/Msixvc2UploadView.xaml.cs b/src/PackageUploader.UI/View/Msixvc2UploadView.xaml.cs
index b99208e1..6b42358f 100644
--- a/src/PackageUploader.UI/View/Msixvc2UploadView.xaml.cs
+++ b/src/PackageUploader.UI/View/Msixvc2UploadView.xaml.cs
@@ -24,6 +24,5 @@ private void RegisterDragDropHandlers()
     {
         DragDropHelper.RegisterTextBoxDragDrop(ContentPathTextBox, _viewModel.ContentPathDroppedCommand, true);
         DragDropHelper.RegisterTextBoxDragDrop(MappingDataTextBox, path => _viewModel.MappingDataXmlPath = path, false);
-        DragDropHelper.RegisterTextBoxDragDrop(SubValPathTextBox, path => _viewModel.SubValPath = path, true);
     }
 }
diff --git a/src/PackageUploader.UI/View/Msixvc2UploadingView.xaml b/src/PackageUploader.UI/View/Msixvc2UploadingView.xaml
new file mode 100644
index 00000000..70a8a471
--- /dev/null
+++ b/src/PackageUploader.UI/View/Msixvc2UploadingView.xaml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             x:Class="PackageUploader.UI.View.Msixvc2UploadingView"
+             xmlns:viewmodel="clr-namespace:PackageUploader.UI.ViewModel"
+             xmlns:converters="clr-namespace:PackageUploader.UI.Converters"
+             xmlns:strings="clr-namespace:PackageUploader.UI.Resources.Strings"
+             mc:Ignorable="d"
+             d:DataContext="{d:DesignInstance Type=viewmodel:Msixvc2UploadingViewModel}"
+             Background="{DynamicResource AppBackgroundBrush}">
+    <UserControl.Resources>
+        <converters:Msixvc2UploadStageToVisibilityConverter x:Key="Msixvc2StageConverter" />
+        <Storyboard x:Key="RotateAnimation">
+            <DoubleAnimation
+                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                From="0"
+                To="360"
+                Duration="0:0:5"
+                RepeatBehavior="Forever" />
+        </Storyboard>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <!-- Icon -->
+            <RowDefinition Height="Auto"/>
+            <!-- Title -->
+            <RowDefinition Height="Auto"/>
+            <!-- Progress bar -->
+            <RowDefinition Height="Auto"/>
+            <!-- Upload stats -->
+            <RowDefinition Height="Auto"/>
+            <!-- Stage checkpoints -->
+            <RowDefinition Height="Auto"/>
+            <!-- Cancel button -->
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <!-- Hero icon -->
+        <Image Grid.Row="0"
+               Margin="0, 100, 0, 23"
+               Source="/Resources/Images/InProgress.png"
+               HorizontalAlignment="Center"
+               VerticalAlignment="Center"
+               Height="130"
+               Width="130" />
+
+        <!-- Title -->
+        <TextBlock Grid.Row="1"
+                   Margin="0, 0, 0, 23"
+                   Style="{StaticResource SubHeadline}"
+                   Text="{x:Static strings:Msixvc2Uploading.TitleText}"
+                   d:Text="Uploading package to Partner Center"
+                   Foreground="{DynamicResource PrimaryTextBrush}" />
+
+        <!-- Progress bar -->
+        <Grid Grid.Row="2"
+              Margin="300, 0, 300, 10">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <TextBlock Grid.Row="0"
+                       Grid.Column="0"
+                       Margin="0, 0, 0, 10"
+                       Text="{x:Static strings:Msixvc2Uploading.UploadingText}"
+                       d:Text="Uploading"
+                       Foreground="{DynamicResource PrimaryTextBrush}"
+                       HorizontalAlignment="Left"/>
+            <StackPanel Grid.Row="0"
+                        Grid.Column="1"
+                        Orientation="Horizontal"
+                        HorizontalAlignment="Right">
+                <TextBlock Text="{Binding UploadPercentage, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
+                           Foreground="{DynamicResource PrimaryTextBrush}"/>
+                <TextBlock Text="{x:Static strings:Msixvc2Uploading.PercentCompleteText}"
+                           d:Text="% complete"
+                           Foreground="{DynamicResource PrimaryTextBrush}" />
+            </StackPanel>
+            <ProgressBar Grid.Row="1"
+                         Grid.ColumnSpan="2"
+                         Minimum="0"
+                         Maximum="100"
+                         Value="{Binding UploadPercentage}"
+                         Visibility="Visible"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Height="3"/>
+        </Grid>
+
+        <!-- Upload stats (visible only during Uploading stage) -->
+        <TextBlock Grid.Row="3"
+                   Margin="300, 0, 300, 23"
+                   Text="{Binding UploadStats}"
+                   Foreground="{DynamicResource SecondaryTextBrush}"
+                   Visibility="{Binding ShowUploadStats, Converter={StaticResource BooleanToVisibilityConverter}}"
+                   HorizontalAlignment="Left"
+                   FontSize="12"/>
+
+        <!-- Stage checkpoints -->
+        <Grid Grid.Row="4" HorizontalAlignment="Center">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="28" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+
+            <!-- Row 0: Preparing -->
+            <!-- Spinning gear when Preparing is active -->
+            <Image Grid.Row="0" Grid.Column="0"
+                   Source="/Resources/AppIcon/Settings.png"
+                   Visibility="{Binding UploadStage, Converter={StaticResource Msixvc2StageConverter}, ConverterParameter=Preparing}"
+                   HorizontalAlignment="Center" VerticalAlignment="Center"
+                   Height="16" Width="16">
+                <Image.RenderTransform>
+                    <RotateTransform CenterX="8" CenterY="8" />
+                </Image.RenderTransform>
+                <Image.Triggers>
+                    <EventTrigger RoutedEvent="Image.Loaded">
+                        <BeginStoryboard Storyboard="{StaticResource RotateAnimation}" />
+                    </EventTrigger>
+                </Image.Triggers>
+            </Image>
+            <!-- Green check when past Preparing -->
+            <Image Grid.Row="0" Grid.Column="0"
+                   Source="/Resources/AppIcon/Accept.png"
+                   Visibility="{Binding UploadStage, Converter={StaticResource Msixvc2StageConverter}, ConverterParameter=Uploading-Done}"
+                   HorizontalAlignment="Center" VerticalAlignment="Center"
+                   Height="16" Width="16" />
+            <TextBlock Grid.Row="0" Grid.Column="1"
+                       Text="{x:Static strings:Msixvc2Uploading.PreparingText}"
+                       d:Text="Preparing package..."
+                       Foreground="{DynamicResource PrimaryTextBrush}"
+                       HorizontalAlignment="Left" VerticalAlignment="Center"/>
+
+            <!-- Row 1: Uploading -->
+            <!-- Grey clock when not yet reached -->
+            <ContentControl Grid.Row="1" Grid.Column="0"
+                            Template="{StaticResource ClockFaceWaitingTemplate}"
+                            Visibility="{Binding UploadStage, Converter={StaticResource Msixvc2StageConverter}, ConverterParameter=Preparing}"
+                            HorizontalAlignment="Center" VerticalAlignment="Center"
+                            Height="16" Width="16" />
+            <!-- Spinning gear when Uploading is active -->
+            <Image Grid.Row="1" Grid.Column="0"
+                   Source="/Resources/AppIcon/Settings.png"
+                   Visibility="{Binding UploadStage, Converter={StaticResource Msixvc2StageConverter}, ConverterParameter=Uploading}"
+                   HorizontalAlignment="Center" VerticalAlignment="Center"
+                   Height="16" Width="16">
+                <Image.RenderTransform>
+                    <RotateTransform CenterX="8" CenterY="8" />
+                </Image.RenderTransform>
+                <Image.Triggers>
+                    <EventTrigger RoutedEvent="Image.Loaded">
+                        <BeginStoryboard Storyboard="{StaticResource RotateAnimation}" />
+                    </EventTrigger>
+                </Image.Triggers>
+            </Image>
+            <!-- Green check when past Uploading -->
+            <Image Grid.Row="1" Grid.Column="0"
+                   Source="/Resources/AppIcon/Accept.png"
+                   Visibility="{Binding UploadStage, Converter={StaticResource Msixvc2StageConverter}, ConverterParameter=Validating-Done}"
+                   HorizontalAlignment="Center" VerticalAlignment="Center"
+                   Height="16" Width="16" />
+            <TextBlock Grid.Row="1" Grid.Column="1"
+                       Text="{x:Static strings:Msixvc2Uploading.UploadingContentText}"
+                       d:Text="Uploading content..."
+                       Foreground="{DynamicResource PrimaryTextBrush}"
+                       HorizontalAlignment="Left" VerticalAlignment="Center"/>
+
+            <!-- Row 2: Validating -->
+            <!-- Grey clock when not yet reached -->
+            <ContentControl Grid.Row="2" Grid.Column="0"
+                            Template="{StaticResource ClockFaceWaitingTemplate}"
+                            Visibility="{Binding UploadStage, Converter={StaticResource Msixvc2StageConverter}, ConverterParameter=Preparing-Uploading}"
+                            HorizontalAlignment="Center" VerticalAlignment="Center"
+                            Height="16" Width="16" />
+            <!-- Spinning gear when Validating is active -->
+            <Image Grid.Row="2" Grid.Column="0"
+                   Source="/Resources/AppIcon/Settings.png"
+                   Visibility="{Binding UploadStage, Converter={StaticResource Msixvc2StageConverter}, ConverterParameter=Validating}"
+                   HorizontalAlignment="Center" VerticalAlignment="Center"
+                   Height="16" Width="16">
+                <Image.RenderTransform>
+                    <RotateTransform CenterX="8" CenterY="8" />
+                </Image.RenderTransform>
+                <Image.Triggers>
+                    <EventTrigger RoutedEvent="Image.Loaded">
+                        <BeginStoryboard Storyboard="{StaticResource RotateAnimation}" />
+                    </EventTrigger>
+                </Image.Triggers>
+            </Image>
+            <!-- Green check when past Validating -->
+            <Image Grid.Row="2" Grid.Column="0"
+                   Source="/Resources/AppIcon/Accept.png"
+                   Visibility="{Binding UploadStage, Converter={StaticResource Msixvc2StageConverter}, ConverterParameter=Finalizing-Done}"
+                   HorizontalAlignment="Center" VerticalAlignment="Center"
+                   Height="16" Width="16" />
+            <TextBlock Grid.Row="2" Grid.Column="1"
+                       Text="{x:Static strings:Msixvc2Uploading.ValidatingText}"
+                       d:Text="Validating package..."
+                       Foreground="{DynamicResource PrimaryTextBrush}"
+                       HorizontalAlignment="Left" VerticalAlignment="Center"/>
+
+            <!-- Row 3: Finalizing -->
+            <!-- Grey clock when not yet reached -->
+            <ContentControl Grid.Row="3" Grid.Column="0"
+                            Template="{StaticResource ClockFaceWaitingTemplate}"
+                            Visibility="{Binding UploadStage, Converter={StaticResource Msixvc2StageConverter}, ConverterParameter=Preparing-Validating}"
+                            HorizontalAlignment="Center" VerticalAlignment="Center"
+                            Height="16" Width="16" />
+            <!-- Spinning gear when Finalizing is active -->
+            <Image Grid.Row="3" Grid.Column="0"
+                   Source="/Resources/AppIcon/Settings.png"
+                   Visibility="{Binding UploadStage, Converter={StaticResource Msixvc2StageConverter}, ConverterParameter=Finalizing}"
+                   HorizontalAlignment="Center" VerticalAlignment="Center"
+                   Height="16" Width="16">
+                <Image.RenderTransform>
+                    <RotateTransform CenterX="8" CenterY="8" />
+                </Image.RenderTransform>
+                <Image.Triggers>
+                    <EventTrigger RoutedEvent="Image.Loaded">
+                        <BeginStoryboard Storyboard="{StaticResource RotateAnimation}" />
+                    </EventTrigger>
+                </Image.Triggers>
+            </Image>
+            <!-- Green check when Done -->
+            <Image Grid.Row="3" Grid.Column="0"
+                   Source="/Resources/AppIcon/Accept.png"
+                   Visibility="{Binding UploadStage, Converter={StaticResource Msixvc2StageConverter}, ConverterParameter=Done}"
+                   HorizontalAlignment="Center" VerticalAlignment="Center"
+                   Height="16" Width="16" />
+            <TextBlock Grid.Row="3" Grid.Column="1"
+                       Text="{x:Static strings:Msixvc2Uploading.FinalizingText}"
+                       d:Text="Finalizing upload..."
+                       Foreground="{DynamicResource PrimaryTextBrush}"
+                       HorizontalAlignment="Left" VerticalAlignment="Center"/>
+        </Grid>
+
+        <!-- Cancel button -->
+        <StackPanel Grid.Row="5"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right">
+            <Button Content="{x:Static strings:Msixvc2Uploading.CancelUploadButtonText}"
+                    d:Content="Cancel upload"
+                    Command="{Binding CancelUploadCommand}"
+                    IsEnabled="True"
+                    Margin="0, 0, 50, 50"
+                    Width="150"
+                    Height="30"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Bottom"/>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/src/PackageUploader.UI/View/Msixvc2UploadingView.xaml.cs b/src/PackageUploader.UI/View/Msixvc2UploadingView.xaml.cs
new file mode 100644
index 00000000..4622d680
--- /dev/null
+++ b/src/PackageUploader.UI/View/Msixvc2UploadingView.xaml.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using PackageUploader.UI.ViewModel;
+
+namespace PackageUploader.UI.View;
+
+public partial class Msixvc2UploadingView : System.Windows.Controls.UserControl
+{
+    private readonly Msixvc2UploadingViewModel _viewModel;
+
+    public Msixvc2UploadingView(Msixvc2UploadingViewModel viewModel)
+    {
+        InitializeComponent();
+        DataContext = viewModel;
+        _viewModel = viewModel;
+
+        Loaded += (s, e) => _viewModel.OnAppearing();
+    }
+}
diff --git a/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
index e43c641b..7f242c76 100644
--- a/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.Diagnostics;
 using System.IO;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
@@ -30,10 +28,6 @@ public partial class Msixvc2UploadViewModel : BaseViewModel
     private GameProduct? _gameProduct = null;
     private IReadOnlyCollection<IGamePackageBranch>? _branchesAndFlights = null;
 
-    private Process? _makePkg2Process;
-    private string _operationLogOutput = string.Empty;
-    private string _lastLogFilePath = string.Empty;
-
     // Step 1 — Build location
     private string _contentPath = string.Empty;
     public string ContentPath
@@ -81,13 +75,6 @@ public string MappingDataXmlPath
         }
     }
 
-    private string _subValPath = string.Empty;
-    public string SubValPath
-    {
-        get => _subValPath;
-        set => SetProperty(ref _subValPath, value);
-    }
-
     // Step 2 — Destination
     private string _branchOrFlightDisplayName = string.Empty;
     public string BranchOrFlightDisplayName
@@ -213,37 +200,9 @@ public BitmapImage? PackagePreviewImage
         set => SetProperty(ref _packagePreviewImage, value);
     }
 
-    private bool _isOperationInProgress = false;
-    public bool IsOperationInProgress
-    {
-        get => _isOperationInProgress;
-        set
-        {
-            if (SetProperty(ref _isOperationInProgress, value))
-            {
-                CheckCanExecuteUploadCommand();
-            }
-        }
-    }
-
-    private string _statusMessage = string.Empty;
-    public string StatusMessage
-    {
-        get => _statusMessage;
-        set => SetProperty(ref _statusMessage, value);
-    }
-
-    private int _progressValue;
-    public int ProgressValue
-    {
-        get => _progressValue;
-        set => SetProperty(ref _progressValue, value);
-    }
-
     // Commands
     public ICommand BrowseContentPathCommand { get; }
     public ICommand BrowseMappingDataXmlPathCommand { get; }
-    public ICommand BrowseSubValPathCommand { get; }
     public ICommand ContentPathDroppedCommand { get; }
     public ICommand UploadPackageCommand { get; }
     public ICommand CancelButtonCommand { get; }
@@ -264,8 +223,7 @@ public Msixvc2UploadViewModel(IWindowService windowService,
 
         BrowseContentPathCommand = new RelayCommand(OnBrowseContentPath);
         BrowseMappingDataXmlPathCommand = new RelayCommand(OnBrowseMappingDataXml);
-        BrowseSubValPathCommand = new RelayCommand(OnBrowseSubValPath);
-        ContentPathDroppedCommand = new RelayCommand<string>(path =>
+        ContentPathDroppedCommand= new RelayCommand<string>(path =>
         {
             if (!string.IsNullOrEmpty(path))
             {
@@ -275,10 +233,6 @@ public Msixvc2UploadViewModel(IWindowService windowService,
         UploadPackageCommand = new RelayCommand(StartPackAndUploadAsync, CanUpload);
         CancelButtonCommand = new RelayCommand(() =>
         {
-            if (IsOperationInProgress && _makePkg2Process != null && !_makePkg2Process.HasExited)
-            {
-                _makePkg2Process.Kill(true);
-            }
             _windowService.NavigateTo(typeof(MainPageView));
         });
     }
@@ -306,15 +260,6 @@ private void OnBrowseMappingDataXml()
         }
     }
 
-    private void OnBrowseSubValPath()
-    {
-        var folderDialog = new FolderBrowserDialog();
-        if (folderDialog.ShowDialog() == DialogResult.OK)
-        {
-            SubValPath = folderDialog.SelectedPath;
-        }
-    }
-
     private void LoadGameConfigValues()
     {
         ContentPathError = string.Empty;
@@ -582,7 +527,6 @@ private bool CanUpload()
             && _gameProduct != null
             && !string.IsNullOrEmpty(BranchOrFlightDisplayName)
             && !string.IsNullOrEmpty(MarketGroupName)
-            && !IsOperationInProgress
             && !IsLoadingBranchesAndFlights
             && !IsLoadingMarkets;
     }
@@ -595,10 +539,8 @@ private void CheckCanExecuteUploadCommand()
         }
     }
 
-    private async void StartPackAndUploadAsync()
+    private void StartPackAndUploadAsync()
     {
-        if (IsOperationInProgress) return;
-
         string makePkg2Path = _pathConfigurationService.MakePkg2Path;
         if (string.IsNullOrEmpty(makePkg2Path) || !File.Exists(makePkg2Path))
         {
@@ -607,95 +549,26 @@ private async void StartPackAndUploadAsync()
             return;
         }
 
-        IsOperationInProgress = true;
-        StatusMessage = "Uploading loose content to Partner Center...";
-        ProgressValue = 0;
-        _operationLogOutput = string.Empty;
-
-        int lastReportedPct = -1;
-        string? lastErrorMessage = null;
-        string lastWrittenTotal = string.Empty;
+        string uploadArgs = BuildUploadArguments();
+        _logger.LogInformation("Navigating to upload progress page with args: {Arguments}", uploadArgs);
 
-        try
+        var branchOrFlight = GetBranchOrFlightFromUISelection();
+        _packageModelProvider.Package.BigId = BigId;
+        _packageModelProvider.Package.PackageType = "PC";
+        _packageModelProvider.Package.PackagePreviewImage = PackagePreviewImage;
+        _packageModelProvider.Package.PackageName = ProductName;
+        _packageModelProvider.Package.Destination = BranchOrFlightDisplayName;
+        _packageModelProvider.Package.Market = MarketGroupName;
+        _packageModelProvider.Package.PackageIdentityName = PackageIdentityName;
+        _packageModelProvider.Package.FolderSize = EstimatedFolderSize;
+        _packageModelProvider.Package.UploadArguments = uploadArgs;
+        _packageModelProvider.Package.MakePkg2Path = makePkg2Path;
+        if (branchOrFlight != null)
         {
-            string uploadArgs = BuildUploadArguments();
-            _logger.LogInformation("Starting makepkg2 loose upload: {Arguments}", uploadArgs);
-
-            int uploadExitCode = await RunMakePkg2ProcessAsync(uploadArgs, "Upload", line =>
-            {
-                var match = Regex.Match(line, @"([\d.]+ \S+) / ([\d.]+ \S+) read \(([\d.]+)%\).*?([\d.]+ \S+) / ([\d.]+ \S+) written \(([\d.]+)%\)");
-                if (match.Success)
-                {
-                    string readPct = match.Groups[3].Value;
-                    string writtenAmount = match.Groups[4].Value;
-                    string writtenTotal = match.Groups[5].Value;
-                    string writtenPct = match.Groups[6].Value;
-
-                    if (double.TryParse(writtenPct, out double wp))
-                    {
-                        int wholePct = (int)wp;
-                        if (wholePct != lastReportedPct)
-                        {
-                            lastReportedPct = wholePct;
-                            ProgressValue = wholePct;
-
-                            string phase = double.TryParse(readPct, out double rp) && rp < 100.0
-                                ? "Packaging & uploading"
-                                : "Uploading";
-                            StatusMessage = $"{phase}... {writtenAmount} / {writtenTotal} ({writtenPct}%)";
-                        }
-                        lastWrittenTotal = writtenTotal;
-                    }
-                }
-
-                if (line.Contains("fail:", StringComparison.OrdinalIgnoreCase)
-                    || line.Contains("Exception:", StringComparison.OrdinalIgnoreCase))
-                {
-                    lastErrorMessage = line;
-                }
-            });
-
-            if (uploadExitCode != 0)
-            {
-                _logger.LogError("makepkg2 upload failed with exit code {ExitCode}.", uploadExitCode);
-
-                string errorDetail = !string.IsNullOrEmpty(lastErrorMessage)
-                    ? lastErrorMessage
-                    : $"makepkg2 upload exited with code {uploadExitCode}.";
-                SetErrorAndGoToErrorPage("Upload Failed", errorDetail);
-                return;
-            }
-
-            ProgressValue = 100;
-            StatusMessage = "Upload complete!";
-            _logger.LogInformation("MSIXVC2 loose upload completed successfully.");
-
-            var branchOrFlight = GetBranchOrFlightFromUISelection();
-            _packageModelProvider.Package.BigId = BigId;
-            _packageModelProvider.Package.PackageType = "PC";
-            _packageModelProvider.Package.PackagePreviewImage = PackagePreviewImage;
-            _packageModelProvider.Package.PackageName = ProductName;
-            _packageModelProvider.Package.UploadSize = lastWrittenTotal;
-            _packageModelProvider.Package.Destination = BranchOrFlightDisplayName;
-            _packageModelProvider.Package.Market = MarketGroupName;
-            _packageModelProvider.Package.PackageIdentityName = PackageIdentityName;
-            _packageModelProvider.Package.FolderSize = EstimatedFolderSize;
-            if (branchOrFlight != null)
-            {
-                _packageModelProvider.Package.BranchId = branchOrFlight.CurrentDraftInstanceId;
-            }
-
-            NavigateOnUIThread(typeof(UploadingFinishedView));
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Unexpected error during MSIXVC2 upload.");
-            SetErrorAndGoToErrorPage("Unexpected Error", ex.ToString());
-        }
-        finally
-        {
-            IsOperationInProgress = false;
+            _packageModelProvider.Package.BranchId = branchOrFlight.CurrentDraftInstanceId;
         }
+
+        _windowService.NavigateTo(typeof(Msixvc2UploadingView));
     }
 
     internal string BuildUploadArguments()
@@ -723,90 +596,18 @@ internal string BuildUploadArguments()
             args += $" /storeid \"{BigId}\"";
         }
 
-        if (!string.IsNullOrEmpty(SubValPath) && Directory.Exists(SubValPath))
-        {
-            args += $" /validationpath \"{SubValPath}\"";
-        }
-
         args += " /auth Browser";
 
         return args;
     }
 
-    private Task<int> RunMakePkg2ProcessAsync(string arguments, string operationName, Action<string>? onOutputLine = null)
-    {
-        var tcs = new TaskCompletionSource<int>();
-        var processOutput = new List<string>();
-        var processErrors = new List<string>();
-
-        _makePkg2Process = new Process();
-        _makePkg2Process.StartInfo.FileName = _pathConfigurationService.MakePkg2Path;
-        _makePkg2Process.StartInfo.Arguments = arguments;
-        _makePkg2Process.StartInfo.RedirectStandardOutput = true;
-        _makePkg2Process.StartInfo.RedirectStandardError = true;
-        _makePkg2Process.StartInfo.CreateNoWindow = true;
-        _makePkg2Process.EnableRaisingEvents = true;
-
-        _makePkg2Process.OutputDataReceived += (s, e) =>
-        {
-            if (!string.IsNullOrEmpty(e.Data))
-            {
-                processOutput.Add(e.Data);
-                _logger.LogTrace("[{Op}] {Data}", operationName, e.Data);
-                onOutputLine?.Invoke(e.Data);
-            }
-        };
-
-        _makePkg2Process.ErrorDataReceived += (s, e) =>
-        {
-            if (!string.IsNullOrEmpty(e.Data))
-            {
-                processErrors.Add(e.Data);
-                _logger.LogWarning("[{Op}] stderr: {Data}", operationName, e.Data);
-            }
-        };
-
-        _makePkg2Process.Exited += (s, e) =>
-        {
-            _operationLogOutput = string.Join("\n", processOutput) + "\n" + string.Join("\n", processErrors);
-            WriteLogFile(operationName, _operationLogOutput);
-
-            if (!_makePkg2Process.HasExited)
-            {
-                _makePkg2Process.WaitForExit();
-            }
-            tcs.TrySetResult(_makePkg2Process.ExitCode);
-        };
-
-        _makePkg2Process.Start();
-        _makePkg2Process.BeginOutputReadLine();
-        _makePkg2Process.BeginErrorReadLine();
-
-        return tcs.Task;
-    }
-
     private void SetErrorAndGoToErrorPage(string title, string detail)
     {
         _errorModelProvider.Error.MainMessage = title;
         _errorModelProvider.Error.DetailMessage = detail;
         _errorModelProvider.Error.OriginPage = typeof(Msixvc2UploadView);
-        _errorModelProvider.Error.LogsPath = _lastLogFilePath;
-        NavigateOnUIThread(typeof(ErrorPageView));
-    }
-
-    private void NavigateOnUIThread(Type viewType)
-    {
-        System.Windows.Application.Current.Dispatcher.Invoke(() =>
-        {
-            _windowService.NavigateTo(viewType);
-        });
-    }
-
-    private void WriteLogFile(string operationName, string content)
-    {
-        _lastLogFilePath = Path.Combine(Path.GetTempPath(),
-            $"PackageUploader_UI_Msixvc2_{operationName}_{DateTime.Now:yyyyMMddHHmmss}.log");
-        File.WriteAllText(_lastLogFilePath, content);
+        _errorModelProvider.Error.LogsPath = string.Empty;
+        _windowService.NavigateTo(typeof(ErrorPageView));
     }
 
     private static BitmapImage LoadBitmapImage(string imagePath)
diff --git a/src/PackageUploader.UI/ViewModel/Msixvc2UploadingViewModel.cs b/src/PackageUploader.UI/ViewModel/Msixvc2UploadingViewModel.cs
new file mode 100644
index 00000000..c8b4089d
--- /dev/null
+++ b/src/PackageUploader.UI/ViewModel/Msixvc2UploadingViewModel.cs
@@ -0,0 +1,364 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.Diagnostics;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Windows.Input;
+using Microsoft.Extensions.Logging;
+using PackageUploader.UI.Model;
+using PackageUploader.UI.Providers;
+using PackageUploader.UI.Utility;
+using PackageUploader.UI.View;
+
+namespace PackageUploader.UI.ViewModel;
+
+public partial class Msixvc2UploadingViewModel : BaseViewModel
+{
+    private readonly IWindowService _windowService;
+    private readonly ILogger<Msixvc2UploadingViewModel> _logger;
+    private readonly ErrorModelProvider _errorModelProvider;
+    private readonly PackageModelProvider _packageModelProvider;
+
+    private Process? _makePkg2Process;
+    private string _operationLogOutput = string.Empty;
+    private string _lastLogFilePath = string.Empty;
+    private bool _isCancelled;
+
+    private int _uploadPercentage;
+    public int UploadPercentage
+    {
+        get => _uploadPercentage;
+        set => SetProperty(ref _uploadPercentage, value);
+    }
+
+    private Msixvc2UploadStage _uploadStage = Msixvc2UploadStage.NotStarted;
+    public Msixvc2UploadStage UploadStage
+    {
+        get => _uploadStage;
+        set => SetProperty(ref _uploadStage, value);
+    }
+
+    private string _uploadStats = string.Empty;
+    public string UploadStats
+    {
+        get => _uploadStats;
+        set => SetProperty(ref _uploadStats, value);
+    }
+
+    private bool _showUploadStats;
+    public bool ShowUploadStats
+    {
+        get => _showUploadStats;
+        set => SetProperty(ref _showUploadStats, value);
+    }
+
+    public ICommand CancelUploadCommand { get; }
+
+    public Msixvc2UploadingViewModel(
+        IWindowService windowService,
+        ILogger<Msixvc2UploadingViewModel> logger,
+        ErrorModelProvider errorModelProvider,
+        PackageModelProvider packageModelProvider)
+    {
+        _windowService = windowService;
+        _logger = logger;
+        _errorModelProvider = errorModelProvider;
+        _packageModelProvider = packageModelProvider;
+
+        CancelUploadCommand = new RelayCommand(CancelUpload);
+    }
+
+    public void OnAppearing()
+    {
+        _isCancelled = false;
+        UploadPercentage = 0;
+        UploadStage = Msixvc2UploadStage.Preparing;
+        UploadStats = string.Empty;
+        ShowUploadStats = false;
+
+        StartUploadAsync();
+    }
+
+    private async void StartUploadAsync()
+    {
+        var package = _packageModelProvider.Package;
+        string uploadArgs = package.UploadArguments;
+        string makePkg2Path = package.MakePkg2Path;
+
+        if (string.IsNullOrEmpty(uploadArgs) || string.IsNullOrEmpty(makePkg2Path))
+        {
+            SetErrorAndGoToErrorPage("Upload Error",
+                "Upload arguments or makepkg2 path not set. Please try again.");
+            return;
+        }
+
+        _operationLogOutput = string.Empty;
+        int lastReportedPct = -1;
+        string? lastErrorMessage = null;
+        string lastWrittenTotal = string.Empty;
+
+        try
+        {
+            _logger.LogInformation("Starting makepkg2 loose upload: {Arguments}", uploadArgs);
+
+            int exitCode = await RunMakePkg2ProcessAsync(makePkg2Path, uploadArgs, "Upload", line =>
+            {
+                if (UploadStage == Msixvc2UploadStage.Preparing)
+                {
+                    var progressMatch = Regex.Match(line,
+                        @"([\d.]+ \S+) / ([\d.]+ \S+) read \(([\d.]+)%\).*?([\d.]+ \S+) / ([\d.]+ \S+) written \(([\d.]+)%\)");
+                    if (progressMatch.Success)
+                    {
+                        UpdateStageOnUIThread(Msixvc2UploadStage.Uploading);
+                    }
+                }
+
+                var match = Regex.Match(line,
+                    @"([\d.]+ \S+) / ([\d.]+ \S+) read \(([\d.]+)%\).*?([\d.]+ \S+) / ([\d.]+ \S+) written \(([\d.]+)%\)");
+                if (match.Success)
+                {
+                    string writtenAmount = match.Groups[4].Value;
+                    string writtenTotal = match.Groups[5].Value;
+                    string writtenPct = match.Groups[6].Value;
+                    string writtenSpeed = string.Empty;
+
+                    var speedMatch = Regex.Match(line, @"written \([\d.]+%\) at ([\d.]+ \S+/s)");
+                    if (speedMatch.Success)
+                    {
+                        writtenSpeed = speedMatch.Groups[1].Value;
+                    }
+
+                    if (double.TryParse(writtenPct, out double wp))
+                    {
+                        int wholePct = (int)wp;
+                        if (wholePct != lastReportedPct)
+                        {
+                            lastReportedPct = wholePct;
+                            // Scale upload percentage to 0-80 range, reserving 80-100 for validating+finalizing
+                            int scaledPct = (int)(wp * 0.8);
+                            UpdatePercentageOnUIThread(scaledPct);
+
+                            string stats = !string.IsNullOrEmpty(writtenSpeed)
+                                ? $"{writtenAmount} / {writtenTotal} written at {writtenSpeed}"
+                                : $"{writtenAmount} / {writtenTotal} written";
+                            UpdateStatsOnUIThread(stats);
+                        }
+                        lastWrittenTotal = writtenTotal;
+                    }
+                }
+
+                if (line.Contains("NativeSubmissionValidator", StringComparison.OrdinalIgnoreCase) ||
+                    line.Contains("validating package", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (UploadStage < Msixvc2UploadStage.Validating)
+                    {
+                        UpdateStageOnUIThread(Msixvc2UploadStage.Validating);
+                        UpdatePercentageOnUIThread(82);
+                    }
+                }
+
+                if (line.Contains("Completed validating", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (UploadStage < Msixvc2UploadStage.Finalizing)
+                    {
+                        UpdateStageOnUIThread(Msixvc2UploadStage.Finalizing);
+                        UpdateFinalizingProgress(0, "Uploading validation log...");
+                    }
+                }
+
+                if (line.Contains("Ingest package", StringComparison.OrdinalIgnoreCase) &&
+                    !line.Contains("Ingested package", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (UploadStage == Msixvc2UploadStage.Finalizing)
+                    {
+                        UpdateFinalizingProgress(1, "Ingesting package...");
+                    }
+                }
+
+                if (line.Contains("Ingested package", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (UploadStage == Msixvc2UploadStage.Finalizing)
+                    {
+                        UpdateFinalizingProgress(2, "Committing package...");
+                    }
+                }
+
+                if (line.Contains("Successfully created package", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (UploadStage == Msixvc2UploadStage.Finalizing)
+                    {
+                        UpdateFinalizingProgress(3, "Upload complete!");
+                    }
+                }
+
+                if (line.Contains("fail:", StringComparison.OrdinalIgnoreCase) ||
+                    line.Contains("Exception:", StringComparison.OrdinalIgnoreCase))
+                {
+                    lastErrorMessage = line;
+                }
+            });
+
+            if (_isCancelled) return;
+
+            if (exitCode != 0)
+            {
+                _logger.LogError("makepkg2 upload failed with exit code {ExitCode}.", exitCode);
+                string errorDetail = !string.IsNullOrEmpty(lastErrorMessage)
+                    ? lastErrorMessage
+                    : $"makepkg2 upload exited with code {exitCode}.";
+                SetErrorAndGoToErrorPage("Upload Failed", errorDetail);
+                return;
+            }
+
+            UpdateStageOnUIThread(Msixvc2UploadStage.Done);
+            UpdatePercentageOnUIThread(100);
+            _packageModelProvider.Package.UploadSize = lastWrittenTotal;
+            _logger.LogInformation("MSIXVC2 loose upload completed successfully.");
+
+            System.Windows.Application.Current.Dispatcher.Invoke(() =>
+            {
+                _windowService.NavigateTo(typeof(UploadingFinishedView));
+            });
+        }
+        catch (Exception ex)
+        {
+            if (_isCancelled) return;
+
+            _logger.LogError(ex, "Unexpected error during MSIXVC2 upload.");
+            SetErrorAndGoToErrorPage("Unexpected Error", ex.ToString());
+        }
+    }
+
+    private Task<int> RunMakePkg2ProcessAsync(string exePath, string arguments, string operationName, Action<string>? onOutputLine = null)
+    {
+        var tcs = new TaskCompletionSource<int>();
+        var processOutput = new List<string>();
+        var processErrors = new List<string>();
+
+        _makePkg2Process = new Process();
+        _makePkg2Process.StartInfo.FileName = exePath;
+        _makePkg2Process.StartInfo.Arguments = arguments;
+        _makePkg2Process.StartInfo.RedirectStandardOutput = true;
+        _makePkg2Process.StartInfo.RedirectStandardError = true;
+        _makePkg2Process.StartInfo.CreateNoWindow = true;
+        _makePkg2Process.EnableRaisingEvents = true;
+
+        _makePkg2Process.OutputDataReceived += (s, e) =>
+        {
+            if (!string.IsNullOrEmpty(e.Data))
+            {
+                processOutput.Add(e.Data);
+                _logger.LogTrace("[{Op}] {Data}", operationName, e.Data);
+                onOutputLine?.Invoke(e.Data);
+            }
+        };
+
+        _makePkg2Process.ErrorDataReceived += (s, e) =>
+        {
+            if (!string.IsNullOrEmpty(e.Data))
+            {
+                processErrors.Add(e.Data);
+                _logger.LogWarning("[{Op}] stderr: {Data}", operationName, e.Data);
+            }
+        };
+
+        _makePkg2Process.Exited += (s, e) =>
+        {
+            _operationLogOutput = string.Join("\n", processOutput) + "\n" + string.Join("\n", processErrors);
+            WriteLogFile(operationName, _operationLogOutput);
+
+            if (!_makePkg2Process.HasExited)
+            {
+                _makePkg2Process.WaitForExit();
+            }
+            tcs.TrySetResult(_makePkg2Process.ExitCode);
+        };
+
+        _makePkg2Process.Start();
+        _makePkg2Process.BeginOutputReadLine();
+        _makePkg2Process.BeginErrorReadLine();
+
+        return tcs.Task;
+    }
+
+    private void CancelUpload()
+    {
+        _isCancelled = true;
+
+        if (_makePkg2Process != null && !_makePkg2Process.HasExited)
+        {
+            _makePkg2Process.Kill(true);
+        }
+
+        System.Windows.Application.Current.Dispatcher.Invoke(() =>
+        {
+            _windowService.NavigateTo(typeof(Msixvc2UploadView));
+        });
+    }
+
+    private void UpdatePercentageOnUIThread(int pct)
+    {
+        System.Windows.Application.Current.Dispatcher.Invoke(() =>
+        {
+            UploadPercentage = pct;
+        });
+    }
+
+    private void UpdateStageOnUIThread(Msixvc2UploadStage stage)
+    {
+        System.Windows.Application.Current.Dispatcher.Invoke(() =>
+        {
+            UploadStage = stage;
+            ShowUploadStats = stage == Msixvc2UploadStage.Uploading || stage == Msixvc2UploadStage.Finalizing;
+            if (stage != Msixvc2UploadStage.Uploading && stage != Msixvc2UploadStage.Finalizing)
+            {
+                UploadStats = string.Empty;
+            }
+        });
+    }
+
+    private void UpdateStatsOnUIThread(string stats)
+    {
+        System.Windows.Application.Current.Dispatcher.Invoke(() =>
+        {
+            UploadStats = stats;
+            ShowUploadStats = true;
+        });
+    }
+
+    // Finalizing has 4 sub-steps (0-3), mapped to percentage increments within the finalizing range
+    private void UpdateFinalizingProgress(int subStep, string statusText)
+    {
+        // Map sub-steps 0-3 to percentage 85-100
+        int pct = 85 + (subStep * 5);
+        if (pct > 100) pct = 100;
+
+        System.Windows.Application.Current.Dispatcher.Invoke(() =>
+        {
+            UploadPercentage = pct;
+            UploadStats = statusText;
+            ShowUploadStats = true;
+        });
+    }
+
+    private void SetErrorAndGoToErrorPage(string title, string detail)
+    {
+        _errorModelProvider.Error.MainMessage = title;
+        _errorModelProvider.Error.DetailMessage = detail;
+        _errorModelProvider.Error.OriginPage = typeof(Msixvc2UploadView);
+        _errorModelProvider.Error.LogsPath = _lastLogFilePath;
+
+        System.Windows.Application.Current.Dispatcher.Invoke(() =>
+        {
+            _windowService.NavigateTo(typeof(ErrorPageView));
+        });
+    }
+
+    private void WriteLogFile(string operationName, string content)
+    {
+        _lastLogFilePath = Path.Combine(Path.GetTempPath(),
+            $"PackageUploader_UI_Msixvc2_{operationName}_{DateTime.Now:yyyyMMddHHmmss}.log");
+        File.WriteAllText(_lastLogFilePath, content);
+    }
+}

From fea7f11728948dc44b65177af664ef42a7ff6318 Mon Sep 17 00:00:00 2001
From: Elshiekh Ahmed <elahmed@microsoft.com>
Date: Tue, 24 Mar 2026 09:34:53 -0700
Subject: [PATCH 07/10] Legacy upload path completion page properly displays
 metadata

---
 .../ViewModel/PackageUploadViewModel.cs                   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/PackageUploader.UI/ViewModel/PackageUploadViewModel.cs b/src/PackageUploader.UI/ViewModel/PackageUploadViewModel.cs
index 7f13ae9a..fe777238 100644
--- a/src/PackageUploader.UI/ViewModel/PackageUploadViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/PackageUploadViewModel.cs
@@ -880,7 +880,13 @@ private async void UploadPackageProcessAsync()
 
             timer.Stop();
             // SuccessMessage = $"Package uploaded successfully in {timer.Elapsed:hh\\:mm\\:ss}.";
-            
+
+            Package.PackageName = ProductName;
+            Package.Destination = BranchOrFlightDisplayName;
+            Package.Market = MarketGroupName;
+            Package.PackageIdentityName = PackageId;
+            Package.FolderSize = PackageSize;
+
             // After successful upload, navigate to upload finished page
             System.Windows.Application.Current.Dispatcher.Invoke(() =>
             {

From cfb0405f6d06a17c8230f33a4b692e4a50801bda Mon Sep 17 00:00:00 2001
From: Elshiekh Ahmed <elahmed@microsoft.com>
Date: Tue, 24 Mar 2026 13:44:16 -0700
Subject: [PATCH 08/10] Defaults to main branch before upload

---
 src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
index 7f242c76..47af4ab4 100644
--- a/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
@@ -358,6 +358,10 @@ private async void GetProductInfoAsync()
                     displayNames.Add("Flight: " + branch.Name);
             }
             BranchAndFlightNames = [.. displayNames];
+
+            string mainBranch = displayNames.FirstOrDefault(n => n.Equals("Branch: Main", StringComparison.OrdinalIgnoreCase), string.Empty);
+            BranchOrFlightDisplayName = !string.IsNullOrEmpty(mainBranch) ? mainBranch : BranchAndFlightNames.FirstOrDefault(string.Empty);
+            OnPropertyChanged(nameof(BranchOrFlightDisplayName));
         }
         catch (Exception ex)
         {

From 017271750514f4a788cf3250109daae7ad4a4eac Mon Sep 17 00:00:00 2001
From: Elshiekh Ahmed <elahmed@microsoft.com>
Date: Tue, 24 Mar 2026 14:37:33 -0700
Subject: [PATCH 09/10] Tool uses cacheableBrowser

---
 src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
index 47af4ab4..9d15c81f 100644
--- a/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/Msixvc2UploadViewModel.cs
@@ -600,7 +600,7 @@ internal string BuildUploadArguments()
             args += $" /storeid \"{BigId}\"";
         }
 
-        args += " /auth Browser";
+        args += " /auth CacheableBrowser";
 
         return args;
     }

From 6c6f98563daf9d616d5bb2e17bad3f032b49f708 Mon Sep 17 00:00:00 2001
From: Elshiekh Ahmed <elahmed@microsoft.com>
Date: Tue, 24 Mar 2026 14:51:21 -0700
Subject: [PATCH 10/10] Error message appearing if Makepkg2 tool is not
 available

---
 .../ViewModel/Msixvc2UploadViewModelTest.cs   |  2 +-
 .../Resources/Strings/MainPage.Designer.cs    |  9 +++++++++
 .../Resources/Strings/MainPage.resx           |  3 +++
 src/PackageUploader.UI/View/MainPageView.xaml |  7 +++++++
 .../ViewModel/MainPageViewModel.cs            | 20 +++++++++++++++++++
 5 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs b/src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs
index 3b8cb87b..2e0e04e0 100644
--- a/src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs
+++ b/src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs
@@ -73,7 +73,7 @@ public void BuildUploadArguments_WithBranch()
         Assert.IsFalse(args.Contains("/flight"));
         Assert.IsTrue(args.Contains("/market \"default\""));
         Assert.IsTrue(args.Contains("/storeid \"9ABC123DEF456\""));
-        Assert.IsTrue(args.Contains("/auth Browser"));
+        Assert.IsTrue(args.Contains("/auth CacheableBrowser"));
     }
 
     [TestMethod]
diff --git a/src/PackageUploader.UI/Resources/Strings/MainPage.Designer.cs b/src/PackageUploader.UI/Resources/Strings/MainPage.Designer.cs
index 0d09d117..994a08f7 100644
--- a/src/PackageUploader.UI/Resources/Strings/MainPage.Designer.cs
+++ b/src/PackageUploader.UI/Resources/Strings/MainPage.Designer.cs
@@ -186,6 +186,15 @@ public static string Msixvc2ButtonText {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to MSIXVC2 upload requires makepkg2 tools, available as a preview in the April 2026 GDK. Install the April 2026 GDK to get started..
+        /// </summary>
+        public static string MakePkg2NotFoundErrorMsg {
+            get {
+                return ResourceManager.GetString("MakePkg2NotFoundErrorMsg", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Upload Loose Files (PC only).
         /// </summary>
diff --git a/src/PackageUploader.UI/Resources/Strings/MainPage.resx b/src/PackageUploader.UI/Resources/Strings/MainPage.resx
index 2bf5ae4b..1d944b64 100644
--- a/src/PackageUploader.UI/Resources/Strings/MainPage.resx
+++ b/src/PackageUploader.UI/Resources/Strings/MainPage.resx
@@ -197,4 +197,7 @@
   <data name="Msixvc2ButtonText" xml:space="preserve">
     <value>Get started</value>
   </data>
+  <data name="MakePkg2NotFoundErrorMsg" xml:space="preserve">
+    <value>MSIXVC2 upload requires makepkg2 tools, available as a preview in the April 2026 GDK. Install the April 2026 GDK to get started.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/PackageUploader.UI/View/MainPageView.xaml b/src/PackageUploader.UI/View/MainPageView.xaml
index 99fe8164..28dd74df 100644
--- a/src/PackageUploader.UI/View/MainPageView.xaml
+++ b/src/PackageUploader.UI/View/MainPageView.xaml
@@ -204,9 +204,16 @@
                     <Button Content="{x:Static strings:MainPage.Msixvc2ButtonText}"
                         d:Content="Get started"
                         Command="{Binding NavigateToMsixvc2Command}"
+                        IsEnabled="{Binding IsMakePkg2Enabled}"
                         HorizontalAlignment="Left"
                         Margin="0,15,0,10"
                         Width="128" />
+
+                    <TextBlock Text="{Binding MakePkg2UnavailableErrorMessage}"
+                        Foreground="{DynamicResource ErrorRedBrush}"
+                        Visibility="{Binding IsMakePkg2Enabled, Converter={StaticResource InverseBooleanConverter}, ConverterParameter=Visibility}"
+                        TextWrapping="Wrap"
+                        Margin="0,0,0,5" />
                 </StackPanel>
             </Border>
         </Grid>
diff --git a/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs b/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
index 98239bba..69a066d3 100644
--- a/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
+++ b/src/PackageUploader.UI/ViewModel/MainPageViewModel.cs
@@ -45,6 +45,20 @@ public string MakePkgUnavailableErrorMessage
         set => SetProperty(ref _makePkgUnavailableErrorMessage, value);
     }
 
+    private bool _isMakePkg2Enabled = true;
+    public bool IsMakePkg2Enabled
+    {
+        get => _isMakePkg2Enabled;
+        set => SetProperty(ref _isMakePkg2Enabled, value);
+    }
+
+    private string _makePkg2UnavailableErrorMessage = string.Empty;
+    public string MakePkg2UnavailableErrorMessage
+    {
+        get => _makePkg2UnavailableErrorMessage;
+        set => SetProperty(ref _makePkg2UnavailableErrorMessage, value);
+    }
+
     public bool IsUserLoggedIn
     {
         get => _userLoggedInProvider.UserLoggedIn;
@@ -224,6 +238,12 @@ public MainPageViewModel(
         if (File.Exists(makePkg2Path))
         {
             _pathConfigurationService.MakePkg2Path = makePkg2Path;
+            IsMakePkg2Enabled = true;
+        }
+        else
+        {
+            IsMakePkg2Enabled = false;
+            MakePkg2UnavailableErrorMessage = Resources.Strings.MainPage.MakePkg2NotFoundErrorMsg;
         }
 
         // Log version of the tool