Imported Upstream version 6.6.0.148
Former-commit-id: e3c553955865291392630663d50d4004cfa00f18
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
ba75ea0369
commit
3a44987f03
@ -1 +1 @@
|
||||
cf4e954dc4232571309c8fd12ee62eee8b67c1f8
|
||||
8f7913d9589d4661ea36bc57247b1c54f9c884d9
|
||||
@ -1 +1 @@
|
||||
1a92dd06e35acc665ef791eff57d681295932796
|
||||
27f21cf351ea959556b90627b6b6848c4b2bd285
|
||||
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.6.0.147";
|
||||
public const string MonoVersion = "6.6.0.148";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -1 +1 @@
|
||||
5e3242d1227fce6df9b0f64aa8ed2aac5cb6fa51
|
||||
d6873a6a44b22203212c3e27b6251f29330b876c
|
||||
@ -1 +1 @@
|
||||
3a4a3cd5f6d8d1b0989e49894e705a1fc0b1e968
|
||||
9a2509d048a11aa654ef116188660d4105b85cfb
|
||||
@ -1 +1 @@
|
||||
c49005e83217beaf39f774338ddba472effdadd4
|
||||
1977e3c1438869bf78c984b562e3b18d0e22c0d8
|
||||
@ -1 +1 @@
|
||||
276a93c86b3305bff1bb328f9ef343e7cb4f27d8
|
||||
2cc3f9d0e5eca6ca7c3153298e0c31d881db1d9c
|
||||
@ -1 +1 @@
|
||||
fc2b419f1b343a6864563ebb068313d2dea63307
|
||||
cb882209764b14ee7b455c6de33db52b4ce0b86c
|
||||
@ -1 +1 @@
|
||||
f621bb38f6acb6aa1ea38cad7945f42094b4d360
|
||||
87775866d1524d54375f9c8e42483c788116d21e
|
||||
@ -1 +1 @@
|
||||
e4fa10ef65f4038de7334dec0acae65f7e594f12
|
||||
c260001f7211d72828c8a726f8ba8bf2a2920042
|
||||
@ -1 +1 @@
|
||||
5e3242d1227fce6df9b0f64aa8ed2aac5cb6fa51
|
||||
d6873a6a44b22203212c3e27b6251f29330b876c
|
||||
@ -1 +1 @@
|
||||
3a4a3cd5f6d8d1b0989e49894e705a1fc0b1e968
|
||||
9a2509d048a11aa654ef116188660d4105b85cfb
|
||||
@ -1 +1 @@
|
||||
c49005e83217beaf39f774338ddba472effdadd4
|
||||
1977e3c1438869bf78c984b562e3b18d0e22c0d8
|
||||
@ -1 +1 @@
|
||||
276a93c86b3305bff1bb328f9ef343e7cb4f27d8
|
||||
2cc3f9d0e5eca6ca7c3153298e0c31d881db1d9c
|
||||
@ -1 +1 @@
|
||||
fc2b419f1b343a6864563ebb068313d2dea63307
|
||||
cb882209764b14ee7b455c6de33db52b4ce0b86c
|
||||
@ -1 +1 @@
|
||||
f621bb38f6acb6aa1ea38cad7945f42094b4d360
|
||||
87775866d1524d54375f9c8e42483c788116d21e
|
||||
@ -1 +1 @@
|
||||
40975a3188c6967c3a1eb4ae0efd6f5d78f2bd44
|
||||
64580f738aafd340069a5cdd3e7e4b8950848c3b
|
||||
@ -1 +1 @@
|
||||
e4fa10ef65f4038de7334dec0acae65f7e594f12
|
||||
c260001f7211d72828c8a726f8ba8bf2a2920042
|
||||
@ -1 +1 @@
|
||||
5e3242d1227fce6df9b0f64aa8ed2aac5cb6fa51
|
||||
d6873a6a44b22203212c3e27b6251f29330b876c
|
||||
@ -1 +1 @@
|
||||
3a4a3cd5f6d8d1b0989e49894e705a1fc0b1e968
|
||||
9a2509d048a11aa654ef116188660d4105b85cfb
|
||||
@ -1 +1 @@
|
||||
c49005e83217beaf39f774338ddba472effdadd4
|
||||
1977e3c1438869bf78c984b562e3b18d0e22c0d8
|
||||
@ -1 +1 @@
|
||||
276a93c86b3305bff1bb328f9ef343e7cb4f27d8
|
||||
2cc3f9d0e5eca6ca7c3153298e0c31d881db1d9c
|
||||
@ -1 +1 @@
|
||||
fc2b419f1b343a6864563ebb068313d2dea63307
|
||||
cb882209764b14ee7b455c6de33db52b4ce0b86c
|
||||
@ -1 +1 @@
|
||||
f621bb38f6acb6aa1ea38cad7945f42094b4d360
|
||||
87775866d1524d54375f9c8e42483c788116d21e
|
||||
@ -1 +1 @@
|
||||
40975a3188c6967c3a1eb4ae0efd6f5d78f2bd44
|
||||
64580f738aafd340069a5cdd3e7e4b8950848c3b
|
||||
@ -1 +1 @@
|
||||
e4fa10ef65f4038de7334dec0acae65f7e594f12
|
||||
c260001f7211d72828c8a726f8ba8bf2a2920042
|
||||
@ -1 +1 @@
|
||||
5e3242d1227fce6df9b0f64aa8ed2aac5cb6fa51
|
||||
d6873a6a44b22203212c3e27b6251f29330b876c
|
||||
@ -1 +1 @@
|
||||
3a4a3cd5f6d8d1b0989e49894e705a1fc0b1e968
|
||||
9a2509d048a11aa654ef116188660d4105b85cfb
|
||||
@ -1 +1 @@
|
||||
268f706e058389521d48696e2f9b032ccab0eb08
|
||||
7ec86186854c76dc4c88bd3a1dfc5d10a8ae0227
|
||||
@ -1 +1 @@
|
||||
276a93c86b3305bff1bb328f9ef343e7cb4f27d8
|
||||
2cc3f9d0e5eca6ca7c3153298e0c31d881db1d9c
|
||||
@ -1 +1 @@
|
||||
fc2b419f1b343a6864563ebb068313d2dea63307
|
||||
cb882209764b14ee7b455c6de33db52b4ce0b86c
|
||||
@ -1 +1 @@
|
||||
f621bb38f6acb6aa1ea38cad7945f42094b4d360
|
||||
87775866d1524d54375f9c8e42483c788116d21e
|
||||
@ -1 +1 @@
|
||||
40975a3188c6967c3a1eb4ae0efd6f5d78f2bd44
|
||||
64580f738aafd340069a5cdd3e7e4b8950848c3b
|
||||
@ -1 +1 @@
|
||||
20f4aba1cec846bd1088f5a9fe018135bb4fed07
|
||||
cb73a7c13051b14270295b140b4e984d06a0308e
|
||||
@ -1 +1 @@
|
||||
b5c041f1a34b959fb4ffe4d68a2e0fd7885d4e6a
|
||||
67b63637354afae46a56b66701bd8da931814203
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/a119807"
|
||||
#define FULL_VERSION "explicit/6ac1ff7"
|
||||
|
||||
@ -1 +1 @@
|
||||
11acc8005387141824eaf220d8133fd777b1dc70
|
||||
b90ba3c73268f1d86790235cffbc765467a23a47
|
||||
@ -1 +1 @@
|
||||
eca029d000edebec42f6f6cdf494f7fab0f9096e
|
||||
96fd4e52754d69d5360c414bf5d2c8cd67327585
|
||||
97
mono/tests/interface-2.cs
Normal file
97
mono/tests/interface-2.cs
Normal file
@ -0,0 +1,97 @@
|
||||
using System;
|
||||
|
||||
public interface I1
|
||||
{
|
||||
int M1()
|
||||
{
|
||||
return 100;
|
||||
}
|
||||
}
|
||||
|
||||
public interface I2 : I1 { int I1.M1() { return 200; } }
|
||||
|
||||
public interface I3 : I1 { int I1.M1() { return 300; } }
|
||||
|
||||
public interface I4 : I1 { int I1.M1() { return 400; } }
|
||||
|
||||
class Test10 : I1, I2, I3, I4 {
|
||||
//void I1.M1() { System.Console.WriteLine("I1.I1.M1"); }
|
||||
public int M1() { return 0; }
|
||||
}
|
||||
|
||||
public interface I1t
|
||||
{
|
||||
int M1t()
|
||||
{
|
||||
return 100;
|
||||
}
|
||||
}
|
||||
|
||||
public interface I2t : I1t { int I1t.M1t() { return 200; } }
|
||||
|
||||
public interface I3t : I1t { int I1t.M1t() { return 300; } }
|
||||
|
||||
public interface I4t : I1t { int I1t.M1t() { return 400; } }
|
||||
|
||||
class Test10t : I1t, I2t, I3t, I4t
|
||||
{
|
||||
int I1t.M1t() { return 0; }
|
||||
public int M1t() { return 10; }
|
||||
}
|
||||
|
||||
|
||||
public interface IName
|
||||
{
|
||||
string Name { get; }
|
||||
}
|
||||
public interface IOther<T>
|
||||
{
|
||||
T other { get; }
|
||||
string Name { get; }
|
||||
}
|
||||
public class Name1 : IName
|
||||
{
|
||||
public string Name { get { return "ClassName"; } }
|
||||
string IName.Name { get { return "InterfaceName"; } }
|
||||
}
|
||||
public class Name2 : IName, IOther<int>
|
||||
{
|
||||
public string Name { get { return "ClassName"; } }
|
||||
string IName.Name { get { return "InterfaceName"; } }
|
||||
public int other { get { return 43; } }
|
||||
}
|
||||
|
||||
public class Test
|
||||
{
|
||||
public static int test_0_override()
|
||||
{
|
||||
var name1 = new Name1();
|
||||
var name2 = new Name2();
|
||||
IName iName1 = name1;
|
||||
IName iName2 = name2;
|
||||
if (!iName1.Name.Equals("InterfaceName"))
|
||||
return 10;
|
||||
if (!iName2.Name.Equals("InterfaceName"))
|
||||
return 20;
|
||||
if (!name1.Name.Equals("ClassName"))
|
||||
return 30;
|
||||
if (!name2.Name.Equals("ClassName"))
|
||||
return 40;
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static int test_0_dim_override()
|
||||
{
|
||||
I1 var = new Test10();
|
||||
if (var.M1() != 0)
|
||||
return var.M1();
|
||||
|
||||
I1t var2 = new Test10t();
|
||||
return var2.M1t();
|
||||
}
|
||||
|
||||
public static int Main (string[] args) {
|
||||
return TestDriver.RunTests (typeof (Test), args);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1496,10 +1496,10 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
|
||||
|
||||
@ -525,8 +525,8 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@ENABLE_MSVC_FALSE@clean-local:
|
||||
@ENABLE_MSVC_FALSE@install-exec-local:
|
||||
@ENABLE_MSVC_FALSE@clean-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c912baef3403c2f7ebef70b499c67979dbd091e2
|
||||
41ea0fc0f9d22be67f4859aacf1a786e44cd6c6f
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
3975cea9f9093274cb6641ee3e10405dba13b1d2
|
||||
3be0a9ff32ee8078e4f6f9378ea4fad96b496adb
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
087c786aa2da26c8a7c5eb0a1029b9f87eabd569
|
||||
d213577b3c27ff7105b92058e6c0116f383c6a3c
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.6.0.147\n"
|
||||
"Project-Id-Version: mono 6.6.0.148\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-10-30 08:30+0000\n"
|
||||
"POT-Creation-Date: 2019-10-31 08:34+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
4a9e9e02c1ab4bd7405b8a565c78126fbfbf5f76
|
||||
cca62399a21fe8055c1a33d5f0a8db0bc6f82955
|
||||
Loading…
x
Reference in New Issue
Block a user