Skip to content

[tests] restore ignored tests from .NET 10 issues #9744

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
jonathanpeppers merged 1 commit into from
Feb 13, 2025
Merged

[tests] restore ignored tests from .NET 10 issues #9744

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
3 changes: 1 addition & 2 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,8 +651,7 @@ public interface OnFooListener
[NonParallelizable]
public void BuildApplicationWithSpacesInPath ([Values (true, false)] bool enableMultiDex, [Values ("", "r8")] string linkTool)
{
// FIXME: https://github.com/dotnet/msbuild/issues/11237, removed `(` and `)` characters
var folderName = $"BuildReleaseApp AndÜmläüts{enableMultiDex}{linkTool}";
var folderName = $"BuildReleaseApp AndÜmläüts({enableMultiDex}{linkTool})";
var lib = new XamarinAndroidLibraryProject {
IsRelease = true,
ProjectName = "Library1"
Expand Down
3 changes: 1 addition & 2 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,8 +1133,7 @@ public void BuildProguardEnabledProject (string rid)
if (!string.IsNullOrEmpty (rid)) {
proj.SetProperty ("RuntimeIdentifier", rid);
}
// FIXME: https://github.com/dotnet/msbuild/issues/11237, removed `(` and `)` characters
using (var b = CreateApkBuilder (Path.Combine ("temp", $"BuildProguard Enabled1{rid}"))) {
using (var b = CreateApkBuilder (Path.Combine ("temp", $"BuildProguard Enabled(1){rid}"))) {
Copy link
Member Author

@jonathanpeppers jonathanpeppers Feb 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears the MSBuild fix is working:

image

Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
// warning XA4304: ProGuard configuration file 'XYZ' was not found.
StringAssertEx.DoesNotContain ("XA4304", b.LastBuildOutput, "Output should *not* contain XA4304 warnings");
Expand Down
1 change: 0 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,6 @@ public void SupportedOSPlatformVersion (string minSdkVersion, bool removeUsesSdk

var minSdkVersionInt = MonoAndroidHelper.ConvertSupportedOSPlatformVersionToApiLevel (minSdkVersion);
if (minSdkVersionInt < 22) {
Assert.Ignore ("https://github.com/dotnet/roslyn-analyzers/issues/7525");
StringAssertEx.Contains ("warning CA1416", builder.LastBuildOutput, "Should get warning about Android 22 API");
} else {
builder.AssertHasNoWarnings ();
Expand Down
Loading