From 8d35027098690745270c42152e0303cdfa1897a8 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 3 Feb 2025 10:58:15 -0600 Subject: [PATCH] [tests] restore ignored tests from .NET 10 issues Context: https://github.com/dotnet/roslyn-analyzers/issues/7525 Context: https://github.com/dotnet/msbuild/issues/11237 The two above issues are fixed, so we can restore the impacted tests by partially reverting 37014d10. --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 3 +-- .../Tests/Xamarin.Android.Build.Tests/BuildTest2.cs | 3 +-- .../Tests/Xamarin.Android.Build.Tests/ManifestTest.cs | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index 441bd42e5ac..deae8174ce4 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -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" diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs index c18fa85a552..77045ab29c0 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs @@ -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}"))) { 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"); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs index 6c6fb7db2a0..2164f147f8f 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs @@ -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 ();