Skip to content

Add makepkg2 uploadsource probe and XGPM flag for MSIXVC2 uploads #125

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
RafaelHinojosa merged 1 commit into from
May 15, 2026
+384 −2
Merged

Add makepkg2 uploadsource probe and XGPM flag for MSIXVC2 uploads #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
331 changes: 330 additions & 1 deletion src/PackageUploader.UI.Test/ViewModel/Msixvc2UploadViewModelTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation.
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

using Microsoft.Extensions.Logging;
Expand Down Expand Up @@ -105,6 +105,119 @@ public void BuildUploadArguments_NoStoreId_NotIncluded()
}
#endregion

#region UploadSource Probe Tests

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsFalse_WhenMakePkg2PathEmpty()
{
_pathConfigurationProvider.MakePkg2Path = string.Empty;
Assert.IsFalse(_viewModel.SupportsUploadSourceFlag());
}

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsFalse_WhenMakePkg2NotFound()
{
_pathConfigurationProvider.MakePkg2Path = @"C:\nonexistent\makepkg2.exe";
Assert.IsFalse(_viewModel.SupportsUploadSourceFlag());
}

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsTrue_WhenProbeExitsZero()
{
// Create a temp batch file that exits 0 (simulates makepkg2 supporting /uploadsource)
string tempBat = Path.Combine(Path.GetTempPath(), "probe_test_exit0.bat");
File.WriteAllText(tempBat, "@exit /b 0");
try
{
_pathConfigurationProvider.MakePkg2Path = tempBat;
Assert.IsTrue(_viewModel.SupportsUploadSourceFlag());
}
finally
{
File.Delete(tempBat);
}
}

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsFalse_WhenProbeExitsNonZero()
{
string tempBat = Path.Combine(Path.GetTempPath(), "probe_test_exit1.bat");
File.WriteAllText(tempBat, "@exit /b 1");
try
{
_pathConfigurationProvider.MakePkg2Path = tempBat;
Assert.IsFalse(_viewModel.SupportsUploadSourceFlag());
}
finally
{
File.Delete(tempBat);
}
}

[TestMethod]
public void SupportsUploadSourceFlag_ReprobesEveryCall_NoCache()
{
string tempBat = Path.Combine(Path.GetTempPath(), "probe_test_nocache.bat");
File.WriteAllText(tempBat, "@exit /b 0");
try
{
_pathConfigurationProvider.MakePkg2Path = tempBat;
Assert.IsTrue(_viewModel.SupportsUploadSourceFlag());
// Replace binary in-place with one that exits 1 (simulates update)
File.WriteAllText(tempBat, "@exit /b 1");
Assert.IsFalse(_viewModel.SupportsUploadSourceFlag(),
"Must re-probe on every call to detect in-place binary updates");
}
finally
{
if (File.Exists(tempBat)) File.Delete(tempBat);
}
}

[TestMethod]
public void BuildUploadArguments_IncludesUploadSource_WhenProbeSucceeds()
{
string tempBat = Path.Combine(Path.GetTempPath(), "probe_build_args.bat");
File.WriteAllText(tempBat, "@exit /b 0");
try
{
_pathConfigurationProvider.MakePkg2Path = tempBat;
_viewModel.ContentPath = @"C:\game\content";
_viewModel.BranchOrFlightDisplayName = "Branch: Main";
_viewModel.MarketGroupName = "default";
_viewModel.BigId = "None";

string args = _viewModel.BuildUploadArguments();

Assert.IsTrue(args.Contains("/uploadsource XGPM"));
// /uploadsource must appear before /auth
int uploadSourceIdx = args.IndexOf("/uploadsource");
int authIdx = args.IndexOf("/auth");
Assert.IsTrue(uploadSourceIdx < authIdx, "/uploadsource must come before /auth");
}
finally
{
File.Delete(tempBat);
}
}

[TestMethod]
public void BuildUploadArguments_OmitsUploadSource_WhenProbeFails()
{
_pathConfigurationProvider.MakePkg2Path = @"C:\nonexistent\makepkg2.exe";
_viewModel.ContentPath = @"C:\game\content";
_viewModel.BranchOrFlightDisplayName = "Branch: Main";
_viewModel.MarketGroupName = "default";
_viewModel.BigId = "None";

string args = _viewModel.BuildUploadArguments();

Assert.IsFalse(args.Contains("/uploadsource"));
Assert.IsTrue(args.Contains("/auth CacheableBrowser"));
}

#endregion

#region CanUpload (via UploadPackageCommand.CanExecute) Tests

[TestMethod]
Expand Down Expand Up @@ -174,4 +287,220 @@ public void ErrorModelProvider_ReceivesCorrectValues_OnError()
Assert.AreEqual(string.Empty, _errorModelProvider.Error.MainMessage);
}
#endregion

#region UploadSource Adversarial Tests

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsFalse_WhenPathIsNull()
{
_pathConfigurationProvider.MakePkg2Path = null!;
Assert.IsFalse(_viewModel.SupportsUploadSourceFlag());
}

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsFalse_WhenProcessHangs()
{
string batPath = Path.Combine(Path.GetTempPath(), $"makepkg2_hang_{Guid.NewGuid():N}.bat");
File.WriteAllText(batPath, "@ping -n 30 127.0.0.1 > nul");
try
{
_pathConfigurationProvider.MakePkg2Path = batPath;
Assert.IsFalse(_viewModel.SupportsUploadSourceFlag(),
"Should return false when probe hangs (timeout)");
}
finally
{
File.Delete(batPath);
}
}

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsFalse_WhenExitCode255()
{
string batPath = Path.Combine(Path.GetTempPath(), $"makepkg2_255_{Guid.NewGuid():N}.bat");
File.WriteAllText(batPath, "@exit /b 255");
try
{
_pathConfigurationProvider.MakePkg2Path = batPath;
Assert.IsFalse(_viewModel.SupportsUploadSourceFlag(),
"Exit code 255 should be treated as unsupported");
}
finally
{
File.Delete(batPath);
}
}

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsFalse_WhenProcessWritesStderr()
{
string batPath = Path.Combine(Path.GetTempPath(), $"makepkg2_stderr_{Guid.NewGuid():N}.bat");
File.WriteAllText(batPath, "@echo ERROR: unknown command 1>&2\r\n@exit /b 1");
try
{
_pathConfigurationProvider.MakePkg2Path = batPath;
Assert.IsFalse(_viewModel.SupportsUploadSourceFlag(),
"Should return false despite stderr output when exit code is non-zero");
}
finally
{
File.Delete(batPath);
}
}

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsTrue_WhenProcessWritesStdoutAndExitsZero()
{
string batPath = Path.Combine(Path.GetTempPath(), $"makepkg2_stdout_{Guid.NewGuid():N}.bat");
File.WriteAllText(batPath, "@echo uploadsource is supported\r\n@exit /b 0");
try
{
_pathConfigurationProvider.MakePkg2Path = batPath;
Assert.IsTrue(_viewModel.SupportsUploadSourceFlag(),
"Should return true based on exit code, ignoring stdout content");
}
finally
{
File.Delete(batPath);
}
}

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsFalse_WhenPathIsDirectory()
{
string dirPath = Path.Combine(Path.GetTempPath(), $"makepkg2_dir_{Guid.NewGuid():N}");
Directory.CreateDirectory(dirPath);
try
{
_pathConfigurationProvider.MakePkg2Path = dirPath;
Assert.IsFalse(_viewModel.SupportsUploadSourceFlag(),
"Should return false when path points to a directory, not a file");
}
finally
{
Directory.Delete(dirPath);
}
}

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsTrue_WhenPathHasSpaces()
{
string dirPath = Path.Combine(Path.GetTempPath(), "make pkg2 spaces");
Directory.CreateDirectory(dirPath);
string batPath = Path.Combine(dirPath, "makepkg2.bat");
File.WriteAllText(batPath, "@exit /b 0");
try
{
_pathConfigurationProvider.MakePkg2Path = batPath;
Assert.IsTrue(_viewModel.SupportsUploadSourceFlag(),
"Should handle paths with spaces correctly");
}
finally
{
File.Delete(batPath);
Directory.Delete(dirPath);
}
}

[TestMethod]
public void BuildUploadArguments_UploadSourceBeforeAuth_OrderVerification()
{
string batPath = Path.Combine(Path.GetTempPath(), $"makepkg2_order_{Guid.NewGuid():N}.bat");
File.WriteAllText(batPath, "@exit /b 0");
try
{
_pathConfigurationProvider.MakePkg2Path = batPath;
_viewModel.ContentPath = @"C:\game\content";
_viewModel.BranchOrFlightDisplayName = "Branch: Dev";
_viewModel.MarketGroupName = "US";
_viewModel.BigId = "9NBLGGH4R315";

string args = _viewModel.BuildUploadArguments();

int storeIdx = args.IndexOf("/storeid");
int uploadIdx = args.IndexOf("/uploadsource XGPM");
int authIdx = args.IndexOf("/auth CacheableBrowser");

Assert.IsTrue(storeIdx > 0, "Should have /storeid");
Assert.IsTrue(uploadIdx > storeIdx, "/uploadsource should come after /storeid");
Assert.IsTrue(authIdx > uploadIdx, "/auth should come after /uploadsource");
Assert.IsTrue(args.EndsWith("/auth CacheableBrowser"), "/auth should be the last argument");
}
finally
{
File.Delete(batPath);
}
}

[TestMethod]
public void SupportsUploadSourceFlag_ReturnsFalse_WhenOldMakePkg2LacksSupportsCommand()
{
// Old makepkg2 (e.g. v2.2.25) doesn't recognize "supports" subcommand,
// prints usage to stderr and exits non-zero — probe must return false.
string batPath = Path.Combine(Path.GetTempPath(), $"makepkg2_old_{Guid.NewGuid():N}.bat");
File.WriteAllText(batPath,
"@echo Unrecognized command or argument 'supports'. 1>&2\r\n@exit /b 1");
try
{
_pathConfigurationProvider.MakePkg2Path = batPath;
Assert.IsFalse(_viewModel.SupportsUploadSourceFlag(),
"Old makepkg2 without 'supports' command must return false");
}
finally
{
File.Delete(batPath);
}
}

[TestMethod]
public void BuildUploadArguments_OmitsUploadSource_WhenOldMakePkg2()
{
// End-to-end: old makepkg2 → probe fails → /uploadsource NOT in args
string batPath = Path.Combine(Path.GetTempPath(), $"makepkg2_oldargs_{Guid.NewGuid():N}.bat");
File.WriteAllText(batPath,
"@echo Unrecognized command or argument 'supports'. 1>&2\r\n@exit /b 1");
try
{
_pathConfigurationProvider.MakePkg2Path = batPath;
_viewModel.ContentPath = @"C:\game\content";
_viewModel.BranchOrFlightDisplayName = "Branch: Main";
_viewModel.MarketGroupName = "default";

string args = _viewModel.BuildUploadArguments();

Assert.IsFalse(args.Contains("/uploadsource"),
"Old makepkg2 must NOT produce /uploadsource in upload args");
Assert.IsTrue(args.Contains("/auth CacheableBrowser"),
"Other args must still be present");
}
finally
{
File.Delete(batPath);
}
}

[TestMethod]
public void BuildUploadArguments_FlightPath_IncludesUploadSource()
{
string batPath = Path.Combine(Path.GetTempPath(), $"makepkg2_flight_{Guid.NewGuid():N}.bat");
File.WriteAllText(batPath, "@exit /b 0");
try
{
_pathConfigurationProvider.MakePkg2Path = batPath;
_viewModel.ContentPath = @"C:\game\content";
_viewModel.BranchOrFlightDisplayName = "Flight: Beta";
_viewModel.MarketGroupName = "default";

string args = _viewModel.BuildUploadArguments();

Assert.IsTrue(args.Contains("/flight \"Beta\""), "Should include flight");
Assert.IsTrue(args.Contains("/uploadsource XGPM"), "Should include /uploadsource XGPM on flight path too");
}
finally
{
File.Delete(batPath);
}
}

#endregion
}
Loading
Loading