Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Runtime.Serialization/System.Xml/UniqueId.cs

@@ -26,7 +26,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
 using System;
 using System.Collections.Generic;
 using System.Security;
@@ -53,10 +52,6 @@ namespace System.Xml
 			this.guid = id;
 		}
 
-#if !NET_2_1
-		[SecurityCritical]
-		[SecurityTreatAsSafe]
-#endif
 		public UniqueId (string value)
 		{
 			if (value == null)
@@ -68,10 +63,6 @@ namespace System.Xml
 			this.id = value;
 		}
 
-#if !NET_2_1
-		[SecurityCritical]
-		[SecurityTreatAsSafe]
-#endif
 		public UniqueId (byte [] id, int offset)
 		{
 			if (id == null)
@@ -93,10 +84,6 @@ namespace System.Xml
 			}
 		}
 
-#if !NET_2_1
-		[SecurityCritical]
-		[SecurityTreatAsSafe]
-#endif
 		public UniqueId (char [] id, int offset, int count)
 		{
 			if (id == null)
@@ -122,10 +109,6 @@ namespace System.Xml
 		}
 
 		public int CharArrayLength {
-#if !NET_2_1
-			[SecurityCritical]
-			[SecurityTreatAsSafe]
-#endif
 			get {return id != null ? id.Length : 45;}
 		}
 
@@ -163,10 +146,6 @@ namespace System.Xml
 			return ! (id1 == id2);
 		}
 
-#if !NET_2_1
-		[SecurityCritical]
-		[SecurityTreatAsSafe]
-#endif
 		public int ToCharArray (char [] array, int offset)
 		{
 			if (array == null)
@@ -179,10 +158,6 @@ namespace System.Xml
 			return s.Length;
 		}
 
-#if !NET_2_1
-		[SecurityCritical]
-		[SecurityTreatAsSafe]
-#endif
 		public override string ToString ()
 		{
 			if (id == null)
@@ -202,10 +177,6 @@ namespace System.Xml
 			}
 		}
 
-#if !NET_2_1
-		[SecurityCritical]
-		[SecurityTreatAsSafe]
-#endif
 		public bool TryGetGuid (byte [] buffer, int offset)
 		{
 			if (!IsGuid)
@@ -223,4 +194,3 @@ namespace System.Xml
 		}
 	}
 }
-#endif