Skip to content

Fix MAUI packaging. #51

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
Alexandre Zollinger Chohfi (azchohfi) merged 2 commits into from
Jun 25, 2024
Merged

Fix MAUI packaging. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddff8d7
Fix MAUI packaging.
azchohfi Jun 25, 2024
9b766e0
Fix tests.
azchohfi Jun 25, 2024
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
6 changes: 3 additions & 3 deletions MSStore.CLI.UnitTests/PackageCommandUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ public async Task PackageCommandForMauiAppsShouldCallMSBuildIfWindows()
ExternalCommandExecutor
.Setup(x => x.RunAsync(
It.Is<string>(s => s == "dotnet"),
It.Is<string>(s => s.Contains("publish -f net8.0-windows10.0.19041.0 -r win10-x64 --self-contained /p:Configuration=Release")),
It.Is<string>(s => s.Contains("publish -f net8.0-windows10.0.19041.0 -p:RuntimeIdentifierOverride=win10-x64 --self-contained -c Release")),
It.Is<string>(s => s == dirInfo.FullName),
It.IsAny<CancellationToken>()))
.ReturnsAsync(new Services.ExternalCommandExecutionResult
Expand Down Expand Up @@ -305,8 +305,8 @@ public async Task PackageCommandForMauiAppsShouldCallMSBuildWithOutputParameterI
ExternalCommandExecutor
.Setup(x => x.RunAsync(
It.Is<string>(s => s == "dotnet"),
It.Is<string>(s => s.Contains("publish -f net8.0-windows10.0.19041.0 -r win10-x64 --self-contained /p:Configuration=Release")
&& s.Contains($"AppxPackageDir={customPath}\\;")
It.Is<string>(s => s.Contains("publish -f net8.0-windows10.0.19041.0 -p:RuntimeIdentifierOverride=win10-x64 --self-contained -c Release")
&& s.Contains($"AppxPackageDir={customPath}\\")
&& s.EndsWith($"AppxPackageTestDir={customPath}\\MauiProject_1.0.0.0_X64_Test\\")),
It.Is<string>(s => s == dirInfo.FullName),
It.IsAny<CancellationToken>()))
Expand Down
3 changes: 1 addition & 2 deletions MSStore.CLI/ProjectConfigurators/MauiProjectConfigurator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,7 @@ await AnsiConsole.Status().StartAsync("Restoring packages...", async ctx =>
{
var runtime = $"win10-{appxBundlePlatform.ToLowerInvariant()}";

// Maybe switch AppxPackageTestDir to bin\Release\{targetFramework}\{runtime}\AppPackages\?
msBuildParamsList.Add($"publish -f {properties.WindowsTargetFramework} -r {runtime} --self-contained /p:Configuration=Release;AppxBundle=Always;Platform={appxBundlePlatform};AppxBundlePlatforms={appxBundlePlatform};AppxPackageDir={escapedOutput}\\;UapAppxPackageBuildMode=StoreUpload;GenerateAppxPackageOnBuild=true;AppxPackageTestDir={escapedOutput}\\{projectName}_{version.ToVersionString()}_{appxBundlePlatform}_Test\\");
msBuildParamsList.Add($"publish -f {properties.WindowsTargetFramework} -p:RuntimeIdentifierOverride={runtime} --self-contained -c Release -p:AppxBundle=Always -p:AppxBundlePlatforms={appxBundlePlatform} -p:AppxPackageDir={escapedOutput}\\ -p:UapAppxPackageBuildMode=StoreUpload -p:AppxPackageTestDir={escapedOutput}\\{projectName}_{version.ToVersionString()}_{appxBundlePlatform}_Test\\");
}

ExternalCommandExecutionResult? result = null;
Expand Down