Skip to content

[xamlc] enable for $(Configuration) names like ReleaseProd #14638

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
merged 1 commit into from
Apr 19, 2023
Merged

[xamlc] enable for $(Configuration) names like ReleaseProd #14638

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
2 changes: 1 addition & 1 deletion ...rols/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
Condition=" '$(DesignTimeBuild)' != 'True' AND '@(MauiXaml)' != ''">
<PropertyGroup>
<_MauiXamlCValidateOnly>$(MauiXamlCValidateOnly)</_MauiXamlCValidateOnly>
<_MauiXamlCValidateOnly Condition="'$(Configuration)' != 'Release' AND '$(_MauiForceXamlCForDebug)' != 'True'">True</_MauiXamlCValidateOnly>
<_MauiXamlCValidateOnly Condition="'$(Configuration)' == 'Debug' AND '$(_MauiForceXamlCForDebug)' != 'True'">True</_MauiXamlCValidateOnly>
<_MauiXamlCValidateOnly Condition="'$(BuildingForLiveUnitTesting)' == 'True' ">True</_MauiXamlCValidateOnly>
</PropertyGroup>
<XamlCTask
Expand Down
21 changes: 16 additions & 5 deletions src/Controls/tests/Xaml.UnitTests/MSBuild/MSBuildTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ static string GetTfm()
public void SetUp()
{
testDirectory = TestContext.CurrentContext.TestDirectory;
tempDirectory = IOPath.Combine(testDirectory, "temp", TestContext.CurrentContext.Test.Name);
tempDirectory = IOPath.Combine(testDirectory, "temp",
TestContext.CurrentContext.Test.Name
.Replace('"', '_')
.Replace('(', '_')
.Replace(')', '_'));
intermediateDirectory = IOPath.Combine(tempDirectory, "obj", "Debug", GetTfm());
Directory.CreateDirectory(tempDirectory);

Expand Down Expand Up @@ -259,22 +263,29 @@ public void BuildAProject()

// Tests the MauiXamlCValidateOnly=True MSBuild property
[Test]
public void ValidateOnly()
public void ValidateOnly([Values("Debug", "Release", "ReleaseProd")] string configuration)
{
var project = NewProject();
project.Add(AddFile("MainPage.xaml", "MauiXaml", Xaml.MainPage));
var projectFile = IOPath.Combine(tempDirectory, "test.csproj");
project.Save(projectFile);
Build(projectFile, additionalArgs: "-p:MauiXamlCValidateOnly=True");
intermediateDirectory = IOPath.Combine(tempDirectory, "obj", configuration, GetTfm());
Build(projectFile, additionalArgs: $"-c {configuration}");

var testDll = IOPath.Combine(intermediateDirectory, "test.dll");
AssertExists(testDll, nonEmpty: true);
using (var assembly = AssemblyDefinition.ReadAssembly(testDll))
using var assembly = AssemblyDefinition.ReadAssembly(testDll);
var resources = assembly.MainModule.Resources.OfType<EmbeddedResource>().Select(e => e.Name).ToArray();
if (configuration == "Debug")
{
// XAML files should remain as EmbeddedResource
var resources = assembly.MainModule.Resources.OfType<EmbeddedResource>().Select(e => e.Name).ToArray();
CollectionAssert.Contains(resources, "test.MainPage.xaml");
}
else
{
// XAML files should *not* remain as EmbeddedResource
CollectionAssert.DoesNotContain(resources, "test.MainPage.xaml");
}
}

[Test]
Expand Down