Skip to content

Commit a6b0f13

Browse files
[tests] restore ignored tests from .NET 10 issues (#9744)
Context: dotnet/roslyn-analyzers#7525 Context: dotnet/msbuild#11237 The two above issues are fixed, so we can restore the impacted tests by partially reverting 37014d1.
1 parent da059e9 commit a6b0f13

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,8 +651,7 @@ public interface OnFooListener
651651
[NonParallelizable]
652652
public void BuildApplicationWithSpacesInPath ([Values (true, false)] bool enableMultiDex, [Values ("", "r8")] string linkTool)
653653
{
654-
// FIXME: https://github.com/dotnet/msbuild/issues/11237, removed `(` and `)` characters
655-
var folderName = $"BuildReleaseApp AndÜmläüts{enableMultiDex}{linkTool}";
654+
var folderName = $"BuildReleaseApp AndÜmläüts({enableMultiDex}{linkTool})";
656655
var lib = new XamarinAndroidLibraryProject {
657656
IsRelease = true,
658657
ProjectName = "Library1"

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,8 +1133,7 @@ public void BuildProguardEnabledProject (string rid)
11331133
if (!string.IsNullOrEmpty (rid)) {
11341134
proj.SetProperty ("RuntimeIdentifier", rid);
11351135
}
1136-
// FIXME: https://github.com/dotnet/msbuild/issues/11237, removed `(` and `)` characters
1137-
using (var b = CreateApkBuilder (Path.Combine ("temp", $"BuildProguard Enabled1{rid}"))) {
1136+
using (var b = CreateApkBuilder (Path.Combine ("temp", $"BuildProguard Enabled(1){rid}"))) {
11381137
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
11391138
// warning XA4304: ProGuard configuration file 'XYZ' was not found.
11401139
StringAssertEx.DoesNotContain ("XA4304", b.LastBuildOutput, "Output should *not* contain XA4304 warnings");

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,6 @@ public void SupportedOSPlatformVersion (string minSdkVersion, bool removeUsesSdk
10681068

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

0 commit comments

Comments
 (0)