Skip to content

[ci] Try to call trim #25941

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
rmarinho merged 5 commits into from
Nov 19, 2024
Merged

[ci] Try to call trim #25941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b3e566
Try to call trim
rmarinho Nov 18, 2024
db3f06a
Use a buildProps local
rmarinho Nov 18, 2024
304046f
Case sensitve
rmarinho Nov 18, 2024
932f194
Also speed up blazor tests
rmarinho Nov 19, 2024
94f11d2
Fix missing parameter
rmarinho Nov 19, 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
54 changes: 32 additions & 22 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/BlazorTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,43 @@
public class BlazorTemplateTest : BaseTemplateTests
{
[Test]
// Parameters: target framework, build config, dotnet new additional parameters
// Parameters: target framework, build config, dotnet new additional parameters, use tricky project name, additional dotnet build parameters

// First, default scenarios
[TestCase(DotNetCurrent, "Debug", "", false)]
[TestCase(DotNetCurrent, "Release", "", false)]
[TestCase(DotNetCurrent, "Debug", "", false, "")]
[TestCase(DotNetCurrent, "Release", "", false, "TrimMode=partial")]
//[TestCase(DotNetCurrent, "Release", "", false, "TrimMode=full")]

// Then, scenarios with additional template parameters:
// - Interactivity Location: None/WASM/Server/Auto
// - Empty vs. With Sample Content
// - ProgramMain vs. TopLevel statements
// And alternately testing other options for a healthy mix.
[TestCase(DotNetCurrent, "Debug", "-I None --Empty", false)]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly --Empty", false)]
[TestCase(DotNetCurrent, "Debug", "-I Server --Empty", false)]
[TestCase(DotNetCurrent, "Release", "-I Auto --Empty", false)]
[TestCase(DotNetCurrent, "Debug", "-I None", false)]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly", false)]
[TestCase(DotNetCurrent, "Debug", "-I Server", false)]
[TestCase(DotNetCurrent, "Release", "-I Auto", false)]
[TestCase(DotNetCurrent, "Debug", "-I None --Empty --UseProgramMain", false)]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly --Empty --UseProgramMain", false)]
[TestCase(DotNetCurrent, "Debug", "-I Server --Empty --UseProgramMain", false)]
[TestCase(DotNetCurrent, "Release", "-I Auto --Empty --UseProgramMain", false)]
[TestCase(DotNetCurrent, "Debug", "-I None --UseProgramMain", false)]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly --UseProgramMain", false)]
[TestCase(DotNetCurrent, "Debug", "-I Server --UseProgramMain", false)]
[TestCase(DotNetCurrent, "Release", "-I Auto --UseProgramMain", false)]
// additionalDotNetBuildParams is a space-separated list of additional properties to pass to .NET MAUI build
// Like "TrimMode=partial" for faster builds with AOT
[TestCase(DotNetCurrent, "Debug", "-I None --Empty", false, "")]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly --Empty", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I Server --Empty", false, "")]
[TestCase(DotNetCurrent, "Release", "-I Auto --Empty", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I None", false, "")]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I Server", false, "")]
[TestCase(DotNetCurrent, "Release", "-I Auto", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I None --Empty --UseProgramMain", false, "")]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly --Empty --UseProgramMain", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I Server --Empty --UseProgramMain", false, "")]
[TestCase(DotNetCurrent, "Release", "-I Auto --Empty --UseProgramMain", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I None --UseProgramMain", false, "")]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly --UseProgramMain", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I Server --UseProgramMain", false, "")]
[TestCase(DotNetCurrent, "Release", "-I Auto --UseProgramMain", false, "TrimMode=partial")]

// Then, some scenarios with tricky names in Debug builds only
// This doesn't work on Android in Release, so we skip that for now
// See https://github.com/dotnet/android/issues/9107
// [TestCase(DotNetCurrent, "Debug", "", true)]
// [TestCase(DotNetCurrent, "Debug", "-I Server --UseProgramMain", true)]
public void BuildMauiBlazorWebSolution(string framework, string config, string additionalDotNetNewParams, bool useTrickyProjectName)
public void BuildMauiBlazorWebSolution(string framework, string config, string additionalDotNetNewParams, bool useTrickyProjectName, string additionalDotNetBuildParams)
{
const string templateShortName = "maui-blazor-web";

Expand All @@ -47,6 +50,13 @@ public void BuildMauiBlazorWebSolution(string framework, string config, string a
solutionProjectDir += "&More";
}

var buildProps = BuildProps;

if (additionalDotNetBuildParams is not "" and not null)
{
additionalDotNetBuildParams.Split(" ").ToList().ForEach(p => buildProps.Add(p));
}

var webAppProjectDir = Path.Combine(solutionProjectDir, Path.GetFileName(solutionProjectDir) + ".Web");
var webAppProjectFile = Path.Combine(webAppProjectDir, $"{Path.GetFileName(webAppProjectDir)}.csproj");

Expand All @@ -70,8 +80,8 @@ public void BuildMauiBlazorWebSolution(string framework, string config, string a
Assert.IsTrue(DotnetInternal.Build(webAppProjectFile, config, target: "", properties: BuildProps, msbuildWarningsAsErrors: true),
$"Project {Path.GetFileName(webAppProjectFile)} failed to build. Check test output/attachments for errors.");

TestContext.WriteLine($"Building .NET MAUI app: {mauiAppProjectFile}");
Assert.IsTrue(DotnetInternal.Build(mauiAppProjectFile, config, target: "", properties: BuildProps, msbuildWarningsAsErrors: true),
TestContext.WriteLine($"Building .NET MAUI app: {mauiAppProjectFile} props: {buildProps}");
Assert.IsTrue(DotnetInternal.Build(mauiAppProjectFile, config, target: "", properties: buildProps, msbuildWarningsAsErrors: true),
$"Project {Path.GetFileName(mauiAppProjectFile)} failed to build. Check test output/attachments for errors.");
}
}
104 changes: 62 additions & 42 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ namespace Microsoft.Maui.IntegrationTests;
public class SimpleTemplateTest : BaseTemplateTests
{
[Test]
// Parameters: short name, target framework, build config, use pack target, additionalDotNetNewParams
[TestCase("maui", DotNetPrevious, "Debug", false, "")]
[TestCase("maui", DotNetPrevious, "Release", false, "")]
[TestCase("maui", DotNetCurrent, "Debug", false, "")]
[TestCase("maui", DotNetCurrent, "Release", false, "")]
[TestCase("maui", DotNetCurrent, "Debug", false, "--sample-content")]
[TestCase("maui", DotNetCurrent, "Release", false, "--sample-content")]
[TestCase("maui-blazor", DotNetPrevious, "Debug", false, "")]
[TestCase("maui-blazor", DotNetPrevious, "Release", false, "")]
[TestCase("maui-blazor", DotNetCurrent, "Debug", false, "")]
[TestCase("maui-blazor", DotNetCurrent, "Release", false, "")]
[TestCase("maui-blazor", DotNetCurrent, "Debug", false, "--Empty")]
[TestCase("maui-blazor", DotNetCurrent, "Release", false, "--Empty")]
[TestCase("mauilib", DotNetPrevious, "Debug", true, "")]
[TestCase("mauilib", DotNetPrevious, "Release", true, "")]
[TestCase("mauilib", DotNetCurrent, "Debug", true, "")]
[TestCase("mauilib", DotNetCurrent, "Release", true, "")]
public void Build(string id, string framework, string config, bool shouldPack, string additionalDotNetNewParams)
// Parameters: short name, target framework, build config, use pack target, additionalDotNetNewParams, additionalDotNetBuildParams
[TestCase("maui", DotNetPrevious, "Debug", false, "","")]
[TestCase("maui", DotNetPrevious, "Release", false, "", "")]
[TestCase("maui", DotNetCurrent, "Debug", false, "", "")]
[TestCase("maui", DotNetCurrent, "Release", false, "", "TrimMode=partial")]
[TestCase("maui", DotNetCurrent, "Debug", false, "--sample-content", "")]
[TestCase("maui", DotNetCurrent, "Release", false, "--sample-content", "TrimMode=partial")]
[TestCase("maui-blazor", DotNetPrevious, "Debug", false, "", "")]
[TestCase("maui-blazor", DotNetPrevious, "Release", false, "", "")]
[TestCase("maui-blazor", DotNetCurrent, "Debug", false, "", "")]
[TestCase("maui-blazor", DotNetCurrent, "Release", false, "", "TrimMode=partial")]
[TestCase("maui-blazor", DotNetCurrent, "Debug", false, "--Empty","")]
[TestCase("maui-blazor", DotNetCurrent, "Release", false, "--Empty","TrimMode=partial")]
[TestCase("mauilib", DotNetPrevious, "Debug", true, "", "")]
[TestCase("mauilib", DotNetPrevious, "Release", true, "","")]
[TestCase("mauilib", DotNetCurrent, "Debug", true, "", "")]
[TestCase("mauilib", DotNetCurrent, "Release", true, "", "TrimMode=partial")]
public void Build(string id, string framework, string config, bool shouldPack, string additionalDotNetNewParams, string additionalDotNetBuildParams)
{
var projectDir = TestDirectory;
var projectFile = Path.Combine(projectDir, $"{Path.GetFileName(projectDir)}.csproj");
Expand All @@ -49,10 +49,16 @@ public void Build(string id, string framework, string config, bool shouldPack, s
"XC0103", // https://github.com/CommunityToolkit/Maui/issues/2205
};
}

var buildProps = BuildProps;

if (additionalDotNetBuildParams is not "" and not null)
{
additionalDotNetBuildParams.Split(" ").ToList().ForEach(p => buildProps.Add(p));
}

string target = shouldPack ? "Pack" : "";
Assert.IsTrue(DotnetInternal.Build(projectFile, config, target: target, properties: BuildProps, msbuildWarningsAsErrors: true, warningsToIgnore: warningsToIgnore),
Assert.IsTrue(DotnetInternal.Build(projectFile, config, target: target, properties: buildProps, msbuildWarningsAsErrors: true, warningsToIgnore: warningsToIgnore),
$"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors.");
}

Expand Down Expand Up @@ -102,20 +108,20 @@ public void BuildsWithSpecialCharacters(string id, string projectName, string ex
}

[Test]
// Parameters: short name, target framework, build config, use pack target
[TestCase("maui", DotNetPrevious, "Debug", false)]
[TestCase("maui", DotNetPrevious, "Release", false)]
[TestCase("maui", DotNetCurrent, "Debug", false)]
[TestCase("maui", DotNetCurrent, "Release", false)]
[TestCase("maui-blazor", DotNetPrevious, "Debug", false)]
[TestCase("maui-blazor", DotNetPrevious, "Release", false)]
[TestCase("maui-blazor", DotNetCurrent, "Debug", false)]
[TestCase("maui-blazor", DotNetCurrent, "Release", false)]
[TestCase("mauilib", DotNetPrevious, "Debug", true)]
[TestCase("mauilib", DotNetPrevious, "Release", true)]
[TestCase("mauilib", DotNetCurrent, "Debug", true)]
[TestCase("mauilib", DotNetCurrent, "Release", true)]
public void BuildWithMauiVersion(string id, string framework, string config, bool shouldPack)
// Parameters: short name, target framework, build config, use pack target, additionalDotNetBuildParams
[TestCase("maui", DotNetPrevious, "Debug", false, "")]
[TestCase("maui", DotNetPrevious, "Release", false, "")]
[TestCase("maui", DotNetCurrent, "Debug", false, "")]
[TestCase("maui", DotNetCurrent, "Release", false, "TrimMode=partial")]
[TestCase("maui-blazor", DotNetPrevious, "Debug", false, "")]
[TestCase("maui-blazor", DotNetPrevious, "Release", false, "")]
[TestCase("maui-blazor", DotNetCurrent, "Debug", false, "")]
[TestCase("maui-blazor", DotNetCurrent, "Release", false, "TrimMode=partial")]
[TestCase("mauilib", DotNetPrevious, "Debug", true, "")]
[TestCase("mauilib", DotNetPrevious, "Release", true, "")]
[TestCase("mauilib", DotNetCurrent, "Debug", true, "")]
[TestCase("mauilib", DotNetCurrent, "Release", true, "TrimMode=partial")]
public void BuildWithMauiVersion(string id, string framework, string config, bool shouldPack, string additionalDotNetBuildParams)
{
var projectDir = TestDirectory;
var projectFile = Path.Combine(projectDir, $"{Path.GetFileName(projectDir)}.csproj");
Expand All @@ -140,8 +146,15 @@ public void BuildWithMauiVersion(string id, string framework, string config, boo

string binlogDir = Path.Combine(TestEnvironment.GetMauiDirectory(), $"artifacts\\log\\{Path.GetFileName(projectDir)}.binlog");

var buildProps = BuildProps;

if (additionalDotNetBuildParams is not "" and not null)
{
additionalDotNetBuildParams.Split(" ").ToList().ForEach(p => buildProps.Add(p));
}

string target = shouldPack ? "Pack" : "";
Assert.IsTrue(DotnetInternal.Build(projectFile, config, target: target, binlogPath: binlogDir, properties: BuildProps),
Assert.IsTrue(DotnetInternal.Build(projectFile, config, target: target, binlogPath: binlogDir, properties: buildProps),
$"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors.");
}

Expand Down Expand Up @@ -266,13 +279,13 @@ public void BuildWithoutPackageReference(string id, string framework, string con
}

[Test]
[TestCase("maui", "Debug", "2.0", "2")]
[TestCase("maui", "Release", "2.0", "2")]
[TestCase("maui", "Release", "0.3", "3")]
[TestCase("maui-blazor", "Debug", "2.0", "2")]
[TestCase("maui-blazor", "Release", "2.0", "2")]
[TestCase("maui-blazor", "Release", "0.3", "3")]
public void BuildWithDifferentVersionNumber(string id, string config, string display, string version)
[TestCase("maui", "Debug", "2.0", "2", "")]
[TestCase("maui", "Release", "2.0", "2", "TrimMode=partial")]
[TestCase("maui", "Release", "0.3", "3", "TrimMode=partial")]
[TestCase("maui-blazor", "Debug", "2.0", "2", "")]
[TestCase("maui-blazor", "Release", "2.0", "2", "TrimMode=partial")]
[TestCase("maui-blazor", "Release", "0.3", "3", "TrimMode=partial")]
public void BuildWithDifferentVersionNumber(string id, string config, string display, string version, string additionalDotNetBuildParams)
{
var projectDir = TestDirectory;
var projectFile = Path.Combine(projectDir, $"{Path.GetFileName(projectDir)}.csproj");
Expand All @@ -288,7 +301,14 @@ public void BuildWithDifferentVersionNumber(string id, string config, string dis
$"<ApplicationVersion>1</ApplicationVersion>",
$"<ApplicationVersion>{version}</ApplicationVersion>");

Assert.IsTrue(DotnetInternal.Build(projectFile, config, properties: BuildProps, msbuildWarningsAsErrors: true),
var buildProps = BuildProps;

if (additionalDotNetBuildParams is not "" and not null)
{
additionalDotNetBuildParams.Split(" ").ToList().ForEach(p => buildProps.Add(p));
}

Assert.IsTrue(DotnetInternal.Build(projectFile, config, properties: buildProps, msbuildWarningsAsErrors: true),
$"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors.");
}
}