1 files changed, 20 insertions, 17 deletions
diff --git a/csharp/test/Ice/defaultValue/Test.ice b/csharp/test/Ice/defaultValue/Test.ice
index 26c89b2768b..7ed9fee8136 100644
--- a/csharp/test/Ice/defaultValue/Test.ice
+++ b/csharp/test/Ice/defaultValue/Test.ice
@@ -9,6 +9,11 @@
 
 #pragma once
 
+//
+// Suppress warnings
+//
+[["suppress-warning:invalid-metadata, deprecated"]]
+
 module Test
 {
 
@@ -35,12 +40,12 @@ struct Struct1
     float f = 5.1;
     double d = 6.2;
     string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \007 \x07";
-    Color c1 = ::Test::red;
+    Color c1 = ::Test::Color::red;
     Color c2 = Test::green;
     Color c3 = blue;
-    Nested::Color nc1 = ::Test::Nested::red;
+    Nested::Color nc1 = Test::Nested::Color::red;
     Nested::Color nc2 = Nested::green;
-    Nested::Color nc3 = Nested::blue;
+    Nested::Color nc3 = blue;
     string noDefault;
     int zeroI = 0;
     long zeroL = 0;
@@ -58,12 +63,12 @@ const long ConstLong = 4;
 const float ConstFloat = 5.1;
 const double ConstDouble = 6.2;
 const string ConstString = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \007 \x07";
-const Color ConstColor1 = ::Test::red;
+const Color ConstColor1 = ::Test::Color::red;
 const Color ConstColor2 = Test::green;
 const Color ConstColor3 = blue;
-const Nested::Color ConstNestedColor1 = ::Test::Nested::red;
+const Nested::Color ConstNestedColor1 = Test::Nested::Color::red;
 const Nested::Color ConstNestedColor2 = Test::Nested::green;
-const Nested::Color ConstNestedColor3 = Nested::blue;
+const Nested::Color ConstNestedColor3 = blue;
 const int ConstZeroI = 0;
 const long ConstZeroL = 0;
 const float ConstZeroF = 0;
@@ -112,12 +117,12 @@ struct Struct3
     float f = 5.1;
     double d = 6.2;
     //string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \007 \x07";
-    Color c1 = ::Test::red;
+    Color c1 = ::Test::Color::red;
     Color c2 = Test::green;
     Color c3 = blue;
-    Nested::Color nc1 = ::Test::Nested::red;
+    Nested::Color nc1 = ::Test::Nested::Color::red;
     Nested::Color nc2 = Nested::green;
-    Nested::Color nc3 = Nested::blue;
+    Nested::Color nc3 = blue;
     //string noDefault;
     int zeroI = 0;
     long zeroL = 0;
@@ -143,12 +148,12 @@ struct Struct4
     float f = 5.1;
     double d = 6.2;
     //string str = "foo \\ \"bar\n \r\n\t\v\f\a\b\? \007 \x07";
-    Color c1 = ::Test::red;
+    Color c1 = ::Test::Color::red;
     Color c2 = Test::green;
     Color c3 = blue;
-    Nested::Color nc1 = ::Test::Nested::red;
+    Nested::Color nc1 = ::Test::Nested::Color::red;
     Nested::Color nc2 = Nested::green;
-    Nested::Color nc3 = Nested::blue;
+    Nested::Color nc3 = blue;
     //string noDefault;
     int zeroI = 0;
     long zeroL = 0;
@@ -180,13 +185,13 @@ class Base
 
 class Derived extends Base
 {
-    Color c1 = ::Test::red;
+    Color c1 = ::Test::Color::red;
     Color c2 = Test::green;
     Color c3 = blue;
 
-    Nested::Color nc1 = ::Test::Nested::red;
+    Nested::Color nc1 = ::Test::Nested::Color::red;
     Nested::Color nc2 = Nested::green;
-    Nested::Color nc3 = Nested::blue;
+    Nested::Color nc3 = blue;
 };
 
 exception BaseEx
@@ -265,8 +270,6 @@ struct StructProperty
 //
 // Exceptions don't support "clr:property" metadata, but
 // we want to ensure that the generated code compiles.
-// A warning "warning: ignoring invalid metadata `clr:property'"
-// is expected when compiling this file.
 //
 ["clr:property"]
 exception ExceptionProperty