diff --git a/src/PackageUploader.UI/Providers/PackingProgressPercentageProvider.cs b/src/PackageUploader.UI/Providers/PackingProgressPercentageProvider.cs index 05b72c1a..518872a2 100644 --- a/src/PackageUploader.UI/Providers/PackingProgressPercentageProvider.cs +++ b/src/PackageUploader.UI/Providers/PackingProgressPercentageProvider.cs @@ -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; diff --git a/src/PackageUploader.UI/Resources/Strings/PackageCreation.Designer.cs b/src/PackageUploader.UI/Resources/Strings/PackageCreation.Designer.cs index 3a94b78a..22c9eeef 100644 --- a/src/PackageUploader.UI/Resources/Strings/PackageCreation.Designer.cs +++ b/src/PackageUploader.UI/Resources/Strings/PackageCreation.Designer.cs @@ -419,5 +419,14 @@ public static string ValidatorPathTitleText { return ResourceManager.GetString("ValidatorPathTitleText", resourceCulture); } } + + /// + /// Looks up a localized string similar to Package as MSIXVC2 (.msixvc). + /// + public static string UseMsixvc2Text { + get { + return ResourceManager.GetString("UseMsixvc2Text", resourceCulture); + } + } } } diff --git a/src/PackageUploader.UI/Resources/Strings/PackageCreation.resx b/src/PackageUploader.UI/Resources/Strings/PackageCreation.resx index 0fc7fa65..bf8105b8 100644 --- a/src/PackageUploader.UI/Resources/Strings/PackageCreation.resx +++ b/src/PackageUploader.UI/Resources/Strings/PackageCreation.resx @@ -237,4 +237,7 @@ Folder path for SubmissionValidator.dll + + Package as MSIXVC2 (.msixvc) + \ No newline at end of file diff --git a/src/PackageUploader.UI/Resources/Strings/PackagingProgress.Designer.cs b/src/PackageUploader.UI/Resources/Strings/PackagingProgress.Designer.cs index c6a6f481..2b00bebd 100644 --- a/src/PackageUploader.UI/Resources/Strings/PackagingProgress.Designer.cs +++ b/src/PackageUploader.UI/Resources/Strings/PackagingProgress.Designer.cs @@ -19,7 +19,7 @@ namespace PackageUploader.UI.Resources.Strings { // 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.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class PackagingProgress { @@ -78,6 +78,15 @@ public static string CopyingAndEncryptingText { } } + /// + /// Looks up a localized string similar to Packaging data.... + /// + public static string PackagingDataText { + get { + return ResourceManager.GetString("PackagingDataText", resourceCulture); + } + } + /// /// Looks up a localized string similar to Getting your package ready.... /// @@ -87,6 +96,15 @@ public static string PackagingProgressTitleText { } } + /// + /// Looks up a localized string similar to Packaging using MSIXVC2.... + /// + public static string PackingMsixvc2Text { + get { + return ResourceManager.GetString("PackingMsixvc2Text", resourceCulture); + } + } + /// /// Looks up a localized string similar to Packaging.... /// diff --git a/src/PackageUploader.UI/Resources/Strings/PackagingProgress.resx b/src/PackageUploader.UI/Resources/Strings/PackagingProgress.resx index 23b3d4f1..0cf28f01 100644 --- a/src/PackageUploader.UI/Resources/Strings/PackagingProgress.resx +++ b/src/PackageUploader.UI/Resources/Strings/PackagingProgress.resx @@ -138,4 +138,10 @@ Verifying package contents... + + Packaging using MSIXVC2... + + + Packaging data... + \ No newline at end of file diff --git a/src/PackageUploader.UI/View/PackageCreationView.xaml b/src/PackageUploader.UI/View/PackageCreationView.xaml index fc05f1a6..9df65ada 100644 --- a/src/PackageUploader.UI/View/PackageCreationView.xaml +++ b/src/PackageUploader.UI/View/PackageCreationView.xaml @@ -406,6 +406,7 @@ + @@ -506,6 +507,16 @@ HorizontalAlignment="Left" TextWrapping="Wrap"/> + + diff --git a/src/PackageUploader.UI/View/PackagingProgressView.xaml b/src/PackageUploader.UI/View/PackagingProgressView.xaml index a3c59171..dd127276 100644 --- a/src/PackageUploader.UI/View/PackagingProgressView.xaml +++ b/src/PackageUploader.UI/View/PackagingProgressView.xaml @@ -23,72 +23,75 @@ - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -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}"/> + - - + +