Update

svn path=/trunk/mcs/; revision=68362

diff --cc mcs/errors/cs3002-6.cs
index 7544568356ec7619decd9f4180d00ecefa7c06da,7544568356ec7619decd9f4180d00ecefa7c06da..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/mcs/errors/cs3002-6.cs
--- 2/mcs/errors/cs3002-6.cs
+++ /dev/null
@@@ -1,11 -1,11 +1,0 @@@
--// cs3002-6.cs: Return type of `I.Error()' is not CLS-compliant
--// Line: 10
--
--using System;
--[assembly:CLSCompliant(true)]
--
--[CLSCompliant(false)]
--public interface I {
--        [CLSCompliant(true)]
--        ulong[] Error();
--}

diff --cc mcs/errors/cs3014-1.cs
index 2725f3afcdd8ebe1ce1e563a57980122072a393c,2725f3afcdd8ebe1ce1e563a57980122072a393c..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/mcs/errors/cs3014-1.cs
--- 2/mcs/errors/cs3014-1.cs
+++ /dev/null
@@@ -1,11 -1,11 +1,0 @@@
--// cs3014-1.cs: `C.Error(bool)' cannot be marked as CLS-compliant because the assembly is not marked as CLS-compliant
--// Line: 8
--
--using System;
--[assembly:CLSCompliant (false)]
--
--public class C {
--        [CLSCompliant (true)]
--        protected void Error (bool arg) {}
--
--}

diff --cc mcs/errors/cs3014-6.cs
index ed3dede351b733e2736f27898f7716d7e1174852,ed3dede351b733e2736f27898f7716d7e1174852..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/mcs/errors/cs3014-6.cs
--- 2/mcs/errors/cs3014-6.cs
+++ /dev/null
@@@ -1,10 -1,10 +1,0 @@@
--// cs3014-6.cs: `C.field' cannot be marked as CLS-compliant because the assembly is not marked as CLS-compliant
--// Line: 8
--
--using System;
--[assembly:CLSCompliant (false)]
--
--public class C {
--        [CLSCompliant (true)]
--        public long field;
--}

diff --cc mcs/errors/cs3018-2.cs
index 38444df31fb3ba65ce8f98a2c4c44a054c9bf262,38444df31fb3ba65ce8f98a2c4c44a054c9bf262..1d8ea933ca290cc0ff90a5de2b3fa0d8afc38dde
--- 1/mcs/errors/cs3018-2.cs
--- 2/mcs/errors/cs3018-2.cs
+++ b/mcs/errors/cs3018-2.cs
@@@ -1,5 -1,5 +1,6 @@@
  // cs3018-2.cs: `C1.I2' cannot be marked as CLS-compliant because it is a member of non CLS-compliant type `C1'
--// Line: 10
++// Line: 12
++// Compiler options: -warnaserror -warn:1
  
  using System;
  [assembly: CLSCompliant (true)]

diff --cc mcs/errors/cs3018-3.cs
index 146eb55ea4b846cce5ff60329645eb2941a55b6f,146eb55ea4b846cce5ff60329645eb2941a55b6f..aa0af491858452e19a75fbd1c314bb917d9c681b
--- 1/mcs/errors/cs3018-3.cs
--- 2/mcs/errors/cs3018-3.cs
+++ b/mcs/errors/cs3018-3.cs
@@@ -1,5 -1,5 +1,6 @@@
--// cs3018-2.cs: `C1.I2' cannot be marked as CLS-compliant because it is a member of non CLS-compliant type `C1'\r
++// CS3018: `C1.I2' cannot be marked as CLS-compliant because it is a member of non CLS-compliant type `C1'\r
  // Line: 10\r
++// Compiler options: -warnaserror -warn:1\r
  \r
  using System;\r
  [assembly: CLSCompliant (true)]\r

diff --cc mcs/errors/cs3018-4.cs
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..2bc993e1962a9503ada299e3c48ff59589aaa183
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mcs/errors/cs3018-4.cs
@@@ -1,0 -1,0 +1,11 @@@
++// CS3018: `C.Error(bool)' cannot be marked as CLS-compliant because it is a member of non CLS-compliant type `C'
++// Line: 10
++// Compiler options: -warnaserror -warn:1
++
++using System;
++[assembly:CLSCompliant (false)]
++
++public class C {
++        [CLSCompliant (true)]
++        protected void Error (bool arg) {}
++}

diff --cc mcs/errors/cs3018-5.cs
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f421247553011666c54c99b937bfe4ab0e285508
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mcs/errors/cs3018-5.cs
@@@ -1,0 -1,0 +1,11 @@@
++// CS3018: `C.field' cannot be marked as CLS-compliant because it is a member of non CLS-compliant type `C'
++// Line: 10
++// Compiler options: -warnaserror -warn:1
++
++using System;
++[assembly:CLSCompliant (false)]
++
++public class C {
++        [CLSCompliant (true)]
++        public long field;
++}

diff --cc mcs/errors/cs3018-6.cs
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..fbd9b36d6b18e50683b165abda8de8f5f1813b3e
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mcs/errors/cs3018-6.cs
@@@ -1,0 -1,0 +1,12 @@@
++// CS3018: `I.Error()' cannot be marked as CLS-compliant because it is a member of non CLS-compliant type `I'
++// Line: 11
++// Compiler options: -warnaserror -warn:1
++
++using System;
++[assembly:CLSCompliant(true)]
++
++[CLSCompliant(false)]
++public interface I {
++        [CLSCompliant(true)]
++        ulong[] Error();
++}

diff --cc mcs/errors/cs3018.cs
index b062d1782d9747b182070b7dd3377c654a8f1cc3,b062d1782d9747b182070b7dd3377c654a8f1cc3..1f2ac2b578815ea466948c55b4992153c5da1555
--- 1/mcs/errors/cs3018.cs
--- 2/mcs/errors/cs3018.cs
+++ b/mcs/errors/cs3018.cs
@@@ -1,5 -1,5 +1,6 @@@
  // cs3018.cs: `NotCompliant.Compliant' cannot be marked as CLS-compliant because it is a member of non CLS-compliant type `NotCompliant'
--// Line: 9
++// Line: 12
++// Compiler options: -warnaserror -warn:1
  
  using System;
  [assembly: CLSCompliant (true)]