Imported Upstream version 3.6.0

Former-commit-id: da6be194a6b1221998fc28233f2503bd61dd9d14

mcs/class/corlib/System.Runtime.Versioning/ChangeLog

@@ -0,0 +1,16 @@
+2009-12-03  Marek Habersack  <mhabersack@novell.com>
+
+	* FrameworkName.cs: added
+
+	* TargetFrameworkAttribute.cs: added
+
+2009-09-20  Sebastien Pouliot  <sebastien@ximian.com> 
+
+	* VersioningHelper.cs: Refactor AppDomain.Id for NET_2_1
+
+2005-10-31  Sebastien Pouliot  <sebastien@ximian.com> 
+
+	* ResourceConsumptionAttribute.cs: New. 2.0 attribute.
+	* ResourceExposureAttribute.cs: New. 2.0 attribute.
+	* ResourceScope.cs: New. 2.0 enum.
+	* VersioningHelper.cs: New. 2.0 public helper class.

mcs/class/corlib/System.Runtime.Versioning/ComponentGuaranteesAttribute.cs

@@ -0,0 +1,53 @@
+//
+// ComponentGuaranteesAttribute.cs
+//
+// Author:
+//   Marek Safar (marek.safar@gmail.com)
+//
+// Copyright (C) 2010 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// 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_4_0
+
+namespace System.Runtime.Versioning
+{
+	[AttributeUsageAttribute (AttributeTargets.Assembly | AttributeTargets.Module | AttributeTargets.Class | AttributeTargets.Struct |
+		AttributeTargets.Enum | AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Event |
+		AttributeTargets.Interface | AttributeTargets.Delegate, AllowMultiple = false, Inherited = false)]
+	public sealed class ComponentGuaranteesAttribute : Attribute
+	{
+		readonly ComponentGuaranteesOptions guarantees;
+
+		public ComponentGuaranteesAttribute (ComponentGuaranteesOptions guarantees)
+		{
+			this.guarantees = guarantees;
+		}
+		
+		public ComponentGuaranteesOptions Guarantees {
+			get {
+				return guarantees;
+			}
+		}
+	}
+}
+
+#endif

mcs/class/corlib/System.Runtime.Versioning/ComponentGuaranteesOptions.cs

@@ -0,0 +1,43 @@
+//
+// ComponentGuaranteesOptions.cs
+//
+// Author:
+//   Marek Safar (marek.safar@gmail.com)
+//
+// Copyright (C) 2010 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// 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_4_0
+
+namespace System.Runtime.Versioning
+{
+	[FlagsAttribute]
+	public enum ComponentGuaranteesOptions
+	{
+		None = 0,
+		Exchange = 1,
+		Stable = 2,
+		SideBySide = 4
+	}
+}
+
+#endif

mcs/class/corlib/System.Runtime.Versioning/ResourceConsumptionAttribute.cs

@@ -0,0 +1,61 @@
+//
+// System.Runtime.Versioning.ResourceConsumptionAttribute class
+//
+// Authors
+//	Sebastien Pouliot  <sebastien@ximian.com>
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Diagnostics;
+
+namespace System.Runtime.Versioning {
+
+	[AttributeUsage (AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Property, Inherited = false)]
+	[Conditional ("RESOURCE_ANNOTATION_WORK")]
+	public sealed class ResourceConsumptionAttribute: Attribute {
+
+		private ResourceScope resource;
+		private ResourceScope consumption;
+
+		public ResourceConsumptionAttribute (ResourceScope resourceScope)
+		{
+			resource = resourceScope;
+			consumption = resourceScope;
+		}
+
+		public ResourceConsumptionAttribute (ResourceScope resourceScope, ResourceScope consumptionScope)
+		{
+			resource = resourceScope;
+			consumption = consumptionScope;
+		}
+
+
+		public ResourceScope ConsumptionScope {
+			get { return consumption; }
+		}
+
+		public ResourceScope ResourceScope {
+			get { return resource; }
+		}
+	}
+}

mcs/class/corlib/System.Runtime.Versioning/ResourceExposureAttribute.cs

@@ -0,0 +1,50 @@
+//
+// System.Runtime.Versioning.ResourceExposureAttribute class
+//
+// Authors
+//	Sebastien Pouliot  <sebastien@ximian.com>
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Diagnostics;
+
+namespace System.Runtime.Versioning {
+
+	[AttributeUsage (AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field, Inherited = false)]
+	[Conditional ("RESOURCE_ANNOTATION_WORK")]
+	public sealed class ResourceExposureAttribute: Attribute {
+
+		private ResourceScope exposure;
+
+		public ResourceExposureAttribute (ResourceScope exposureLevel)
+		{
+			exposure = exposureLevel;
+		}
+
+
+		public ResourceScope ResourceExposureLevel {
+			get { return exposure; }
+		}
+	}
+}
+

mcs/class/corlib/System.Runtime.Versioning/ResourceScope.cs

@@ -0,0 +1,41 @@
+//
+// System.Runtime.Versioning.ResourceScope enumeration
+//
+// Authors
+//	Sebastien Pouliot  <sebastien@ximian.com>
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Runtime.Versioning {
+
+	[Flags]
+	public enum ResourceScope {
+		None = 0,
+		Machine = 1,
+		Process = 2,
+		AppDomain = 4,
+		Library = 8,
+		Private = 16,
+		Assembly = 32
+	}
+}

mcs/class/corlib/System.Runtime.Versioning/TargetFrameworkAttribute.cs

@@ -0,0 +1,53 @@
+//
+// System.Runtime.Versioning.TargetFrameworkAttribute class
+//
+// Authors
+//	Marek Habersack <mhabersack@novell.com>
+//
+// Copyright (C) 2009 Novell, Inc (http://novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+
+#if NET_4_0
+namespace System.Runtime.Versioning
+{
+	[AttributeUsageAttribute(AttributeTargets.Assembly, AllowMultiple = false, Inherited = false)]
+	public sealed class TargetFrameworkAttribute : Attribute
+	{
+		public string FrameworkName {
+			get; private set;
+		}
+
+		public string FrameworkDisplayName {
+			get; set;
+		}
+		
+		public TargetFrameworkAttribute (string frameworkName)
+		{
+			if (frameworkName == null)
+				throw new ArgumentNullException ("frameworkName");
+			
+			this.FrameworkName = frameworkName;
+		}
+	}
+}
+#endif

mcs/class/corlib/System.Runtime.Versioning/VersioningHelper.cs

@@ -0,0 +1,125 @@
+//
+// System.Runtime.Versioning.VersioningHelper class
+//
+// Authors
+//	Sebastien Pouliot  <sebastien@ximian.com>
+//
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace System.Runtime.Versioning {
+
+	public static class VersioningHelper {
+
+		static private int GetDomainId ()
+		{
+#if NET_2_1
+			return 0;
+#else
+			return AppDomain.CurrentDomain.Id;
+#endif
+		}
+
+		static private int GetProcessId ()
+		{
+			// TODO - System.Diagnostics.Process class is located in System.dll
+			return 0;
+		}
+
+		static string SafeName (string name, bool process, bool appdomain)
+		{
+			if (process && appdomain) {
+				return String.Concat (name, "_", GetProcessId ().ToString (),
+					"_", GetDomainId ().ToString ());
+			} else if (process) {
+				return String.Concat (name, "_", GetProcessId ().ToString ());
+			} else if (appdomain) {
+				return String.Concat (name, "_", GetDomainId ().ToString ());
+			}
+			// nothing, return original string
+			return name;
+		}
+
+		static private string ConvertFromMachine (string name, ResourceScope to, Type type)
+		{
+			switch (to) {
+			case ResourceScope.Machine:
+				return SafeName (name, false, false);
+			case ResourceScope.Process:
+				return SafeName (name, true, false);
+			case ResourceScope.AppDomain:
+				return SafeName (name, true, true);
+			default:
+				throw new ArgumentException ("to");
+			}
+		}
+
+		static private string ConvertFromProcess (string name, ResourceScope to, Type type)
+		{
+			if ((to < ResourceScope.Process) || (to >= ResourceScope.Private))
+				throw new ArgumentException ("to");
+			bool ad = ((to & ResourceScope.AppDomain) == ResourceScope.AppDomain);
+			return SafeName (name, false, ad);
+		}
+
+		static private string ConvertFromAppDomain (string name, ResourceScope to, Type type)
+		{
+			if ((to < ResourceScope.AppDomain) || (to >= ResourceScope.Private))
+				throw new ArgumentException ("to");
+			return SafeName (name, false, false);
+		}
+
+		[MonoTODO ("process id is always 0")]
+		static public string MakeVersionSafeName (string name, ResourceScope from, ResourceScope to)
+		{
+			return MakeVersionSafeName (name, from, to, null);
+		}
+
+		[MonoTODO ("type?")]
+		static public string MakeVersionSafeName (string name, ResourceScope from, ResourceScope to, Type type)
+		{
+			if ((from & ResourceScope.Private) != 0) {
+				to &= ~(ResourceScope.Private | ResourceScope.Assembly);
+			} else if ((from & ResourceScope.Assembly) != 0) {
+				to &= ~ResourceScope.Assembly;
+			}
+			
+			string result = (name == null) ? String.Empty : name;
+			switch (from) {
+			case ResourceScope.Machine:
+			case ResourceScope.Machine | ResourceScope.Private:
+			case ResourceScope.Machine | ResourceScope.Assembly:
+				return ConvertFromMachine (result, to, type);
+			case ResourceScope.Process:
+			case ResourceScope.Process | ResourceScope.Private:
+			case ResourceScope.Process | ResourceScope.Assembly:
+				return ConvertFromProcess (result, to, type);
+			case ResourceScope.AppDomain:
+			case ResourceScope.AppDomain | ResourceScope.Private:
+			case ResourceScope.AppDomain | ResourceScope.Assembly:
+				return ConvertFromAppDomain (result, to, type);
+			default:
+				throw new ArgumentException ("from");
+			}
+		}
+	}
+}