Merge remote-tracking branch 'origin/main' into net7.0
This commit is contained in:
Коммит
13c4df21aa
|
@ -1,6 +1,6 @@
|
|||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<MessagingVersion>1.6.6</MessagingVersion>
|
||||
<HotRestartVersion>1.0.90</HotRestartVersion>
|
||||
<MessagingVersion>1.6.24</MessagingVersion>
|
||||
<HotRestartVersion>1.0.92</HotRestartVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
@ -40,6 +40,9 @@ namespace IntegrationAPI
|
|||
public nint Prod (nint a, nint b) => a * b;
|
||||
public long ToLong (nint a) => (long)a;
|
||||
public nuint ToNUint (nint a) => (nuint)a;
|
||||
public bool Less (nint a, nint b) => a < b;
|
||||
public bool Greater (nint a, nint b) => a > b;
|
||||
public bool Eq (nint a, nint b) => a == b;
|
||||
}
|
||||
|
||||
public class NUIntAPI
|
||||
|
@ -58,6 +61,9 @@ namespace IntegrationAPI
|
|||
public nuint Prod (nuint a, nuint b) => a * b;
|
||||
public long ToLong (nuint a) => (long)a;
|
||||
public nint ToNInt (nuint a) => (nint)a;
|
||||
public bool Less (nuint a, nuint b) => a < b;
|
||||
public bool Greater (nuint a, nuint b) => a > b;
|
||||
public bool Eq (nuint a, nuint b) => a == b;
|
||||
}
|
||||
|
||||
public class NFloatAPI
|
||||
|
@ -75,5 +81,8 @@ namespace IntegrationAPI
|
|||
public nfloat Sum (nfloat a, nfloat b) => a + b;
|
||||
public nfloat Prod (nfloat a, nfloat b) => a * b;
|
||||
public double ToDouble (nfloat a) => (double)a;
|
||||
public bool Less (nfloat a, nfloat b) => a < b;
|
||||
public bool Greater (nfloat a, nfloat b) => a > b;
|
||||
public bool Eq (nfloat a, nfloat b) => a == b;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -45,6 +45,24 @@ namespace ConsumerTests
|
|||
if (n.ToLong (42) != 42) {
|
||||
output.AppendLine ("nint conversion failure");
|
||||
}
|
||||
if (n.Less (4, 3)) {
|
||||
output.AppendLine ("nint less failure (0)");
|
||||
}
|
||||
if (n.Less (2, 2)) {
|
||||
output.AppendLine ("nint less failure (1)");
|
||||
}
|
||||
if (!n.Less (2, 3)) {
|
||||
output.AppendLine ("nint less failure (2)");
|
||||
}
|
||||
if (!n.Greater (4, 3)) {
|
||||
output.AppendLine ("nint greater failure (0)");
|
||||
}
|
||||
if (n.Greater (2, 2)) {
|
||||
output.AppendLine ("nint greater failure (1)");
|
||||
}
|
||||
if (n.Greater (2, 3)) {
|
||||
output.AppendLine ("nint greater failure (2)");
|
||||
}
|
||||
}
|
||||
|
||||
static void NUIntTest (StringBuilder output)
|
||||
|
@ -71,6 +89,33 @@ namespace ConsumerTests
|
|||
if (n.ToLong (42) != 42) {
|
||||
output.AppendLine ("nuint conversion failure");
|
||||
}
|
||||
if (n.Less (4, 3)) {
|
||||
output.AppendLine ("nuint less failure (0)");
|
||||
}
|
||||
if (n.Less (2, 2)) {
|
||||
output.AppendLine ("nuint less failure (1)");
|
||||
}
|
||||
if (!n.Less (2, 3)) {
|
||||
output.AppendLine ("nuint less failure (2)");
|
||||
}
|
||||
if (!n.Greater (4, 3)) {
|
||||
output.AppendLine ("nuint greater failure (0)");
|
||||
}
|
||||
if (n.Greater (2, 2)) {
|
||||
output.AppendLine ("nuint greater failure (1)");
|
||||
}
|
||||
if (n.Greater (2, 3)) {
|
||||
output.AppendLine ("nuint greater failure (2)");
|
||||
}
|
||||
if (n.Eq (4, 3)) {
|
||||
output.AppendLine ("nuint equal failure (0)");
|
||||
}
|
||||
if (!n.Eq (2, 2)) {
|
||||
output.AppendLine ("nuint equal failure (1)");
|
||||
}
|
||||
if (n.Eq (2, 3)) {
|
||||
output.AppendLine ("nuint equal failure (2)");
|
||||
}
|
||||
}
|
||||
|
||||
static void NFloatTest (StringBuilder output)
|
||||
|
@ -97,6 +142,33 @@ namespace ConsumerTests
|
|||
if (n.ToDouble ((NFloat)42.0) != 42.0) {
|
||||
output.AppendLine ("nfloat conversion failure");
|
||||
}
|
||||
if (n.Less ((NFloat)4.0, (NFloat)3.0)) {
|
||||
output.AppendLine ("nfloat less failure (0)");
|
||||
}
|
||||
if (n.Less ((NFloat)2.0, (NFloat)2.0)) {
|
||||
output.AppendLine ("nfloat less failure (1)");
|
||||
}
|
||||
if (!n.Less ((NFloat)2.0, (NFloat)3.0)) {
|
||||
output.AppendLine ("nfloat less failure (2)");
|
||||
}
|
||||
if (!n.Greater ((NFloat)4.0, (NFloat)3.0)) {
|
||||
output.AppendLine ("nfloat greater failure (0)");
|
||||
}
|
||||
if (n.Greater ((NFloat)2.0, (NFloat)2.0)) {
|
||||
output.AppendLine ("nfloat greater failure (1)");
|
||||
}
|
||||
if (n.Greater ((NFloat)2.0, (NFloat)3.0)) {
|
||||
output.AppendLine ("nfloat greater failure (2)");
|
||||
}
|
||||
if (n.Eq ((NFloat)4.0, (NFloat)3.0)) {
|
||||
output.AppendLine ("nfloat equal failure (0)");
|
||||
}
|
||||
if (!n.Eq ((NFloat)2.0, (NFloat)2.0)) {
|
||||
output.AppendLine ("nfloat equal failure (1)");
|
||||
}
|
||||
if (n.Eq ((NFloat)2.0, (NFloat)3.0)) {
|
||||
output.AppendLine ("nfloat equal failure (2)");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -30,6 +30,7 @@ public class Foo {
|
|||
}
|
||||
|
||||
[Test]
|
||||
[Ignore ("This test was failing. See this issue: https://github.com/xamarin/xamarin-macios/issues/15120")]
|
||||
public async Task LibraryWithXamarinReference ()
|
||||
{
|
||||
var dir = Cache.CreateTemporaryDirectory ("LibraryWithXamarinReference");
|
||||
|
|
Загрузка…
Ссылка в новой задаче