Skip to content
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

Jump to bottom

[introspection] Make green on .NET/Mac Catalyst. Fixes #10215. #12329

Merged
merged 3 commits into from
Aug 3, 2021
Merged

[introspection] Make green on .NET/Mac Catalyst. Fixes #10215. #12329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f761adc
[introspection] Ignore the ApiAvailabilityTest.LegacyAttribute test o…
rolfbjarne Aug 3, 2021
69e8710
[introspection] #10883 only applies to Mac Catalyst for legacy Xamarin.
rolfbjarne Aug 3, 2021
c0516a0
[xharness] introspection is now green on .NET/Mac Catalyst
rolfbjarne Aug 3, 2021
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 tests/introspection/ApiAvailabilityTest.cs
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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