Skip to content

Add MSIXVC2 packaging toggle to "Make a game package" #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WilliamsJason merged 8 commits into from
May 15, 2026
Merged

Add MSIXVC2 packaging toggle to "Make a game package" #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f47f36
Gating for incoming "Use MSIXVC2 pack" button
elahmed-microsoft May 6, 2026
3b89e3e
Build the command-line arguments and select the executable based on w…
elahmed-microsoft May 6, 2026
e659df1
MSIXVC2 toggle (only visible when makepkg2.exe is installed)
elahmed-microsoft May 7, 2026
73104bf
Indeterminate progress bar for MSIXVC2 packaging as no progress is su…
elahmed-microsoft May 7, 2026
0d134e4
submission validator explicit error logging
elahmed-microsoft May 11, 2026
ca7b5e6
Transitioned from using an indeterminant progress bar for MSIXVC2 to …
elahmed-microsoft May 12, 2026
9abf2fa
Added /updatesubval flag on every makepkg2 call to ensure latest version
elahmed-microsoft May 12, 2026
f62798c
minor change: added spacing in progress bar text between "packaging u…
elahmed-microsoft May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/PackageUploader.UI/Providers/PackingProgressPercentageProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,22 @@ public bool PackingCancelled
}
}

private bool _isMsixvc2;
public bool IsMsixvc2
{
get => _isMsixvc2;
set
{
_isMsixvc2 = value;
OnPropertyChanged(nameof(IsMsixvc2));
}
}

public PackingProgressPercentageProvider()
{
_packingProgressPercentage = 0;
_packingCancelled = false;
_isMsixvc2 = false;
}

public event PropertyChangedEventHandler? PropertyChanged;
Expand Down
9 changes: 9 additions & 0 deletions src/PackageUploader.UI/Resources/Strings/PackageCreation.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/PackageUploader.UI/Resources/Strings/PackageCreation.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,4 +237,7 @@
<data name="ValidatorPathTitleText" xml:space="preserve">
<value>Folder path for SubmissionValidator.dll</value>
</data>
<data name="UseMsixvc2Text" xml:space="preserve">
<value>Package as MSIXVC2 (.msixvc)</value>
</data>
</root>
20 changes: 19 additions & 1 deletion src/PackageUploader.UI/Resources/Strings/PackagingProgress.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/PackageUploader.UI/Resources/Strings/PackagingProgress.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,10 @@
<data name="VerifyingPackageContentsText" xml:space="preserve">
<value>Verifying package contents...</value>
</data>
<data name="PackingMsixvc2Text" xml:space="preserve">
<value>Packaging using MSIXVC2...</value>
</data>
<data name="PackagingDataText" xml:space="preserve">
<value>Packaging data...</value>
</data>
</root>
11 changes: 11 additions & 0 deletions src/PackageUploader.UI/View/PackageCreationView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
Expand Down Expand Up @@ -506,6 +507,16 @@
HorizontalAlignment="Left"
TextWrapping="Wrap"/>
</StackPanel>

<CheckBox Grid.Row="5" Grid.Column="0"
Content="{x:Static strings:PackageCreation.UseMsixvc2Text}"
d:Content="Package as MSIXVC2 (.msixvc)"
IsChecked="{Binding UseMsixvc2}"
Visibility="{Binding IsMakePkg2Available, Converter={StaticResource BooleanToVisibilityConverter}}"
Foreground="{DynamicResource PrimaryTextBrush}"
HorizontalAlignment="Left"
VerticalContentAlignment="Center"
Margin="0,10,0,0"/>
</Grid>
</StackPanel>
<Rectangle Grid.Column="2" Grid.RowSpan="2" Width="1" Fill="{DynamicResource BorderBrush}" Margin="10,0" />
Expand Down
147 changes: 80 additions & 67 deletions src/PackageUploader.UI/View/PackagingProgressView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,72 +23,75 @@
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<!-- picture -->
<RowDefinition Height="Auto"/>
<!-- heading -->
<RowDefinition Height="Auto"/>
<!-- progress bars bundle-->
<RowDefinition Height="Auto"/>
<!-- updating labels -->
<RowDefinition Height="Auto"/>
<!-- cancel button? -->
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Image Grid.Row="0"
Margin="{DynamicResource ProgressImageMargin}"
Source="/Resources/Images/InProgress.png"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Height="{DynamicResource StatusImageSize}"
Width="{DynamicResource StatusImageSize}"/>
<TextBlock Grid.Row="1"
Margin="{DynamicResource ProgressHeadingMargin}"
Style="{StaticResource SubHeadline}"
Text="{x:Static strings:PackagingProgress.PackagingProgressTitleText}"
d:Text="Getting your package ready..."
Foreground="{DynamicResource PrimaryTextBrush}" />
<!-- Loading Bar -->
<Grid Grid.Row="2"
Margin="{DynamicResource ProgressSectionMargin}"
MaxWidth="{DynamicResource ProgressBarMaxWidth}"
HorizontalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0"
Grid.Column="0"
Margin="0, 0, 0, 10"
d:Text="Packaging..."
Text="{x:Static strings:PackagingProgress.PackingText}"
Foreground="{DynamicResource PrimaryTextBrush}"
HorizontalAlignment="Left"/>
<StackPanel Grid.Row="0"
Grid.Column="1"
Orientation="Horizontal"
HorizontalAlignment="Right">
<TextBlock Text="{Binding PackingProgressPercentage, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
Foreground="{DynamicResource PrimaryTextBrush}"/>
<TextBlock Text="{x:Static strings:PackagingProgress.PercentComplete}"
d:Text="% complete"
Foreground="{DynamicResource PrimaryTextBrush}" />
</StackPanel>
<ProgressBar Grid.Row="1"
Grid.ColumnSpan="2"
Margin="0, 0, 0, 23"
Minimum="0"
Maximum="100"
Value="{Binding PackingProgressPercentage}"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Height="3"/>
</Grid>
<!-- updating labels -->
<Grid Grid.Row="3" HorizontalAlignment="Center">
<StackPanel Grid.Row="0"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<Image Margin="{DynamicResource ProgressImageMargin}"
Source="/Resources/Images/InProgress.png"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Height="{DynamicResource StatusImageSize}"
Width="{DynamicResource StatusImageSize}"/>
<TextBlock Margin="{DynamicResource ProgressHeadingMargin}"
Style="{StaticResource SubHeadline}"
Text="{x:Static strings:PackagingProgress.PackagingProgressTitleText}"
d:Text="Getting your package ready..."
HorizontalAlignment="Center"
Foreground="{DynamicResource PrimaryTextBrush}" />
<!-- Loading Bar -->
<Grid Margin="{DynamicResource ProgressSectionMargin}"
MaxWidth="{DynamicResource ProgressBarMaxWidth}"
HorizontalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0"
Grid.Column="0"
Margin="0, 0, 0, 10"
d:Text="Packaging..."
Text="{x:Static strings:PackagingProgress.PackingText}"
Foreground="{DynamicResource PrimaryTextBrush}"
HorizontalAlignment="Left"
Visibility="{Binding IsMsixvc2, Converter={StaticResource BooleanToVisibilityConverter}, ConverterParameter=Invert}"/>
<TextBlock Grid.Row="0"
Grid.Column="0"
Margin="0, 0, 0, 10"
d:Text="Packaging using MSIXVC2..."
Text="{x:Static strings:PackagingProgress.PackingMsixvc2Text}"
Foreground="{DynamicResource PrimaryTextBrush}"
HorizontalAlignment="Left"
Visibility="{Binding IsMsixvc2, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<StackPanel Grid.Row="0"
Grid.Column="1"
Orientation="Horizontal"
HorizontalAlignment="Right"
Margin="5, 0, 0, 0">
<TextBlock Text="{Binding PackingProgressPercentage, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
Foreground="{DynamicResource PrimaryTextBrush}"/>
<TextBlock Text="{x:Static strings:PackagingProgress.PercentComplete}"
d:Text="% complete"
Foreground="{DynamicResource PrimaryTextBrush}" />
</StackPanel>
<ProgressBar Grid.Row="1"
Grid.ColumnSpan="2"
Margin="0, 0, 0, 23"
Minimum="0"
Maximum="100"
Value="{Binding PackingProgressPercentage}"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Height="3"/>
</Grid>
<!-- Updating labels -->
<Grid HorizontalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
Expand Down Expand Up @@ -174,7 +177,16 @@
Foreground="{DynamicResource PrimaryTextBrush}"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Margin="0, 30, 0, 0"/>
Margin="0, 30, 0, 0"
Visibility="{Binding IsMsixvc2, Converter={StaticResource BooleanToVisibilityConverter}, ConverterParameter=Invert}"/>
<TextBlock Grid.Row="1" Grid.Column="1"
Text="{x:Static strings:PackagingProgress.PackagingDataText}"
d:Text="Packaging data..."
Foreground="{DynamicResource PrimaryTextBrush}"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Margin="0, 30, 0, 0"
Visibility="{Binding IsMsixvc2, Converter={StaticResource BooleanToVisibilityConverter}}"/>
<!-- Row 3 -->
<ContentControl Grid.Row="2"
Grid.Column="0"
Expand Down Expand Up @@ -219,8 +231,9 @@
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
Margin="0, 30, 0, 0"/>
</Grid>
<StackPanel Grid.Row="4"
</Grid>
</StackPanel>
<StackPanel Grid.Row="1"
Orientation="Horizontal"
HorizontalAlignment="Right">
<Button Content="{x:Static strings:PackagingProgress.CancelPackagingButtonContentText}"
Expand Down
Loading
Loading