Skip to content

Commit

Permalink
[introspection] Make green on .NET/Mac Catalyst. Fixes #10215. (#12329)
Browse files Browse the repository at this point in the history
* [introspection] Ignore the ApiAvailabilityTest.LegacyAttribute test on Mac Catalyst as well.

* [introspection] #10883 only applies to Mac Catalyst for legacy Xamarin.

* [xharness] introspection is now green on .NET/Mac Catalyst
  • Loading branch information
rolfbjarne authored Aug 3, 2021
1 parent eafe528 commit b9c12e5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tests/introspection/ApiAvailabilityTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ string CheckLegacyAttributes (ICustomAttributeProvider cap)
}

[Test]
#if IOS || TVOS
#if IOS || TVOS || __MACCATALYST__
[Ignore ("work in progress")]
#endif
public void LegacyAttributes ()
Expand Down
6 changes: 3 additions & 3 deletions tests/introspection/ApiPInvokeTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ public void Product ()
// it's not complete (there's many more SDK assemblies) but we cannot add all of them into a single project anyway

[Test]
#if __MACCATALYST__
#if __MACCATALYST__ && !NET
[Ignore ("https://github.com/xamarin/xamarin-macios/issues/10883")]
#endif
public void Corlib ()
Expand All @@ -282,7 +282,7 @@ public void Corlib ()
}

[Test]
#if __MACCATALYST__
#if __MACCATALYST__ && !NET
[Ignore ("https://github.com/xamarin/xamarin-macios/issues/10883")]
#endif
public void System ()
Expand All @@ -293,7 +293,7 @@ public void System ()
}

[Test]
#if __MACCATALYST__
#if __MACCATALYST__ && !NET
[Ignore ("https://github.com/xamarin/xamarin-macios/issues/10883")]
#endif
public void SystemCore ()
Expand Down
2 changes: 1 addition & 1 deletion tests/xharness/Harness.cs
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ int AutoConfigureMac (bool generate_projects)
IsDotNetProject = true,
TargetFrameworkFlavors = MacFlavors.MacCatalyst,
Platform = "AnyCPU",
Ignore = true /* always ignored for now, it has known failures */,
Ignore = !ENABLE_DOTNET,
});

MacTestProjects.Add (new MacTestProject (Path.GetFullPath (Path.Combine (RootDirectory, "monotouch-test", "dotnet", "macOS", "monotouch-test.csproj"))) {
Expand Down

1 comment on commit b9c12e5

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

🔥 Tests failed catastrophically on Build (no summary found). 🔥

Result file $(TEST_SUMMARY_PATH) not found.

Pipeline on Agent
[introspection] Make green on .NET/Mac Catalyst. Fixes #10215. (#12329)

Please sign in to comment.