diff --git a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/RegistryAclExtensions.cs b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/RegistryAclExtensions.cs index deb3458cc8..e32214de7d 100644 --- a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/RegistryAclExtensions.cs +++ b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/RegistryAclExtensions.cs @@ -36,22 +36,28 @@ namespace Microsoft.Win32 { public static class RegistryAclExtensions { - [MonoTODO] public static RegistrySecurity GetAccessControl (this RegistryKey key) { - throw new NotImplementedException (); + if (key == null) + throw new ArgumentNullException (nameof (key)); + + return key.GetAccessControl (); } - [MonoTODO] public static RegistrySecurity GetAccessControl (this RegistryKey key, AccessControlSections includeSections) { - throw new NotImplementedException (); + if (key == null) + throw new ArgumentNullException (nameof (key)); + + return key.GetAccessControl (includeSections); } - [MonoTODO] public static void SetAccessControl (this RegistryKey key, RegistrySecurity registrySecurity) { - throw new NotImplementedException (); + if (key == null) + throw new ArgumentNullException (nameof (key)); + + key.SetAccessControl (registrySecurity); } } } \ No newline at end of file diff --git a/mcs/class/Facades/System.Diagnostics.StackTrace/StackFrameExtensions.cs b/mcs/class/Facades/System.Diagnostics.StackTrace/StackFrameExtensions.cs index 7f6a474ab6..0b5d548674 100644 --- a/mcs/class/Facades/System.Diagnostics.StackTrace/StackFrameExtensions.cs +++ b/mcs/class/Facades/System.Diagnostics.StackTrace/StackFrameExtensions.cs @@ -37,36 +37,54 @@ namespace System.Diagnostics [MonoTODO] public static IntPtr GetNativeImageBase (this StackFrame stackFrame) { + if (stackFrame == null) + throw new ArgumentNullException (nameof (stackFrame)); + throw new NotImplementedException (); } [MonoTODO] public static IntPtr GetNativeIP (this StackFrame stackFrame) { + if (stackFrame == null) + throw new ArgumentNullException (nameof (stackFrame)); + throw new NotImplementedException (); } [MonoTODO] public static bool HasNativeImage (this StackFrame stackFrame) { + if (stackFrame == null) + throw new ArgumentNullException (nameof (stackFrame)); + throw new NotImplementedException (); } [MonoTODO] public static bool HasMethod (this StackFrame stackFrame) { + if (stackFrame == null) + throw new ArgumentNullException (nameof (stackFrame)); + throw new NotImplementedException (); } [MonoTODO] public static bool HasILOffset (this StackFrame stackFrame) { + if (stackFrame == null) + throw new ArgumentNullException (nameof (stackFrame)); + throw new NotImplementedException (); } [MonoTODO] public static bool HasSource (this StackFrame stackFrame) { + if (stackFrame == null) + throw new ArgumentNullException (nameof (stackFrame)); + throw new NotImplementedException (); } } diff --git a/mcs/class/Facades/System.Globalization.Extensions/StringNormalizationExtensions.cs b/mcs/class/Facades/System.Globalization.Extensions/StringNormalizationExtensions.cs index 7953b29b9a..de606a86dc 100644 --- a/mcs/class/Facades/System.Globalization.Extensions/StringNormalizationExtensions.cs +++ b/mcs/class/Facades/System.Globalization.Extensions/StringNormalizationExtensions.cs @@ -33,28 +33,36 @@ namespace System { public static class StringNormalizationExtensions { - [MonoTODO] public static bool IsNormalized(this string value) { - throw new NotImplementedException (); + if (value == null) + throw new ArgumentNullException (nameof (value)); + + return value.IsNormalized (); } - [MonoTODO] public static bool IsNormalized(this string value, NormalizationForm normalizationForm) { - throw new NotImplementedException (); + if (value == null) + throw new ArgumentNullException (nameof (value)); + + return value.IsNormalized (normalizationForm); } - [MonoTODO] public static String Normalize(this string value) { - throw new NotImplementedException (); + if (value == null) + throw new ArgumentNullException (nameof (value)); + + return value.Normalize (); } - [MonoTODO] public static String Normalize(this string value, NormalizationForm normalizationForm) { - throw new NotImplementedException (); + if (value == null) + throw new ArgumentNullException (nameof (value)); + + return value.Normalize (normalizationForm); } } } diff --git a/mcs/class/Facades/System.IO.FileSystem.AccessControl/FileSystemAclExtensions.cs b/mcs/class/Facades/System.IO.FileSystem.AccessControl/FileSystemAclExtensions.cs index 1dd8d97ab5..6baeefd5dd 100644 --- a/mcs/class/Facades/System.IO.FileSystem.AccessControl/FileSystemAclExtensions.cs +++ b/mcs/class/Facades/System.IO.FileSystem.AccessControl/FileSystemAclExtensions.cs @@ -28,56 +28,74 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +using System.Security.AccessControl; + namespace System.IO { - public static partial class FileSystemAclExtensions + public static class FileSystemAclExtensions { - [MonoTODO] - public static System.Security.AccessControl.DirectorySecurity GetAccessControl(this System.IO.DirectoryInfo directoryInfo) + public static DirectorySecurity GetAccessControl(this DirectoryInfo directoryInfo) { - throw new NotImplementedException (); + if (directoryInfo == null) + throw new ArgumentNullException (nameof (directoryInfo)); + + return directoryInfo.GetAccessControl (); } - [MonoTODO] - public static System.Security.AccessControl.DirectorySecurity GetAccessControl(this System.IO.DirectoryInfo directoryInfo, System.Security.AccessControl.AccessControlSections includeSections) + public static DirectorySecurity GetAccessControl(this DirectoryInfo directoryInfo, AccessControlSections includeSections) { - throw new NotImplementedException (); + if (directoryInfo == null) + throw new ArgumentNullException (nameof (directoryInfo)); + + return directoryInfo.GetAccessControl (includeSections); } - [MonoTODO] - public static System.Security.AccessControl.FileSecurity GetAccessControl(this System.IO.FileInfo fileInfo) + public static FileSecurity GetAccessControl(this FileInfo fileInfo) { - throw new NotImplementedException (); + if (fileInfo == null) + throw new ArgumentNullException (nameof (fileInfo)); + + return fileInfo.GetAccessControl (); } - [MonoTODO] - public static System.Security.AccessControl.FileSecurity GetAccessControl(this System.IO.FileInfo fileInfo, System.Security.AccessControl.AccessControlSections includeSections) + public static FileSecurity GetAccessControl(this FileInfo fileInfo, AccessControlSections includeSections) { - throw new NotImplementedException (); + if (fileInfo == null) + throw new ArgumentNullException (nameof (fileInfo)); + + return fileInfo.GetAccessControl (includeSections); } - [MonoTODO] - public static System.Security.AccessControl.FileSecurity GetAccessControl(this System.IO.FileStream fileStream) + public static FileSecurity GetAccessControl(this FileStream fileStream) { - throw new NotImplementedException (); + if (fileStream == null) + throw new ArgumentNullException (nameof (fileStream)); + + return fileStream.GetAccessControl (); } - [MonoTODO] - public static void SetAccessControl(this System.IO.DirectoryInfo directoryInfo, System.Security.AccessControl.DirectorySecurity directorySecurity) + public static void SetAccessControl(this DirectoryInfo directoryInfo, DirectorySecurity directorySecurity) { - throw new NotImplementedException (); + if (directoryInfo == null) + throw new ArgumentNullException (nameof (directoryInfo)); + + directoryInfo.SetAccessControl (directorySecurity); } - [MonoTODO] - public static void SetAccessControl(this System.IO.FileInfo fileInfo, System.Security.AccessControl.FileSecurity fileSecurity) + public static void SetAccessControl(this FileInfo fileInfo, FileSecurity fileSecurity) { - throw new NotImplementedException (); + if (fileInfo == null) + throw new ArgumentNullException (nameof (fileInfo)); + + fileInfo.SetAccessControl (fileSecurity); } - [MonoTODO] - public static void SetAccessControl(this System.IO.FileStream fileStream, System.Security.AccessControl.FileSecurity fileSecurity) + public static void SetAccessControl(this FileStream fileStream, FileSecurity fileSecurity) { - throw new NotImplementedException (); + if (fileStream == null) + throw new ArgumentNullException (nameof (fileStream)); + + fileStream.SetAccessControl (fileSecurity); } } } \ No newline at end of file diff --git a/mcs/class/Facades/System.Net.Sockets/SocketTaskExtensions.cs b/mcs/class/Facades/System.Net.Sockets/SocketTaskExtensions.cs index a3e24ede01..c0665fc070 100644 --- a/mcs/class/Facades/System.Net.Sockets/SocketTaskExtensions.cs +++ b/mcs/class/Facades/System.Net.Sockets/SocketTaskExtensions.cs @@ -28,12 +28,12 @@ namespace System.Net.Sockets state: socket); } - public static Task ConnectAsync(this Socket socket, EndPoint remoteEndPoint) + public static Task ConnectAsync(this Socket socket, EndPoint remoteEP) { return Task.Factory.FromAsync( (targetEndPoint, callback, state) => ((Socket)state).BeginConnect(targetEndPoint, callback, state), asyncResult => ((Socket)asyncResult.AsyncState).EndConnect(asyncResult), - remoteEndPoint, + remoteEP, state: socket); } @@ -229,7 +229,7 @@ namespace System.Net.Sockets this Socket socket, ArraySegment buffer, SocketFlags socketFlags, - EndPoint remoteEndPoint) + EndPoint remoteEP) { return Task.Factory.FromAsync( (targetBuffer, flags, endPoint, callback, state) => ((Socket)state).BeginSendTo( @@ -243,7 +243,7 @@ namespace System.Net.Sockets asyncResult => ((Socket)asyncResult.AsyncState).EndSendTo(asyncResult), buffer, socketFlags, - remoteEndPoint, + remoteEP, state: socket); } } diff --git a/mcs/class/Facades/System.Private.CoreLib.InteropServices/AssemblyInfo.cs b/mcs/class/Facades/System.Private.CoreLib.InteropServices/AssemblyInfo.cs deleted file mode 100644 index 833904b6d6..0000000000 --- a/mcs/class/Facades/System.Private.CoreLib.InteropServices/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -// -// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.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; -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly: AssemblyTitle ("System.Private.CoreLib.InteropServices.dll")] -[assembly: AssemblyDescription ("System.Private.CoreLib.InteropServices.dll")] -[assembly: AssemblyDefaultAlias ("System.Private.CoreLib.InteropServices.dll")] -[assembly: AssemblyCompany ("Xamarin, Inc.")] -[assembly: AssemblyProduct ("Mono Common Language Infrastructure")] -[assembly: AssemblyCopyright ("Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] -[assembly: AssemblyInformationalVersion ("4.0.0.0")] -[assembly: AssemblyFileVersion ("4.0.0.0")] -[assembly: AssemblyDelaySign (true)] -[assembly: AssemblyKeyFile ("../../msfinal.pub")] diff --git a/mcs/class/Facades/System.Private.CoreLib.InteropServices/Makefile b/mcs/class/Facades/System.Private.CoreLib.InteropServices/Makefile deleted file mode 100644 index 7b03ca8fdb..0000000000 --- a/mcs/class/Facades/System.Private.CoreLib.InteropServices/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -MCS_BUILD_DIR = ../../../build - -thisdir = class/Facades/System.Private.CoreLib.InteropServices -SUBDIRS = -include $(MCS_BUILD_DIR)/rules.make - -LIBRARY_SUBDIR = Facades -LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades - -LIBRARY = System.Private.CoreLib.InteropServices.dll - -KEY_FILE = ../../msfinal.pub -SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 -LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) - -PLATFORM_DEBUG_FLAGS = - -NO_TEST = yes - -include $(MCS_BUILD_DIR)/library.make - - diff --git a/mcs/class/Facades/System.Private.CoreLib.InteropServices/System.Private.CoreLib.InteropServices.dll.sources b/mcs/class/Facades/System.Private.CoreLib.InteropServices/System.Private.CoreLib.InteropServices.dll.sources deleted file mode 100644 index 8e33d4ddea..0000000000 --- a/mcs/class/Facades/System.Private.CoreLib.InteropServices/System.Private.CoreLib.InteropServices.dll.sources +++ /dev/null @@ -1,3 +0,0 @@ -TypeForwarders.cs -AssemblyInfo.cs - diff --git a/mcs/class/Facades/System.Private.CoreLib.InteropServices/TypeForwarders.cs b/mcs/class/Facades/System.Private.CoreLib.InteropServices/TypeForwarders.cs deleted file mode 100644 index 7a1269d2c1..0000000000 --- a/mcs/class/Facades/System.Private.CoreLib.InteropServices/TypeForwarders.cs +++ /dev/null @@ -1,34 +0,0 @@ -// -// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.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. -// - -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.CallingConvention))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.DllImportAttribute))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.GCHandle))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.GCHandleType))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.SafeHandle))] - -//Missing: [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(Internal.Reflection.Execution.PayForPlayExperience.MissingMetadataExceptionCreator))] -//Missing: [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.DependencyReductionTypeRemoved))] -//Missing: [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.PreInitializedAttribute))] -//Missing: [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.InteropExtensions))] -//Missing: [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.NativeCallableAttributes))] -//Missing: [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.RuntimeImportAttribute))] diff --git a/mcs/class/Facades/System.Reflection.Emit.ILGeneration/AssemblyInfo.cs b/mcs/class/Facades/System.Reflection.Emit.ILGeneration/AssemblyInfo.cs index d9427c8562..8b9f6f86f5 100644 --- a/mcs/class/Facades/System.Reflection.Emit.ILGeneration/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Reflection.Emit.ILGeneration/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.0.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] [assembly: AssemblyDelaySign (true)] diff --git a/mcs/class/Facades/System.Reflection.Emit.Lightweight/AssemblyInfo.cs b/mcs/class/Facades/System.Reflection.Emit.Lightweight/AssemblyInfo.cs index 11f62613d0..cd48993eda 100644 --- a/mcs/class/Facades/System.Reflection.Emit.Lightweight/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Reflection.Emit.Lightweight/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.0.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] [assembly: AssemblyDelaySign (true)] diff --git a/mcs/class/Facades/System.Reflection.Emit/AssemblyInfo.cs b/mcs/class/Facades/System.Reflection.Emit/AssemblyInfo.cs index 2acf0c8499..03e71faf4b 100644 --- a/mcs/class/Facades/System.Reflection.Emit/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Reflection.Emit/AssemblyInfo.cs @@ -30,7 +30,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCompany ("Xamarin, Inc.")] [assembly: AssemblyProduct ("Mono Common Language Infrastructure")] [assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")] -[assembly: AssemblyVersion ("4.0.0.0")] +[assembly: AssemblyVersion ("4.0.1.0")] [assembly: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] [assembly: AssemblyDelaySign (true)] diff --git a/mcs/class/Facades/System.Reflection.TypeExtensions/TypeExtensions.CoreCLR.cs b/mcs/class/Facades/System.Reflection.TypeExtensions/TypeExtensions.CoreCLR.cs index 661cd67a0e..2943d31dc0 100644 --- a/mcs/class/Facades/System.Reflection.TypeExtensions/TypeExtensions.CoreCLR.cs +++ b/mcs/class/Facades/System.Reflection.TypeExtensions/TypeExtensions.CoreCLR.cs @@ -15,199 +15,199 @@ namespace System.Reflection { public static class TypeExtensions { - public static ConstructorInfo GetConstructor(Type type, Type[] types) + public static ConstructorInfo GetConstructor(this Type type, Type[] types) { Requires.NotNull(type, nameof(type)); return type.GetConstructor(types); } - public static ConstructorInfo[] GetConstructors(Type type) + public static ConstructorInfo[] GetConstructors(this Type type) { Requires.NotNull(type, nameof(type)); return type.GetConstructors(); } - public static ConstructorInfo[] GetConstructors(Type type, BindingFlags bindingAttr) + public static ConstructorInfo[] GetConstructors(this Type type, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetConstructors(bindingAttr); } - public static MemberInfo[] GetDefaultMembers(Type type) + public static MemberInfo[] GetDefaultMembers(this Type type) { Requires.NotNull(type, nameof(type)); return type.GetDefaultMembers(); } - public static EventInfo GetEvent(Type type, string name) + public static EventInfo GetEvent(this Type type, string name) { Requires.NotNull(type, nameof(type)); return type.GetEvent(name); } - public static EventInfo GetEvent(Type type, string name, BindingFlags bindingAttr) + public static EventInfo GetEvent(this Type type, string name, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetEvent(name, bindingAttr); } - public static EventInfo[] GetEvents(Type type) + public static EventInfo[] GetEvents(this Type type) { Requires.NotNull(type, nameof(type)); return type.GetEvents(); } - public static EventInfo[] GetEvents(Type type, BindingFlags bindingAttr) + public static EventInfo[] GetEvents(this Type type, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetEvents(bindingAttr); } - public static FieldInfo GetField(Type type, string name) + public static FieldInfo GetField(this Type type, string name) { Requires.NotNull(type, nameof(type)); return type.GetField(name); } - public static FieldInfo GetField(Type type, string name, BindingFlags bindingAttr) + public static FieldInfo GetField(this Type type, string name, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetField(name, bindingAttr); } - public static FieldInfo[] GetFields(Type type) + public static FieldInfo[] GetFields(this Type type) { Requires.NotNull(type, nameof(type)); return type.GetFields(); } - public static FieldInfo[] GetFields(Type type, BindingFlags bindingAttr) + public static FieldInfo[] GetFields(this Type type, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetFields(bindingAttr); } - public static Type[] GetGenericArguments(Type type) + public static Type[] GetGenericArguments(this Type type) { Requires.NotNull(type, nameof(type)); return type.GetGenericArguments(); } - public static Type[] GetInterfaces(Type type) + public static Type[] GetInterfaces(this Type type) { Requires.NotNull(type, nameof(type)); return type.GetInterfaces(); } - public static MemberInfo[] GetMember(Type type, string name) + public static MemberInfo[] GetMember(this Type type, string name) { Requires.NotNull(type, nameof(type)); return type.GetMember(name); } - public static MemberInfo[] GetMember(Type type, string name, BindingFlags bindingAttr) + public static MemberInfo[] GetMember(this Type type, string name, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetMember(name, bindingAttr); } - public static MemberInfo[] GetMembers(Type type) + public static MemberInfo[] GetMembers(this Type type) { Requires.NotNull(type, nameof(type)); return type.GetMembers(); } - public static MemberInfo[] GetMembers(Type type, BindingFlags bindingAttr) + public static MemberInfo[] GetMembers(this Type type, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetMembers(bindingAttr); } - public static MethodInfo GetMethod(Type type, string name) + public static MethodInfo GetMethod(this Type type, string name) { Requires.NotNull(type, nameof(type)); return type.GetMethod(name); } - public static MethodInfo GetMethod(Type type, string name, BindingFlags bindingAttr) + public static MethodInfo GetMethod(this Type type, string name, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetMethod(name, bindingAttr); } - public static MethodInfo GetMethod(Type type, string name, Type[] types) + public static MethodInfo GetMethod(this Type type, string name, Type[] types) { Requires.NotNull(type, nameof(type)); return type.GetMethod(name, types); } - public static MethodInfo[] GetMethods(Type type) + public static MethodInfo[] GetMethods(this Type type) { Requires.NotNull(type, nameof(type)); return type.GetMethods(); } - public static MethodInfo[] GetMethods(Type type, BindingFlags bindingAttr) + public static MethodInfo[] GetMethods(this Type type, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetMethods(bindingAttr); } - public static Type GetNestedType(Type type, string name, BindingFlags bindingAttr) + public static Type GetNestedType(this Type type, string name, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetNestedType(name, bindingAttr); } - public static Type[] GetNestedTypes(Type type, BindingFlags bindingAttr) + public static Type[] GetNestedTypes(this Type type, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetNestedTypes(bindingAttr); } - public static PropertyInfo[] GetProperties(Type type) + public static PropertyInfo[] GetProperties(this Type type) { Requires.NotNull(type, nameof(type)); return type.GetProperties(); } - public static PropertyInfo[] GetProperties(Type type, BindingFlags bindingAttr) + public static PropertyInfo[] GetProperties(this Type type, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetProperties(bindingAttr); } - public static PropertyInfo GetProperty(Type type, string name) + public static PropertyInfo GetProperty(this Type type, string name) { Requires.NotNull(type, nameof(type)); return type.GetProperty(name); } - public static PropertyInfo GetProperty(Type type, string name, BindingFlags bindingAttr) + public static PropertyInfo GetProperty(this Type type, string name, BindingFlags bindingAttr) { Requires.NotNull(type, nameof(type)); return type.GetProperty(name, bindingAttr); } - public static PropertyInfo GetProperty(Type type, string name, Type returnType) + public static PropertyInfo GetProperty(this Type type, string name, Type returnType) { Requires.NotNull(type, nameof(type)); return type.GetProperty(name, returnType); } - public static PropertyInfo GetProperty(Type type, string name, Type returnType, Type[] types) + public static PropertyInfo GetProperty(this Type type, string name, Type returnType, Type[] types) { Requires.NotNull(type, nameof(type)); return type.GetProperty(name, returnType, types); } - public static bool IsAssignableFrom(Type type, Type c) + public static bool IsAssignableFrom(this Type type, Type c) { Requires.NotNull(type, nameof(type)); return type.IsAssignableFrom(c); } - public static bool IsInstanceOfType(Type type, object o) + public static bool IsInstanceOfType(this Type type, object o) { Requires.NotNull(type, nameof(type)); return type.IsInstanceOfType(o); @@ -216,19 +216,19 @@ namespace System.Reflection public static class AssemblyExtensions { - public static Type[] GetExportedTypes(Assembly assembly) + public static Type[] GetExportedTypes(this Assembly assembly) { Requires.NotNull(assembly, nameof(assembly)); return assembly.GetExportedTypes(); } - public static Module[] GetModules(Assembly assembly) + public static Module[] GetModules(this Assembly assembly) { Requires.NotNull(assembly, nameof(assembly)); return assembly.GetModules(); } - public static Type[] GetTypes(Assembly assembly) + public static Type[] GetTypes(this Assembly assembly) { Requires.NotNull(assembly, nameof(assembly)); return assembly.GetTypes(); @@ -237,37 +237,37 @@ namespace System.Reflection public static class EventInfoExtensions { - public static MethodInfo GetAddMethod(EventInfo eventInfo) + public static MethodInfo GetAddMethod(this EventInfo eventInfo) { Requires.NotNull(eventInfo, nameof(eventInfo)); return eventInfo.GetAddMethod(); } - public static MethodInfo GetAddMethod(EventInfo eventInfo, bool nonPublic) + public static MethodInfo GetAddMethod(this EventInfo eventInfo, bool nonPublic) { Requires.NotNull(eventInfo, nameof(eventInfo)); return eventInfo.GetAddMethod(nonPublic); } - public static MethodInfo GetRaiseMethod(EventInfo eventInfo) + public static MethodInfo GetRaiseMethod(this EventInfo eventInfo) { Requires.NotNull(eventInfo, nameof(eventInfo)); return eventInfo.GetRaiseMethod(); } - public static MethodInfo GetRaiseMethod(EventInfo eventInfo, bool nonPublic) + public static MethodInfo GetRaiseMethod(this EventInfo eventInfo, bool nonPublic) { Requires.NotNull(eventInfo, nameof(eventInfo)); return eventInfo.GetRaiseMethod(nonPublic); } - public static MethodInfo GetRemoveMethod(EventInfo eventInfo) + public static MethodInfo GetRemoveMethod(this EventInfo eventInfo) { Requires.NotNull(eventInfo, nameof(eventInfo)); return eventInfo.GetRemoveMethod(); } - public static MethodInfo GetRemoveMethod(EventInfo eventInfo, bool nonPublic) + public static MethodInfo GetRemoveMethod(this EventInfo eventInfo, bool nonPublic) { Requires.NotNull(eventInfo, nameof(eventInfo)); return eventInfo.GetRemoveMethod(nonPublic); @@ -337,7 +337,7 @@ namespace System.Reflection public static class MethodInfoExtensions { - public static MethodInfo GetBaseDefinition(MethodInfo method) + public static MethodInfo GetBaseDefinition(this MethodInfo method) { Requires.NotNull(method, nameof(method)); return method.GetBaseDefinition(); @@ -361,37 +361,37 @@ namespace System.Reflection public static class PropertyInfoExtensions { - public static MethodInfo[] GetAccessors(PropertyInfo property) + public static MethodInfo[] GetAccessors(this PropertyInfo property) { Requires.NotNull(property, nameof(property)); return property.GetAccessors(); } - public static MethodInfo[] GetAccessors(PropertyInfo property, bool nonPublic) + public static MethodInfo[] GetAccessors(this PropertyInfo property, bool nonPublic) { Requires.NotNull(property, nameof(property)); return property.GetAccessors(nonPublic); } - public static MethodInfo GetGetMethod(PropertyInfo property) + public static MethodInfo GetGetMethod(this PropertyInfo property) { Requires.NotNull(property, nameof(property)); return property.GetGetMethod(); } - public static MethodInfo GetGetMethod(PropertyInfo property, bool nonPublic) + public static MethodInfo GetGetMethod(this PropertyInfo property, bool nonPublic) { Requires.NotNull(property, nameof(property)); return property.GetGetMethod(nonPublic); } - public static MethodInfo GetSetMethod(PropertyInfo property) + public static MethodInfo GetSetMethod(this PropertyInfo property) { Requires.NotNull(property, nameof(property)); return property.GetSetMethod(); } - public static MethodInfo GetSetMethod(PropertyInfo property, bool nonPublic) + public static MethodInfo GetSetMethod(this PropertyInfo property, bool nonPublic) { Requires.NotNull(property, nameof(property)); return property.GetSetMethod(nonPublic); diff --git a/mcs/class/Facades/System.Runtime.InteropServices/TypeForwarders.cs b/mcs/class/Facades/System.Runtime.InteropServices/TypeForwarders.cs index 94249720f6..361d3326ff 100644 --- a/mcs/class/Facades/System.Runtime.InteropServices/TypeForwarders.cs +++ b/mcs/class/Facades/System.Runtime.InteropServices/TypeForwarders.cs @@ -20,11 +20,9 @@ // THE SOFTWARE. // -#if !FULL_AOT_RUNTIME [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ComImportAttribute))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.DispatchWrapper))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.InteropServices.ErrorWrapper))] -#endif [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DataMisalignedException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.DllNotFoundException))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.Missing))] diff --git a/mcs/class/Facades/System.Security.SecureString/SecureStringMarshal.cs b/mcs/class/Facades/System.Security.SecureString/SecureStringMarshal.cs index 59c85a4291..8fb33b4f63 100644 --- a/mcs/class/Facades/System.Security.SecureString/SecureStringMarshal.cs +++ b/mcs/class/Facades/System.Security.SecureString/SecureStringMarshal.cs @@ -20,28 +20,30 @@ // THE SOFTWARE. // +using System.Runtime.InteropServices; + namespace System.Security { public static class SecureStringMarshal { public static IntPtr SecureStringToCoTaskMemAnsi (SecureString s) { - throw new NotImplementedException (); + return Marshal.SecureStringToCoTaskMemAnsi (s); } public static IntPtr SecureStringToCoTaskMemUnicode (SecureString s) { - throw new NotImplementedException (); + return Marshal.SecureStringToCoTaskMemUnicode (s); } public static IntPtr SecureStringToGlobalAllocAnsi (SecureString s) { - throw new NotImplementedException (); + return Marshal.SecureStringToGlobalAllocAnsi (s); } public static IntPtr SecureStringToGlobalAllocUnicode (SecureString s) { - throw new NotImplementedException (); + return Marshal.SecureStringToGlobalAllocUnicode (s); } } } diff --git a/mcs/class/Facades/System.ServiceProcess.ServiceController/ServiceController_mobile.cs b/mcs/class/Facades/System.ServiceProcess.ServiceController/ServiceController_mobile.cs index f84a27d1c9..617465326f 100644 --- a/mcs/class/Facades/System.ServiceProcess.ServiceController/ServiceController_mobile.cs +++ b/mcs/class/Facades/System.ServiceProcess.ServiceController/ServiceController_mobile.cs @@ -37,208 +37,180 @@ namespace System.ServiceProcess { public class ServiceController : IDisposable { - [MonoTODO] public bool CanPauseAndContinue { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public bool CanShutdown { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public bool CanStop { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public ServiceController[] DependentServices { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public string DisplayName { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public string MachineName { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public SafeHandle ServiceHandle { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public string ServiceName { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public ServiceController[] ServicesDependedOn { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public ServiceType ServiceType { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public ServiceStartMode StartType { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public ServiceControllerStatus Status { get { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } - [MonoTODO] public ServiceController (string name) { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public ServiceController (string name, string machineName) { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public void Continue () { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public void Dispose () { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] protected virtual void Dispose (bool disposing) { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public static ServiceController[] GetDevices () { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public static ServiceController[] GetDevices (string machineName) { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public static ServiceController[] GetServices () { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public static ServiceController[] GetServices (string machineName) { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public void Pause () { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public void Refresh () { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public void Start () { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public void Start (string[] args) { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public void Stop () { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public void WaitForStatus (ServiceControllerStatus desiredStatus) { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public void WaitForStatus (ServiceControllerStatus desiredStatus, TimeSpan timeout) { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } } diff --git a/mcs/class/Facades/System.ServiceProcess.ServiceController/TimeoutException_mobile.cs b/mcs/class/Facades/System.ServiceProcess.ServiceController/TimeoutException_mobile.cs index c6448d899f..5dbf4041b3 100644 --- a/mcs/class/Facades/System.ServiceProcess.ServiceController/TimeoutException_mobile.cs +++ b/mcs/class/Facades/System.ServiceProcess.ServiceController/TimeoutException_mobile.cs @@ -36,22 +36,19 @@ namespace System.ServiceProcess { public class TimeoutException : Exception { - [MonoTODO] public TimeoutException () { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public TimeoutException (string message) { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } - [MonoTODO] public TimeoutException (string message, Exception innerException) { - throw new NotImplementedException (); + throw new PlatformNotSupportedException (); } } } diff --git a/mcs/class/Facades/System.Threading.AccessControl/ThreadingAclExtensions.cs b/mcs/class/Facades/System.Threading.AccessControl/ThreadingAclExtensions.cs index af61a50a0e..99b03b28ed 100644 --- a/mcs/class/Facades/System.Threading.AccessControl/ThreadingAclExtensions.cs +++ b/mcs/class/Facades/System.Threading.AccessControl/ThreadingAclExtensions.cs @@ -36,40 +36,52 @@ namespace System.Threading { public static class ThreadingAclExtensions { - [MonoTODO] - public static EventWaitHandleSecurity GetAccessControl (EventWaitHandle handle) + public static EventWaitHandleSecurity GetAccessControl (this EventWaitHandle handle) { - throw new NotImplementedException (); + if (handle == null) + throw new ArgumentNullException (nameof (handle)); + + return handle.GetAccessControl (); } - [MonoTODO] - public static void SetAccessControl (EventWaitHandle handle, EventWaitHandleSecurity eventSecurity) + public static void SetAccessControl (this EventWaitHandle handle, EventWaitHandleSecurity eventSecurity) { - throw new NotImplementedException (); + if (handle == null) + throw new ArgumentNullException (nameof (handle)); + + handle.SetAccessControl (eventSecurity); } - [MonoTODO] - public static MutexSecurity GetAccessControl (Mutex mutex) + public static MutexSecurity GetAccessControl (this Mutex mutex) { - throw new NotImplementedException (); + if (mutex == null) + throw new ArgumentNullException (nameof (mutex)); + + return mutex.GetAccessControl (); } - [MonoTODO] - public static void SetAccessControl (Mutex mutex, MutexSecurity mutexSecurity) + public static void SetAccessControl (this Mutex mutex, MutexSecurity mutexSecurity) { - throw new NotImplementedException (); + if (mutex == null) + throw new ArgumentNullException (nameof (mutex)); + + mutex.SetAccessControl (mutexSecurity); } - [MonoTODO] - public static SemaphoreSecurity GetAccessControl (Semaphore semaphore) + public static SemaphoreSecurity GetAccessControl (this Semaphore semaphore) { - throw new NotImplementedException (); + if (semaphore == null) + throw new ArgumentNullException (nameof (semaphore)); + + return semaphore.GetAccessControl (); } - [MonoTODO] - public static void SetAccessControl (Semaphore semaphore, SemaphoreSecurity semaphoreSecurity) + public static void SetAccessControl (this Semaphore semaphore, SemaphoreSecurity semaphoreSecurity) { - throw new NotImplementedException (); + if (semaphore == null) + throw new ArgumentNullException (nameof (semaphore)); + + semaphore.SetAccessControl (semaphoreSecurity); } } } \ No newline at end of file diff --git a/mcs/class/Facades/subdirs.make b/mcs/class/Facades/subdirs.make index df1dd02040..c980d70840 100644 --- a/mcs/class/Facades/subdirs.make +++ b/mcs/class/Facades/subdirs.make @@ -24,7 +24,7 @@ System.Security.Cryptography.Encryption.Aes System.Security.Cryptography.Encrypt System.Security.Cryptography.Hashing.Algorithms System.Security.Cryptography.RSA System.Security.Cryptography.RandomNumberGenerator \ System.Security.Principal.Windows System.Threading.Thread System.Threading.ThreadPool \ System.Xml.XPath System.Xml.XmlDocument System.Xml.Xsl.Primitives Microsoft.Win32.Registry.AccessControl System.Diagnostics.StackTrace System.Globalization.Extensions \ -System.IO.FileSystem.AccessControl System.Private.CoreLib.InteropServices System.Reflection.TypeExtensions \ +System.IO.FileSystem.AccessControl System.Reflection.TypeExtensions \ System.Security.SecureString System.Threading.AccessControl System.Threading.Overlapped System.Xml.XPath.XDocument \ System.Security.Cryptography.Primitives System.Text.Encoding.CodePages System.IO.FileSystem.Watcher \ System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController System.IO.Pipes diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs index 4877d434a2..9cb4b8a6ee 100644 --- a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs +++ b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs @@ -38,6 +38,8 @@ using Mono.Data.Tds.Protocol; using System; using System.IO; using System.Text; +using System.Threading; +using System.Threading.Tasks; using System.Collections; using System.ComponentModel; using System.Data; @@ -1426,6 +1428,25 @@ namespace System.Data.SqlClient throw new NotImplementedException (); } + override public Task GetFieldValueAsync (int i, CancellationToken cancellationToken) + { + return base.GetFieldValueAsync (i, cancellationToken); + } + + override public Stream GetStream (int i) + { + return base.GetStream (i); + } + override public TextReader GetTextReader (int i) + { + return base.GetTextReader (i); + } + + override public Task IsDBNullAsync (int i, CancellationToken cancellationToken) + { + return base.IsDBNullAsync (i, cancellationToken); + } + #endregion // Methods } } diff --git a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.InteropServices.RuntimeInformation/Assembly/AssemblyInfo.cs index 21e80b5733..1a408f2711 100644 --- a/mcs/class/System.Runtime.InteropServices.RuntimeInformation/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Runtime.InteropServices.RuntimeInformation/Assembly/AssemblyInfo.cs @@ -46,7 +46,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany (Consts.MonoCompany)] [assembly: AssemblyProduct (Consts.MonoProduct)] [assembly: AssemblyCopyright (Consts.MonoCopyright)] -[assembly: AssemblyVersion (Consts.FxVersion)] +[assembly: AssemblyVersion ("4.0.0.0")] [assembly: SatelliteContractVersion (Consts.FxVersion)] [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)] [assembly: AssemblyFileVersion (Consts.FxFileVersion)] diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs index d836c1e4ff..27c57d1092 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/AlgorithmIdentifier.cs @@ -45,15 +45,15 @@ namespace System.Security.Cryptography.Pkcs { _params = new byte [0]; } - public AlgorithmIdentifier (Oid algorithm) + public AlgorithmIdentifier (Oid oid) { - _oid = algorithm; + _oid = oid; _params = new byte [0]; } - public AlgorithmIdentifier (Oid algorithm, int keyLength) + public AlgorithmIdentifier (Oid oid, int keyLength) { - _oid = algorithm; + _oid = oid; _length = keyLength; _params = new byte [0]; } diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ContentInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ContentInfo.cs index 32b675abb2..3bf9efb989 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ContentInfo.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/ContentInfo.cs @@ -53,14 +53,14 @@ namespace System.Security.Cryptography.Pkcs { { } - public ContentInfo (Oid oid, byte[] content) + public ContentInfo (Oid contentType, byte[] content) { - if (oid == null) - throw new ArgumentNullException ("oid"); + if (contentType == null) + throw new ArgumentNullException ("contentType"); if (content == null) throw new ArgumentNullException ("content"); - _oid = oid; + _oid = contentType; _content = content; } diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs index 1f57f5c551..3942e5bba1 100644 --- a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs +++ b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/EnvelopedCms.cs @@ -61,12 +61,12 @@ namespace System.Security.Cryptography.Pkcs { _uattribs = new CryptographicAttributeObjectCollection (); } - public EnvelopedCms (ContentInfo content) : this () + public EnvelopedCms (ContentInfo contentInfo) : this () { - if (content == null) - throw new ArgumentNullException ("content"); + if (contentInfo == null) + throw new ArgumentNullException ("contentInfo"); - _content = content; + _content = contentInfo; } public EnvelopedCms (ContentInfo contentInfo, AlgorithmIdentifier encryptionAlgorithm) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/AddressHeader.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/AddressHeader.cs index 4372574e1e..1e07c4830d 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/AddressHeader.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/AddressHeader.cs @@ -45,9 +45,9 @@ namespace System.ServiceModel.Channels return new DefaultAddressHeader (value); } - public static AddressHeader CreateAddressHeader (object value, XmlObjectSerializer formatter) + public static AddressHeader CreateAddressHeader (object value, XmlObjectSerializer serializer) { - return new DefaultAddressHeader (value, formatter); + return new DefaultAddressHeader (value, serializer); } public static AddressHeader CreateAddressHeader (string name, string ns, object value) @@ -56,11 +56,11 @@ namespace System.ServiceModel.Channels } public static AddressHeader CreateAddressHeader (string name, string ns, object value, - XmlObjectSerializer formatter) + XmlObjectSerializer serializer) { - if (formatter == null) - throw new ArgumentNullException ("formatter"); - return new DefaultAddressHeader (name, ns, value, formatter); + if (serializer == null) + throw new ArgumentNullException ("serializer"); + return new DefaultAddressHeader (name, ns, value, serializer); } public override bool Equals (object obj) @@ -93,9 +93,9 @@ namespace System.ServiceModel.Channels return GetValue (new DataContractSerializer (typeof (T))); } - public T GetValue (XmlObjectSerializer formatter) + public T GetValue (XmlObjectSerializer serializer) { - return (T) formatter.ReadObject (GetAddressHeaderReader ()); + return (T) serializer.ReadObject (GetAddressHeaderReader ()); } protected abstract void OnWriteAddressHeaderContents (XmlDictionaryWriter writer); diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/AddressHeaderCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/AddressHeaderCollection.cs index 3969ad3b57..e8f2470d56 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/AddressHeaderCollection.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/AddressHeaderCollection.cs @@ -47,8 +47,8 @@ namespace System.ServiceModel.Channels { } - public AddressHeaderCollection (IEnumerable headers) - : base (GetList (headers)) + public AddressHeaderCollection (IEnumerable addressHeaders) + : base (GetList (addressHeaders)) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingContext.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingContext.cs index ad0742ce8d..601c2c07d9 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingContext.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingContext.cs @@ -44,17 +44,17 @@ namespace System.ServiceModel.Channels BindingElementCollection elements; // for internal use public BindingContext (CustomBinding binding, - BindingParameterCollection parms) + BindingParameterCollection parameters) { if (binding == null) throw new ArgumentNullException ("binding"); - if (parms == null) - throw new ArgumentNullException ("parms"); + if (parameters == null) + throw new ArgumentNullException ("parameters"); this.binding = binding; - parameters = new BindingParameterCollection (); - foreach (var item in parms) - parameters.Add (item); + this.parameters = new BindingParameterCollection (); + foreach (var item in parameters) + this.parameters.Add (item); this.elements = new BindingElementCollection (); foreach (var item in binding.Elements) this.elements.Add (item); diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingElement.cs index d7bd810a4f..d9808b0f30 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingElement.cs @@ -40,7 +40,7 @@ namespace System.ServiceModel.Channels } [MonoTODO] - protected BindingElement (BindingElement other) + protected BindingElement (BindingElement elementToBeCloned) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingElementCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingElementCollection.cs index 762cb61b51..ea1fa491ef 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingElementCollection.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/BindingElementCollection.cs @@ -38,14 +38,14 @@ namespace System.ServiceModel.Channels { } - public BindingElementCollection (BindingElement [] bindings) + public BindingElementCollection (BindingElement [] elements) { - AddRange (bindings); + AddRange (elements); } - public BindingElementCollection (IEnumerable bindings) + public BindingElementCollection (IEnumerable elements) { - foreach (BindingElement e in bindings) + foreach (BindingElement e in elements) Add (e); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelBase.cs index 693799434b..b251375659 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelBase.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelBase.cs @@ -39,9 +39,9 @@ namespace System.ServiceModel.Channels { ChannelManagerBase manager; - protected ChannelBase (ChannelManagerBase manager) + protected ChannelBase (ChannelManagerBase channelManager) { - this.manager = manager; + this.manager = channelManager; } protected internal override TimeSpan DefaultCloseTimeout { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelFactoryBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelFactoryBase.cs index cd573744e2..d4df2f0f12 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelFactoryBase.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelFactoryBase.cs @@ -98,29 +98,29 @@ namespace System.ServiceModel.Channels } public TChannel CreateChannel ( - EndpointAddress remoteAddress) + EndpointAddress address) { - if (remoteAddress == null) - throw new ArgumentNullException ("remoteAddress"); - return CreateChannel (remoteAddress, remoteAddress.Uri); + if (address == null) + throw new ArgumentNullException ("address"); + return CreateChannel (address, address.Uri); } public TChannel CreateChannel ( - EndpointAddress remoteAddress, Uri via) + EndpointAddress address, Uri via) { - if (remoteAddress == null) - throw new ArgumentNullException ("remoteAddress"); + if (address == null) + throw new ArgumentNullException ("address"); if (via == null) throw new ArgumentNullException ("via"); ValidateCreateChannel (); - var ch = OnCreateChannel (remoteAddress, via); + var ch = OnCreateChannel (address, via); channels.Add (ch); return ch; } protected abstract TChannel OnCreateChannel ( - EndpointAddress remoteAddress, Uri via); + EndpointAddress address, Uri via); protected override void OnAbort () { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs index cecbb8ccb1..feb1f9ae77 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs @@ -68,19 +68,19 @@ namespace System.ServiceModel.Channels security = binding as ISecurityCapabilities; } - public CustomBinding (params BindingElement [] binding) - : this ("CustomBinding", default_ns, binding) + public CustomBinding (params BindingElement [] bindingElementsInTopDownChannelStackOrder) + : this ("CustomBinding", default_ns, bindingElementsInTopDownChannelStackOrder) { } - public CustomBinding (IEnumerable bindingElements) - : this (bindingElements, "CustomBinding", default_ns) + public CustomBinding (IEnumerable bindingElementsInTopDownChannelStackOrder) + : this (bindingElementsInTopDownChannelStackOrder, "CustomBinding", default_ns) { } public CustomBinding (string name, string ns, - params BindingElement [] binding) - : this (binding, name, ns) + params BindingElement [] bindingElementsInTopDownChannelStackOrder) + : this (bindingElementsInTopDownChannelStackOrder, name, ns) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/FaultConverter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/FaultConverter.cs index 23c8081ebe..b8c5b4d35d 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/FaultConverter.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/FaultConverter.cs @@ -47,20 +47,20 @@ namespace System.ServiceModel.Channels [MonoTODO] protected abstract bool OnTryCreateException ( - Message message, MessageFault fault, out Exception error); + Message message, MessageFault fault, out Exception exception); [MonoTODO] protected abstract bool OnTryCreateFaultMessage ( - Exception error, out Message message); + Exception exception, out Message message); - public bool TryCreateException (Message message, MessageFault fault, out Exception error) + public bool TryCreateException (Message message, MessageFault fault, out Exception exception) { - return OnTryCreateException (message, fault, out error); + return OnTryCreateException (message, fault, out exception); } - public bool TryCreateFaultMessage (Exception error, out Message message) + public bool TryCreateFaultMessage (Exception exception, out Message message) { - return OnTryCreateFaultMessage (error, out message); + return OnTryCreateFaultMessage (exception, out message); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpTransportBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpTransportBindingElement.cs index 6b70a26e3b..f9778c782a 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpTransportBindingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpTransportBindingElement.cs @@ -67,28 +67,28 @@ namespace System.ServiceModel.Channels } protected HttpTransportBindingElement ( - HttpTransportBindingElement other) - : base (other) + HttpTransportBindingElement elementToBeCloned) + : base (elementToBeCloned) { - allow_cookies = other.allow_cookies; - bypass_proxy_on_local = other.bypass_proxy_on_local; - unsafe_ntlm_auth = other.unsafe_ntlm_auth; - use_default_proxy = other.use_default_proxy; - keep_alive_enabled = other.keep_alive_enabled; - max_buffer_size = other.max_buffer_size; - host_cmp_mode = other.host_cmp_mode; - proxy_address = other.proxy_address; - realm = other.realm; - transfer_mode = other.transfer_mode; + allow_cookies = elementToBeCloned.allow_cookies; + bypass_proxy_on_local = elementToBeCloned.bypass_proxy_on_local; + unsafe_ntlm_auth = elementToBeCloned.unsafe_ntlm_auth; + use_default_proxy = elementToBeCloned.use_default_proxy; + keep_alive_enabled = elementToBeCloned.keep_alive_enabled; + max_buffer_size = elementToBeCloned.max_buffer_size; + host_cmp_mode = elementToBeCloned.host_cmp_mode; + proxy_address = elementToBeCloned.proxy_address; + realm = elementToBeCloned.realm; + transfer_mode = elementToBeCloned.transfer_mode; // FIXME: it does not look safe - timeouts = other.timeouts; - auth_scheme = other.auth_scheme; - proxy_auth_scheme = other.proxy_auth_scheme; + timeouts = elementToBeCloned.timeouts; + auth_scheme = elementToBeCloned.auth_scheme; + proxy_auth_scheme = elementToBeCloned.proxy_auth_scheme; - DecompressionEnabled = other.DecompressionEnabled; - LegacyExtendedProtectionPolicy = other.LegacyExtendedProtectionPolicy; - ExtendedProtectionPolicy = other.ExtendedProtectionPolicy; - cookie_manager = other.cookie_manager; + DecompressionEnabled = elementToBeCloned.DecompressionEnabled; + LegacyExtendedProtectionPolicy = elementToBeCloned.LegacyExtendedProtectionPolicy; + ExtendedProtectionPolicy = elementToBeCloned.ExtendedProtectionPolicy; + cookie_manager = elementToBeCloned.cookie_manager; } [DefaultValue (AuthenticationSchemes.Anonymous)] diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpsTransportBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpsTransportBindingElement.cs index d95dd5f35e..38ae7b2c95 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpsTransportBindingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpsTransportBindingElement.cs @@ -47,10 +47,10 @@ namespace System.ServiceModel.Channels } protected HttpsTransportBindingElement ( - HttpsTransportBindingElement other) - : base (other) + HttpsTransportBindingElement elementToBeCloned) + : base (elementToBeCloned) { - req_cli_cert = other.req_cli_cert; + req_cli_cert = elementToBeCloned.req_cli_cert; } public bool RequireClientCertificate { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs index f67ce5dd8a..1b6be5ad60 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs @@ -98,10 +98,10 @@ namespace System.ServiceModel.Channels return OnGetBody (GetReaderAtBodyContents ()); } - public T GetBody (XmlObjectSerializer xmlFormatter) + public T GetBody (XmlObjectSerializer serializer) { // FIXME: Somehow use OnGetBody() here as well? - return (T)xmlFormatter.ReadObject (GetReaderAtBodyContents ()); + return (T)serializer.ReadObject (GetReaderAtBodyContents ()); } protected virtual T OnGetBody (XmlDictionaryReader reader) @@ -369,13 +369,13 @@ namespace System.ServiceModel.Channels // 5) public static Message CreateMessage (MessageVersion version, - string action, object body, XmlObjectSerializer xmlFormatter) + string action, object body, XmlObjectSerializer serializer) { return body == null ? CreateMessage (version, action) : CreateMessage ( version, action, - new XmlObjectSerializerBodyWriter (body, xmlFormatter)); + new XmlObjectSerializerBodyWriter (body, serializer)); } // 6) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageEncodingBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageEncodingBindingElement.cs index 49a8478f6f..e9e8ddef3a 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageEncodingBindingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageEncodingBindingElement.cs @@ -42,9 +42,9 @@ namespace System.ServiceModel.Channels [MonoTODO] public - MessageEncodingBindingElement (MessageEncodingBindingElement source) + MessageEncodingBindingElement (MessageEncodingBindingElement elementToBeCloned) { - MessageVersion = source.MessageVersion; + MessageVersion = elementToBeCloned.MessageVersion; } public abstract MessageEncoderFactory @@ -52,11 +52,11 @@ namespace System.ServiceModel.Channels public abstract MessageVersion MessageVersion { get; set; } - public override T GetProperty (BindingContext ctx) + public override T GetProperty (BindingContext context) { if (typeof (T) == typeof (MessageVersion)) return (T) (object) MessageVersion; - return ctx.GetInnerProperty (); + return context.GetInnerProperty (); } #if !NET_2_1 && !XAMMAC_4_5 diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs index 3e809c4b13..e8e1053358 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs @@ -397,12 +397,12 @@ namespace System.ServiceModel.Channels return GetDetail (new DataContractSerializer (typeof (T))); } - public T GetDetail (XmlObjectSerializer formatter) + public T GetDetail (XmlObjectSerializer serializer) { if (!HasDetail) throw new InvalidOperationException ("This message does not have details."); - return (T) formatter.ReadObject (GetReaderAtDetailContents ()); + return (T) serializer.ReadObject (GetReaderAtDetailContents ()); } public XmlDictionaryReader GetReaderAtDetailContents () diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeader.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeader.cs index 8427b92c56..baf4d8b356 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeader.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeader.cs @@ -59,56 +59,56 @@ namespace System.ServiceModel.Channels return CreateHeader (name, ns, value, default_must_understand); } - public static MessageHeader CreateHeader (string name, string ns, object value, bool must_understand) + public static MessageHeader CreateHeader (string name, string ns, object value, bool mustUnderstand) { - return CreateHeader (name, ns, value, must_understand, default_actor); + return CreateHeader (name, ns, value, mustUnderstand, default_actor); } - public static MessageHeader CreateHeader (string name, string ns, object value, XmlObjectSerializer formatter) + public static MessageHeader CreateHeader (string name, string ns, object value, XmlObjectSerializer serializer) { - return CreateHeader (name, ns, value, formatter, default_must_understand, + return CreateHeader (name, ns, value, serializer, default_must_understand, default_actor, default_relay); } public static MessageHeader CreateHeader (string name, string ns, object value, - bool must_understand, string actor) + bool mustUnderstand, string actor) { - return CreateHeader (name, ns, value, must_understand, actor, default_relay); + return CreateHeader (name, ns, value, mustUnderstand, actor, default_relay); } - public static MessageHeader CreateHeader (string name, string ns, object value, XmlObjectSerializer formatter, - bool must_understand) + public static MessageHeader CreateHeader (string name, string ns, object value, XmlObjectSerializer serializer, + bool mustUnderstand) { - return CreateHeader (name, ns, value, formatter, must_understand, default_actor, default_relay); + return CreateHeader (name, ns, value, serializer, mustUnderstand, default_actor, default_relay); } public static MessageHeader CreateHeader (string name, string ns, object value, - bool must_understand, string actor, bool relay) + bool mustUnderstand, string actor, bool relay) { return CreateHeader (name, ns, value, new DataContractSerializer (value.GetType ()), - must_understand, actor, relay); + mustUnderstand, actor, relay); } - public static MessageHeader CreateHeader (string name, string ns, object value, XmlObjectSerializer formatter, - bool must_understand, string actor) + public static MessageHeader CreateHeader (string name, string ns, object value, XmlObjectSerializer serializer, + bool mustUnderstand, string actor) { - return CreateHeader (name, ns, value, formatter, must_understand, actor, default_relay); + return CreateHeader (name, ns, value, serializer, mustUnderstand, actor, default_relay); } - public static MessageHeader CreateHeader (string name, string ns, object value, XmlObjectSerializer formatter, - bool must_understand, string actor, bool relay) + public static MessageHeader CreateHeader (string name, string ns, object value, XmlObjectSerializer serializer, + bool mustUnderstand, string actor, bool relay) { // FIXME: how to get IsReferenceParameter ? - return new DefaultMessageHeader (name, ns, value, formatter, default_is_ref, must_understand, actor, relay); + return new DefaultMessageHeader (name, ns, value, serializer, default_is_ref, mustUnderstand, actor, relay); } - public virtual bool IsMessageVersionSupported (MessageVersion version) + public virtual bool IsMessageVersionSupported (MessageVersion messageVersion) { - if (version.Envelope == EnvelopeVersion.Soap12) + if (messageVersion.Envelope == EnvelopeVersion.Soap12) if (Actor == EnvelopeVersion.Soap11.NextDestinationActorValue) return false; - if (version.Envelope == EnvelopeVersion.Soap11) + if (messageVersion.Envelope == EnvelopeVersion.Soap11) if (Actor == EnvelopeVersion.Soap12.NextDestinationActorValue || Actor == EnvelopeVersion.Soap12UltimateReceiver) return false; @@ -117,9 +117,9 @@ namespace System.ServiceModel.Channels return true; } - protected abstract void OnWriteHeaderContents (XmlDictionaryWriter writer, MessageVersion version); + protected abstract void OnWriteHeaderContents (XmlDictionaryWriter writer, MessageVersion messageVersion); - protected virtual void OnWriteStartHeader (XmlDictionaryWriter writer, MessageVersion version) + protected virtual void OnWriteStartHeader (XmlDictionaryWriter writer, MessageVersion messageVersion) { var dic = Constants.SoapDictionary; XmlDictionaryString name, ns; @@ -128,7 +128,7 @@ namespace System.ServiceModel.Channels writer.WriteStartElement (prefix, name, ns); else writer.WriteStartElement (prefix, this.Name, this.Namespace); - WriteHeaderAttributes (writer, version); + WriteHeaderAttributes (writer, messageVersion); } public override string ToString () @@ -143,58 +143,58 @@ namespace System.ServiceModel.Channels return sb.ToString (); } - public void WriteHeader (XmlDictionaryWriter writer, MessageVersion version) + public void WriteHeader (XmlDictionaryWriter writer, MessageVersion messageVersion) { if (writer == null) throw new ArgumentNullException ("writer is null."); - if (version == null) - throw new ArgumentNullException ("version is null."); + if (messageVersion == null) + throw new ArgumentNullException ("messageVersion is null."); - if (version.Envelope == EnvelopeVersion.None) + if (messageVersion.Envelope == EnvelopeVersion.None) return; - WriteStartHeader (writer, version); - WriteHeaderContents (writer, version); + WriteStartHeader (writer, messageVersion); + WriteHeaderContents (writer, messageVersion); writer.WriteEndElement (); } - public void WriteHeader (XmlWriter writer, MessageVersion version) + public void WriteHeader (XmlWriter writer, MessageVersion messageVersion) { - WriteHeader (XmlDictionaryWriter.CreateDictionaryWriter (writer), version); + WriteHeader (XmlDictionaryWriter.CreateDictionaryWriter (writer), messageVersion); } - protected void WriteHeaderAttributes (XmlDictionaryWriter writer, MessageVersion version) + protected void WriteHeaderAttributes (XmlDictionaryWriter writer, MessageVersion messageVersion) { var dic = Constants.SoapDictionary; if (Id != null) writer.WriteAttributeString ("u", dic.Add ("Id"), dic.Add (Constants.WsuNamespace), Id); if (!String.IsNullOrEmpty (Actor)) { - if (version.Envelope == EnvelopeVersion.Soap11) - writer.WriteAttributeString ("s", dic.Add ("actor"), dic.Add (version.Envelope.Namespace), Actor); + if (messageVersion.Envelope == EnvelopeVersion.Soap11) + writer.WriteAttributeString ("s", dic.Add ("actor"), dic.Add (messageVersion.Envelope.Namespace), Actor); - if (version.Envelope == EnvelopeVersion.Soap12) - writer.WriteAttributeString ("s", dic.Add ("role"), dic.Add (version.Envelope.Namespace), Actor); + if (messageVersion.Envelope == EnvelopeVersion.Soap12) + writer.WriteAttributeString ("s", dic.Add ("role"), dic.Add (messageVersion.Envelope.Namespace), Actor); } // mustUnderstand is the same across SOAP 1.1 and 1.2 if (MustUnderstand == true) - writer.WriteAttributeString ("s", dic.Add ("mustUnderstand"), dic.Add (version.Envelope.Namespace), "1"); + writer.WriteAttributeString ("s", dic.Add ("mustUnderstand"), dic.Add (messageVersion.Envelope.Namespace), "1"); // relay is only available on SOAP 1.2 - if (Relay == true && version.Envelope == EnvelopeVersion.Soap12) - writer.WriteAttributeString ("s", dic.Add ("relay"), dic.Add (version.Envelope.Namespace), "true"); + if (Relay == true && messageVersion.Envelope == EnvelopeVersion.Soap12) + writer.WriteAttributeString ("s", dic.Add ("relay"), dic.Add (messageVersion.Envelope.Namespace), "true"); } - public void WriteHeaderContents (XmlDictionaryWriter writer, MessageVersion version) + public void WriteHeaderContents (XmlDictionaryWriter writer, MessageVersion messageVersion) { - this.OnWriteHeaderContents (writer, version); + this.OnWriteHeaderContents (writer, messageVersion); } - public void WriteStartHeader (XmlDictionaryWriter writer, MessageVersion version) + public void WriteStartHeader (XmlDictionaryWriter writer, MessageVersion messageVersion) { - this.OnWriteStartHeader (writer, version); + this.OnWriteStartHeader (writer, messageVersion); } public override string Actor { get { return default_actor; }} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs index 4060586ca1..c813ff318e 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs @@ -72,9 +72,9 @@ namespace System.ServiceModel.Channels l.Add (header); } - public void CopyHeaderFrom (Message m, int index) + public void CopyHeaderFrom (Message message, int headerIndex) { - CopyHeaderFrom (m.Headers, index); + CopyHeaderFrom (message.Headers, headerIndex); } public void Clear () @@ -82,25 +82,25 @@ namespace System.ServiceModel.Channels l.Clear (); } - public void CopyHeaderFrom (MessageHeaders headers, int index) + public void CopyHeaderFrom (MessageHeaders collection, int headerIndex) { - l.Add (headers [index]); + l.Add (collection [headerIndex]); } - public void CopyHeadersFrom (Message m) + public void CopyHeadersFrom (Message message) { - CopyHeadersFrom (m.Headers); + CopyHeadersFrom (message.Headers); } - public void CopyHeadersFrom (MessageHeaders headers) + public void CopyHeadersFrom (MessageHeaders collection) { - foreach (MessageHeaderInfo h in headers) + foreach (MessageHeaderInfo h in collection) l.Add (h); } - public void CopyTo (MessageHeaderInfo [] dst, int index) + public void CopyTo (MessageHeaderInfo [] array, int index) { - l.CopyTo (dst, index); + l.CopyTo (array, index); } public int FindHeader (string name, string ns) @@ -203,11 +203,11 @@ namespace System.ServiceModel.Channels return GetHeader (idx, serializer); } - public XmlDictionaryReader GetReaderAtHeader (int index) + public XmlDictionaryReader GetReaderAtHeader (int headerIndex) { - if (index >= l.Count) - throw new ArgumentOutOfRangeException (String.Format ("Index is out of range. Current header count is {0}", index)); - MessageHeader item = (MessageHeader) l [index]; + if (headerIndex >= l.Count) + throw new ArgumentOutOfRangeException (String.Format ("Index is out of range. Current header count is {0}", l.Count)); + MessageHeader item = (MessageHeader) l [headerIndex]; XmlReader reader = item is MessageHeader.XmlMessageHeader ? @@ -231,9 +231,9 @@ namespace System.ServiceModel.Channels throw new NotImplementedException (); } - public void Insert (int index, MessageHeader header) + public void Insert (int headerIndex, MessageHeader header) { - l.Insert (index, header); + l.Insert (headerIndex, header); } public void RemoveAll (string name, string ns) @@ -251,9 +251,9 @@ namespace System.ServiceModel.Channels l.RemoveAt (l.Count - 1); } - public void RemoveAt (int index) + public void RemoveAt (int headerIndex) { - l.RemoveAt (index); + l.RemoveAt (headerIndex); } IEnumerator IEnumerable.GetEnumerator () @@ -261,48 +261,48 @@ namespace System.ServiceModel.Channels return ((IEnumerable) l).GetEnumerator (); } - public void WriteHeader (int index, XmlDictionaryWriter writer) + public void WriteHeader (int headerIndex, XmlDictionaryWriter writer) { if (version.Envelope == EnvelopeVersion.None) return; - WriteStartHeader (index, writer); - WriteHeaderContents (index, writer); + WriteStartHeader (headerIndex, writer); + WriteHeaderContents (headerIndex, writer); writer.WriteEndElement (); } - public void WriteHeader (int index, XmlWriter writer) + public void WriteHeader (int headerIndex, XmlWriter writer) { - WriteHeader (index, XmlDictionaryWriter.CreateDictionaryWriter (writer)); + WriteHeader (headerIndex, XmlDictionaryWriter.CreateDictionaryWriter (writer)); } - public void WriteHeaderContents (int index, XmlDictionaryWriter writer) + public void WriteHeaderContents (int headerIndex, XmlDictionaryWriter writer) { - if (index > l.Count) - throw new ArgumentOutOfRangeException ("There is no header at position " + index + "."); + if (headerIndex > l.Count) + throw new ArgumentOutOfRangeException ("There is no header at position " + headerIndex + "."); - MessageHeader h = l [index] as MessageHeader; + MessageHeader h = l [headerIndex] as MessageHeader; h.WriteHeaderContents (writer, version); } - public void WriteHeaderContents (int index, XmlWriter writer) + public void WriteHeaderContents (int headerIndex, XmlWriter writer) { - WriteHeaderContents (index, XmlDictionaryWriter.CreateDictionaryWriter (writer)); + WriteHeaderContents (headerIndex, XmlDictionaryWriter.CreateDictionaryWriter (writer)); } - public void WriteStartHeader (int index, XmlDictionaryWriter writer) + public void WriteStartHeader (int headerIndex, XmlDictionaryWriter writer) { - if (index > l.Count) - throw new ArgumentOutOfRangeException ("There is no header at position " + index + "."); + if (headerIndex > l.Count) + throw new ArgumentOutOfRangeException ("There is no header at position " + headerIndex + "."); - MessageHeader h = l [index] as MessageHeader; + MessageHeader h = l [headerIndex] as MessageHeader; h.WriteStartHeader (writer, version); } - public void WriteStartHeader (int index, XmlWriter writer) + public void WriteStartHeader (int headerIndex, XmlWriter writer) { - WriteStartHeader (index, XmlDictionaryWriter.CreateDictionaryWriter (writer)); + WriteStartHeader (headerIndex, XmlDictionaryWriter.CreateDictionaryWriter (writer)); } public string Action { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageVersion.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageVersion.cs index f79b9e94c4..27f3ea130c 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageVersion.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageVersion.cs @@ -53,36 +53,36 @@ namespace System.ServiceModel.Channels { this.addressing = addressing; } - public static MessageVersion CreateVersion (EnvelopeVersion envelope_version) + public static MessageVersion CreateVersion (EnvelopeVersion envelopeVersion) { - return CreateVersion (envelope_version, + return CreateVersion (envelopeVersion, AddressingVersion.WSAddressing10); } - public static MessageVersion CreateVersion (EnvelopeVersion envelope_version, - AddressingVersion addressing_version) + public static MessageVersion CreateVersion (EnvelopeVersion envelopeVersion, + AddressingVersion addressingVersion) { - if (envelope_version == EnvelopeVersion.None && addressing_version == AddressingVersion.None) + if (envelopeVersion == EnvelopeVersion.None && addressingVersion == AddressingVersion.None) return None; - if (envelope_version == EnvelopeVersion.Soap11 && addressing_version == AddressingVersion.None) + if (envelopeVersion == EnvelopeVersion.Soap11 && addressingVersion == AddressingVersion.None) return Soap11; - if (envelope_version == EnvelopeVersion.Soap12 && addressing_version == AddressingVersion.WSAddressing10) + if (envelopeVersion == EnvelopeVersion.Soap12 && addressingVersion == AddressingVersion.WSAddressing10) return Soap12WSAddressing10; - if (envelope_version == EnvelopeVersion.Soap12 && addressing_version == AddressingVersion.None) + if (envelopeVersion == EnvelopeVersion.Soap12 && addressingVersion == AddressingVersion.None) return Soap12; - if (envelope_version == EnvelopeVersion.Soap11 && addressing_version == AddressingVersion.WSAddressing10) + if (envelopeVersion == EnvelopeVersion.Soap11 && addressingVersion == AddressingVersion.WSAddressing10) return Soap11WSAddressing10; - if (envelope_version == EnvelopeVersion.Soap11 && addressing_version == AddressingVersion.WSAddressingAugust2004) + if (envelopeVersion == EnvelopeVersion.Soap11 && addressingVersion == AddressingVersion.WSAddressingAugust2004) return Soap11WSAddressingAugust2004; - if (envelope_version == EnvelopeVersion.Soap12 && addressing_version == AddressingVersion.WSAddressingAugust2004) + if (envelopeVersion == EnvelopeVersion.Soap12 && addressingVersion == AddressingVersion.WSAddressingAugust2004) return Soap12WSAddressingAugust2004; - throw new ArgumentException (string.Format ("EnvelopeVersion {0} cannot be used with AddressingVersion {1}", envelope_version, addressing_version)); + throw new ArgumentException (string.Format ("EnvelopeVersion {0} cannot be used with AddressingVersion {1}", envelopeVersion, addressingVersion)); } - public override bool Equals (object value) + public override bool Equals (object obj) { - MessageVersion other = value as MessageVersion; + MessageVersion other = obj as MessageVersion; if (other == null) return false; diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityBindingElement.cs index 1f47b906c0..22c56cb785 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityBindingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityBindingElement.cs @@ -531,29 +531,29 @@ namespace System.ServiceModel.Channels #endif public static SecurityBindingElement - CreateSecureConversationBindingElement (SecurityBindingElement binding) + CreateSecureConversationBindingElement (SecurityBindingElement bootstrapSecurity) { - return CreateSecureConversationBindingElement (binding, false); + return CreateSecureConversationBindingElement (bootstrapSecurity, false); } public static SecurityBindingElement CreateSecureConversationBindingElement ( - SecurityBindingElement binding, bool requireCancellation) + SecurityBindingElement bootstrapSecurity, bool requireCancellation) { - return CreateSecureConversationBindingElement (binding, requireCancellation, null); + return CreateSecureConversationBindingElement (bootstrapSecurity, requireCancellation, null); } public static SecurityBindingElement CreateSecureConversationBindingElement ( - SecurityBindingElement binding, bool requireCancellation, - ChannelProtectionRequirements protectionRequirements) + SecurityBindingElement bootstrapSecurity, bool requireCancellation, + ChannelProtectionRequirements bootstrapProtectionRequirements) { #if !NET_2_1 && !XAMMAC_4_5 SymmetricSecurityBindingElement be = new SymmetricSecurityBindingElement (); be.ProtectionTokenParameters = new SecureConversationSecurityTokenParameters ( - binding, requireCancellation, protectionRequirements); + bootstrapSecurity, requireCancellation, bootstrapProtectionRequirements); return be; #else throw new NotImplementedException (); diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpTransportBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpTransportBindingElement.cs index ae823e534e..e80c26c308 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpTransportBindingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TcpTransportBindingElement.cs @@ -53,12 +53,12 @@ namespace System.ServiceModel.Channels } protected TcpTransportBindingElement ( - TcpTransportBindingElement other) - : base (other) + TcpTransportBindingElement elementToBeCloned) + : base (elementToBeCloned) { - listen_backlog = other.listen_backlog; - port_sharing_enabled = other.port_sharing_enabled; - pool.CopyPropertiesFrom (other.pool); + listen_backlog = elementToBeCloned.listen_backlog; + port_sharing_enabled = elementToBeCloned.port_sharing_enabled; + pool.CopyPropertiesFrom (elementToBeCloned.pool); } public TcpConnectionPoolSettings ConnectionPoolSettings { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransportBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransportBindingElement.cs index bab577c5ba..c1326c7cf9 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransportBindingElement.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransportBindingElement.cs @@ -48,12 +48,12 @@ namespace System.ServiceModel.Channels } protected TransportBindingElement ( - TransportBindingElement other) - : base (other) + TransportBindingElement elementToBeCloned) + : base (elementToBeCloned) { - manual_addressing = other.manual_addressing; - max_buffer_pool_size = other.max_buffer_pool_size; - max_recv_message_size = other.max_recv_message_size; + manual_addressing = elementToBeCloned.manual_addressing; + max_buffer_pool_size = elementToBeCloned.max_buffer_pool_size; + max_recv_message_size = elementToBeCloned.max_recv_message_size; } public virtual bool ManualAddressing { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientCredentials.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientCredentials.cs index c50146bfb3..ce4d6c4e37 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientCredentials.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientCredentials.cs @@ -51,17 +51,17 @@ namespace System.ServiceModel.Description } [MonoTODO] - protected ClientCredentials (ClientCredentials source) + protected ClientCredentials (ClientCredentials other) { - userpass = source.userpass.Clone (); - digest = source.digest.Clone (); - initiator = source.initiator.Clone (); - recipient = source.recipient.Clone (); - windows = source.windows.Clone (); + userpass = other.userpass.Clone (); + digest = other.digest.Clone (); + initiator = other.initiator.Clone (); + recipient = other.recipient.Clone (); + windows = other.windows.Clone (); #if !NET_2_1 - issued_token = source.issued_token.Clone (); - peer = source.peer.Clone (); - support_interactive = source.support_interactive; + issued_token = other.issued_token.Clone (); + peer = other.peer.Clone (); + support_interactive = other.support_interactive; #endif } @@ -159,10 +159,10 @@ namespace System.ServiceModel.Description [MonoTODO] public virtual void ApplyClientBehavior ( - ServiceEndpoint endpoint, ClientRuntime behavior) + ServiceEndpoint serviceEndpoint, ClientRuntime behavior) { - if (endpoint == null) - throw new ArgumentNullException ("endpoint"); + if (serviceEndpoint == null) + throw new ArgumentNullException ("serviceEndpoint"); if (behavior == null) throw new ArgumentNullException ("behavior"); diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IContractBehavior.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IContractBehavior.cs index 9d12a23d4d..08327a5b50 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IContractBehavior.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IContractBehavior.cs @@ -35,22 +35,22 @@ namespace System.ServiceModel.Description public interface IContractBehavior { void AddBindingParameters ( - ContractDescription description, + ContractDescription contractDescription, ServiceEndpoint endpoint, - BindingParameterCollection parameters); + BindingParameterCollection bindingParameters); void ApplyClientBehavior ( - ContractDescription description, + ContractDescription contractDescription, ServiceEndpoint endpoint, - ClientRuntime proxy); + ClientRuntime clientRuntime); void ApplyDispatchBehavior ( - ContractDescription description, + ContractDescription contractDescription, ServiceEndpoint endpoint, - DispatchRuntime dispatch); + DispatchRuntime dispatchRuntime); void Validate ( - ContractDescription description, + ContractDescription contractDescription, ServiceEndpoint endpoint); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IEndpointBehavior.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IEndpointBehavior.cs index 6eb47ec704..773d2676da 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IEndpointBehavior.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IEndpointBehavior.cs @@ -34,11 +34,11 @@ namespace System.ServiceModel.Description public interface IEndpointBehavior { void AddBindingParameters (ServiceEndpoint endpoint, - BindingParameterCollection parameters); - void ApplyDispatchBehavior (ServiceEndpoint serviceEndpoint, - EndpointDispatcher dispatcher); - void ApplyClientBehavior (ServiceEndpoint serviceEndpoint, - ClientRuntime behavior); - void Validate (ServiceEndpoint serviceEndpoint); + BindingParameterCollection bindingParameters); + void ApplyDispatchBehavior (ServiceEndpoint endpoint, + EndpointDispatcher endpointDispatcher); + void ApplyClientBehavior (ServiceEndpoint endpoint, + ClientRuntime clientRuntime); + void Validate (ServiceEndpoint endpoint); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IOperationBehavior.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IOperationBehavior.cs index aa67812dfe..5c887c122b 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IOperationBehavior.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IOperationBehavior.cs @@ -34,18 +34,18 @@ namespace System.ServiceModel.Description public interface IOperationBehavior { void AddBindingParameters ( - OperationDescription description, - BindingParameterCollection parameters); + OperationDescription operationDescription, + BindingParameterCollection bindingParameters); void ApplyDispatchBehavior ( - OperationDescription description, - DispatchOperation dispatch); + OperationDescription operationDescription, + DispatchOperation dispatchOperation); void ApplyClientBehavior ( - OperationDescription description, - ClientOperation proxy); + OperationDescription operationDescription, + ClientOperation clientOperation); void Validate ( - OperationDescription description); + OperationDescription operationDescription); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IClientMessageFormatter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IClientMessageFormatter.cs index 7c0afae785..ddf9735e5d 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IClientMessageFormatter.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IClientMessageFormatter.cs @@ -31,7 +31,7 @@ namespace System.ServiceModel.Dispatcher { public interface IClientMessageFormatter { - object DeserializeReply (Message message, object [] paremeters); - Message SerializeRequest (MessageVersion version, object [] inputs); + object DeserializeReply (Message message, object [] parameters); + Message SerializeRequest (MessageVersion messageVersion, object [] parameters); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IClientMessageInspector.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IClientMessageInspector.cs index 5e331a0bd6..f1eb699517 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IClientMessageInspector.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IClientMessageInspector.cs @@ -31,7 +31,7 @@ namespace System.ServiceModel.Dispatcher { public interface IClientMessageInspector { - void AfterReceiveReply (ref Message message, object correlationState); - object BeforeSendRequest (ref Message message, IClientChannel channel); + void AfterReceiveReply (ref Message reply, object correlationState); + object BeforeSendRequest (ref Message request, IClientChannel channel); } } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs index 3d8e71035a..41a1376f05 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs @@ -75,30 +75,30 @@ namespace System.ServiceModel.Security.Tokens } public SecureConversationSecurityTokenParameters ( - SecurityBindingElement element) - : this (element, true) + SecurityBindingElement bootstrapSecurityBindingElement) + : this (bootstrapSecurityBindingElement, true) { } public SecureConversationSecurityTokenParameters ( - SecurityBindingElement element, + SecurityBindingElement bootstrapSecurityBindingElement, bool requireCancellation) - : this (element, requireCancellation, null) + : this (bootstrapSecurityBindingElement, requireCancellation, null) { } #if !MOBILE && !XAMMAC_4_5 public SecureConversationSecurityTokenParameters ( - SecurityBindingElement element, + SecurityBindingElement bootstrapSecurityBindingElement, bool requireCancellation, - ChannelProtectionRequirements requirements) + ChannelProtectionRequirements bootstrapProtectionRequirements) { - this.element = element; + this.element = bootstrapSecurityBindingElement; this.cancellable = requireCancellation; - if (requirements == null) + if (bootstrapProtectionRequirements == null) this.requirements = new ChannelProtectionRequirements (default_channel_protection_requirements); else - this.requirements = new ChannelProtectionRequirements (requirements); + this.requirements = new ChannelProtectionRequirements (bootstrapProtectionRequirements); } #else internal SecureConversationSecurityTokenParameters ( diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ActionNotSupportedException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ActionNotSupportedException.cs index bd2b762d94..5b558599b0 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ActionNotSupportedException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ActionNotSupportedException.cs @@ -35,8 +35,8 @@ namespace System.ServiceModel public class ActionNotSupportedException : CommunicationException { public ActionNotSupportedException () : base () {} - public ActionNotSupportedException (string msg) : base (msg) {} - public ActionNotSupportedException (string msg, Exception inner) : base (msg, inner) {} + public ActionNotSupportedException (string message) : base (message) {} + public ActionNotSupportedException (string message, Exception innerException) : base (message, innerException) {} protected ActionNotSupportedException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs index e5ef83357f..d2ba82da51 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs @@ -85,9 +85,9 @@ namespace System.ServiceModel get { return Endpoint.Binding.OpenTimeout; } } - protected virtual void ApplyConfiguration (string endpointConfig) + protected virtual void ApplyConfiguration (string configurationName) { - if (endpointConfig == null) + if (configurationName == null) return; #if NET_2_1 || XAMMAC_4_5 @@ -96,22 +96,22 @@ namespace System.ServiceModel var cfg = new SilverlightClientConfigLoader ().Load (XmlReader.Create ("ServiceReferences.ClientConfig")); SilverlightClientConfigLoader.ServiceEndpointConfiguration se = null; - if (endpointConfig == "*") + if (configurationName == "*") se = cfg.GetServiceEndpointConfiguration (Endpoint.Contract.Name); if (se == null) - se = cfg.GetServiceEndpointConfiguration (endpointConfig); + se = cfg.GetServiceEndpointConfiguration (configurationName); if (se.Binding != null && Endpoint.Binding == null) Endpoint.Binding = se.Binding; else // ignore it - Console.WriteLine ("WARNING: Configured binding not found in configuration {0}", endpointConfig); + Console.WriteLine ("WARNING: Configured binding not found in configuration {0}", configurationName); if (se.Address != null && Endpoint.Address == null) Endpoint.Address = se.Address; else // ignore it - Console.WriteLine ("WARNING: Configured endpoint address not found in configuration {0}", endpointConfig); + Console.WriteLine ("WARNING: Configured endpoint address not found in configuration {0}", configurationName); } catch (Exception) { // ignore it. - Console.WriteLine ("WARNING: failed to load endpoint configuration for {0}", endpointConfig); + Console.WriteLine ("WARNING: failed to load endpoint configuration for {0}", configurationName); } #else @@ -120,7 +120,7 @@ namespace System.ServiceModel ChannelEndpointElement endpoint = null; foreach (ChannelEndpointElement el in client.Endpoints) { - if (el.Contract == contractName && (endpointConfig == el.Name || endpointConfig == "*")) { + if (el.Contract == contractName && (configurationName == el.Name || configurationName == "*")) { if (endpoint != null) throw new InvalidOperationException (String.Format ("More then one endpoint matching contract {0} was found.", contractName)); endpoint = el; @@ -128,7 +128,7 @@ namespace System.ServiceModel } if (endpoint == null) - throw new InvalidOperationException (String.Format ("Client endpoint configuration '{0}' was not found in {1} endpoints.", endpointConfig, client.Endpoints.Count)); + throw new InvalidOperationException (String.Format ("Client endpoint configuration '{0}' was not found in {1} endpoints.", configurationName, client.Endpoints.Count)); var binding = String.IsNullOrEmpty (endpoint.Binding) ? null : ConfigUtil.CreateBinding (endpoint.Binding, endpoint.BindingConfiguration); var contractType = ConfigUtil.GetTypeFromConfigString (endpoint.Contract, NamedConfigCategory.Contract); @@ -298,23 +298,23 @@ namespace System.ServiceModel } protected void InitializeEndpoint ( - string endpointConfigurationName, + string configurationName, EndpointAddress remoteAddress) { InitializeEndpoint (CreateDescription ()); if (remoteAddress != null) service_endpoint.Address = remoteAddress; - ApplyConfiguration (endpointConfigurationName); + ApplyConfiguration (configurationName); } protected void InitializeEndpoint (Binding binding, - EndpointAddress remoteAddress) + EndpointAddress address) { InitializeEndpoint (CreateDescription ()); if (binding != null) service_endpoint.Binding = binding; - if (remoteAddress != null) - service_endpoint.Address = remoteAddress; + if (address != null) + service_endpoint.Address = address; } protected void InitializeEndpoint (ServiceEndpoint endpoint) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs index 1af7625027..0f6560c743 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs @@ -46,12 +46,12 @@ namespace System.ServiceModel { } - protected ChannelFactory (Type type) + protected ChannelFactory (Type channelType) { - if (type == null) - throw new ArgumentNullException ("type"); - if (!type.IsInterface) - throw new InvalidOperationException ("The type argument to the generic ChannelFactory constructor must be an interface type."); + if (channelType == null) + throw new ArgumentNullException ("channelType"); + if (!channelType.IsInterface) + throw new InvalidOperationException ("The channelType argument to the generic ChannelFactory constructor must be an interface type."); InitializeEndpoint (CreateDescription ()); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationException.cs index a41db9ad05..9acde8e4f9 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationException.cs @@ -34,8 +34,8 @@ namespace System.ServiceModel { public class CommunicationException : SystemException { public CommunicationException () : base () {} - public CommunicationException (string msg) : base (msg) {} - public CommunicationException (string msg, Exception inner) : base (msg, inner) {} + public CommunicationException (string message) : base (message) {} + public CommunicationException (string message, Exception innerException) : base (message, innerException) {} protected CommunicationException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationObjectAbortedException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationObjectAbortedException.cs index 720d23eb9c..57f814c2a9 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationObjectAbortedException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationObjectAbortedException.cs @@ -34,9 +34,9 @@ namespace System.ServiceModel { public class CommunicationObjectAbortedException : CommunicationException { public CommunicationObjectAbortedException () : base () {} - public CommunicationObjectAbortedException (string msg) : base (msg) {} - public CommunicationObjectAbortedException (string msg, Exception inner) - : base (msg, inner) {} + public CommunicationObjectAbortedException (string message) : base (message) {} + public CommunicationObjectAbortedException (string message, Exception innerException) + : base (message, innerException) {} protected CommunicationObjectAbortedException (SerializationInfo info, StreamingContext context) : base (info, context) {} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationObjectFaultedException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationObjectFaultedException.cs index c6fb51ee96..6538d6a338 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationObjectFaultedException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/CommunicationObjectFaultedException.cs @@ -34,9 +34,9 @@ namespace System.ServiceModel { public class CommunicationObjectFaultedException : CommunicationException { public CommunicationObjectFaultedException () : base () {} - public CommunicationObjectFaultedException (string msg) : base (msg) {} - public CommunicationObjectFaultedException (string msg, Exception inner) - : base (msg, inner) {} + public CommunicationObjectFaultedException (string message) : base (message) {} + public CommunicationObjectFaultedException (string message, Exception innerException) + : base (message, innerException) {} protected CommunicationObjectFaultedException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/DnsEndpointIdentity.cs b/mcs/class/System.ServiceModel/System.ServiceModel/DnsEndpointIdentity.cs index 9c9b76aec6..fb4d18dc56 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/DnsEndpointIdentity.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/DnsEndpointIdentity.cs @@ -45,12 +45,12 @@ namespace System.ServiceModel Initialize (identity); } - public DnsEndpointIdentity (string dns) - : this (Claim.CreateDnsClaim (dns)) + public DnsEndpointIdentity (string dnsName) + : this (Claim.CreateDnsClaim (dnsName)) { } #else - public DnsEndpointIdentity (string dns) + public DnsEndpointIdentity (string dnsName) { throw new NotImplementedException (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs index f437b1a495..64ce85812b 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs @@ -34,71 +34,71 @@ namespace System.ServiceModel { public class DuplexClientBase : ClientBase where TChannel : class { - protected DuplexClientBase (object instance) - : this (new InstanceContext (instance), (Binding) null, null) + protected DuplexClientBase (object callbackInstance) + : this (new InstanceContext (callbackInstance), (Binding) null, null) { } - protected DuplexClientBase (object instance, - Binding binding, EndpointAddress address) - : this (new InstanceContext (instance), binding, address) + protected DuplexClientBase (object callbackInstance, + Binding binding, EndpointAddress remoteAddress) + : this (new InstanceContext (callbackInstance), binding, remoteAddress) { } - protected DuplexClientBase (object instance, - string configurationName) - : this (new InstanceContext (instance), configurationName) + protected DuplexClientBase (object callbackInstance, + string endpointConfigurationName) + : this (new InstanceContext (callbackInstance), endpointConfigurationName) { } - protected DuplexClientBase (object instance, - string bindingConfigurationName, EndpointAddress address) - : this (new InstanceContext (instance), bindingConfigurationName, address) + protected DuplexClientBase (object callbackInstance, + string bindingConfigurationName, EndpointAddress remoteAddress) + : this (new InstanceContext (callbackInstance), bindingConfigurationName, remoteAddress) { } - protected DuplexClientBase (object instance, + protected DuplexClientBase (object callbackInstance, string endpointConfigurationName, string remoteAddress) - : this (new InstanceContext (instance), endpointConfigurationName, remoteAddress) + : this (new InstanceContext (callbackInstance), endpointConfigurationName, remoteAddress) { } - protected DuplexClientBase (InstanceContext instance) - : base (instance) + protected DuplexClientBase (InstanceContext callbackInstance) + : base (callbackInstance) { } - protected DuplexClientBase (InstanceContext instance, - Binding binding, EndpointAddress address) - : base (instance, binding, address) + protected DuplexClientBase (InstanceContext callbackInstance, + Binding binding, EndpointAddress remoteAddress) + : base (callbackInstance, binding, remoteAddress) { } - protected DuplexClientBase (InstanceContext instance, - string configurationName) - : base (instance, configurationName) + protected DuplexClientBase (InstanceContext callbackInstance, + string endpointConfigurationName) + : base (callbackInstance, endpointConfigurationName) { } - protected DuplexClientBase (InstanceContext instance, + protected DuplexClientBase (InstanceContext callbackInstance, string endpointConfigurationName, string remoteAddress) - : base (instance, endpointConfigurationName, remoteAddress) + : base (callbackInstance, endpointConfigurationName, remoteAddress) { } - protected DuplexClientBase (InstanceContext instance, - string configurationName, EndpointAddress address) - : base (instance, configurationName, address) + protected DuplexClientBase (InstanceContext callbackInstance, + string endpointConfigurationName, EndpointAddress address) + : base (callbackInstance, endpointConfigurationName, address) { } - protected DuplexClientBase (object instance, ServiceEndpoint endpoint) - : this (new InstanceContext (instance), endpoint) + protected DuplexClientBase (object callbackInstance, ServiceEndpoint endpoint) + : this (new InstanceContext (callbackInstance), endpoint) { } - protected DuplexClientBase (InstanceContext instance, ServiceEndpoint endpoint) - : base (instance, endpoint) + protected DuplexClientBase (InstanceContext callbackInstance, ServiceEndpoint endpoint) + : base (callbackInstance, endpoint) { } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs index 7c09860e48..153567710f 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs @@ -70,11 +70,11 @@ namespace System.ServiceModel { } - public EndpointAddress (Uri uri, params AddressHeader [] headers) - : this (uri, null, new AddressHeaderCollection (headers), null, null) {} + public EndpointAddress (Uri uri, params AddressHeader [] addressHeaders) + : this (uri, null, new AddressHeaderCollection (addressHeaders), null, null) {} - public EndpointAddress (Uri uri, EndpointIdentity identity, params AddressHeader [] headers) - : this (uri, identity, new AddressHeaderCollection (headers), null, null) {} + public EndpointAddress (Uri uri, EndpointIdentity identity, params AddressHeader [] addressHeaders) + : this (uri, identity, new AddressHeaderCollection (addressHeaders), null, null) {} public EndpointAddress (Uri uri, EndpointIdentity identity, AddressHeaderCollection headers) : this (uri, identity, headers, null, null) {} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointNotFoundException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointNotFoundException.cs index a3b6448245..fc44796f7c 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointNotFoundException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointNotFoundException.cs @@ -34,8 +34,8 @@ namespace System.ServiceModel { public class EndpointNotFoundException : CommunicationException { public EndpointNotFoundException () : base () {} - public EndpointNotFoundException (string msg) : base (msg) {} - public EndpointNotFoundException (string msg, Exception inner) : base (msg, inner) {} + public EndpointNotFoundException (string message) : base (message) {} + public EndpointNotFoundException (string message, Exception innerException) : base (message, innerException) {} protected EndpointNotFoundException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/FaultCode.cs b/mcs/class/System.ServiceModel/System.ServiceModel/FaultCode.cs index c33159baca..a2b47aa4f6 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/FaultCode.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/FaultCode.cs @@ -42,16 +42,16 @@ namespace System.ServiceModel { } - public FaultCode (string name, FaultCode subcode) - : this (name, String.Empty, subcode) + public FaultCode (string name, FaultCode subCode) + : this (name, String.Empty, subCode) { } - public FaultCode (string name, string ns, FaultCode subcode) + public FaultCode (string name, string ns, FaultCode subCode) { this.name = name; this.ns = ns; - this.subcode = subcode; + this.subcode = subCode; } public bool IsPredefinedFault { @@ -78,9 +78,9 @@ namespace System.ServiceModel get { return subcode; } } - public static FaultCode CreateReceiverFaultCode (FaultCode subcode) + public static FaultCode CreateReceiverFaultCode (FaultCode subCode) { - return new FaultCode ("Receiver", subcode); + return new FaultCode ("Receiver", subCode); } public static FaultCode CreateReceiverFaultCode (string name, string ns) @@ -88,9 +88,9 @@ namespace System.ServiceModel return CreateReceiverFaultCode (new FaultCode (name, ns)); } - public static FaultCode CreateSenderFaultCode (FaultCode subcode) + public static FaultCode CreateSenderFaultCode (FaultCode subCode) { - return new FaultCode ("Sender", subcode); + return new FaultCode ("Sender", subCode); } public static FaultCode CreateSenderFaultCode (string name, string ns) diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs index 5e06e2f128..05b3af01ca 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs @@ -100,7 +100,7 @@ namespace System.ServiceModel } [MonoTODO] - public static FaultException CreateFault (MessageFault fault, params Type [] details) + public static FaultException CreateFault (MessageFault messageFault, params Type [] faultDetailTypes) { throw new NotImplementedException (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/InvalidMessageContractException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/InvalidMessageContractException.cs index fe787f2312..eb0f348ffd 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/InvalidMessageContractException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/InvalidMessageContractException.cs @@ -34,8 +34,8 @@ namespace System.ServiceModel { public class InvalidMessageContractException : SystemException { public InvalidMessageContractException () : base () {} - public InvalidMessageContractException (string msg) : base (msg) {} - public InvalidMessageContractException (string msg, Exception inner) : base (msg, inner) {} + public InvalidMessageContractException (string message) : base (message) {} + public InvalidMessageContractException (string message, Exception innerException) : base (message, innerException) {} protected InvalidMessageContractException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/MessageHeaderException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/MessageHeaderException.cs index b47c54750f..376c3861ad 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/MessageHeaderException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/MessageHeaderException.cs @@ -35,8 +35,8 @@ namespace System.ServiceModel { public class MessageHeaderException : ProtocolException { public MessageHeaderException () : this ("Message header exception") {} - public MessageHeaderException (string msg) : this (msg, null) {} - public MessageHeaderException (string msg, Exception inner) : base (msg, inner) {} + public MessageHeaderException (string message) : this (message, null) {} + public MessageHeaderException (string message, Exception innerException) : base (message, innerException) {} protected MessageHeaderException (SerializationInfo info, StreamingContext context) : base (info, context) { diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/MessageHeader_1.cs b/mcs/class/System.ServiceModel/System.ServiceModel/MessageHeader_1.cs index 04814785c6..e6d17aab27 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/MessageHeader_1.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/MessageHeader_1.cs @@ -53,10 +53,10 @@ namespace System.ServiceModel { } - public MessageHeader (T content, bool must_understand, string actor, bool relay) + public MessageHeader (T content, bool mustUnderstand, string actor, bool relay) { this.content = content; - this.must_understand = must_understand; + this.must_understand = mustUnderstand; this.actor = actor; this.relay = relay; } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ProtocolException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ProtocolException.cs index e2fc290816..4a2a89d205 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ProtocolException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ProtocolException.cs @@ -34,9 +34,9 @@ namespace System.ServiceModel { public class ProtocolException : CommunicationException { public ProtocolException () : base () {} - public ProtocolException (string msg) : base (msg) {} - public ProtocolException (string msg, Exception inner) - : base (msg, inner) {} + public ProtocolException (string message) : base (message) {} + public ProtocolException (string message, Exception innerException) + : base (message, innerException) {} protected ProtocolException (SerializationInfo info, StreamingContext context) : base (info, context) {} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/QuotaExceededException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/QuotaExceededException.cs index adf08d2a07..0407be8830 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/QuotaExceededException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/QuotaExceededException.cs @@ -34,9 +34,9 @@ namespace System.ServiceModel { public class QuotaExceededException : SystemException { public QuotaExceededException () : base () {} - public QuotaExceededException (string msg) : base (msg) {} - public QuotaExceededException (string msg, Exception inner) - : base (msg, inner) {} + public QuotaExceededException (string message) : base (message) {} + public QuotaExceededException (string message, Exception innerException) + : base (message, innerException) {} protected QuotaExceededException (SerializationInfo info, StreamingContext context) : base (info, context) {} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServerTooBusyException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServerTooBusyException.cs index f38f312520..c96b274e2a 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ServerTooBusyException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServerTooBusyException.cs @@ -34,9 +34,9 @@ namespace System.ServiceModel { public class ServerTooBusyException : CommunicationException { public ServerTooBusyException () : base () {} - public ServerTooBusyException (string msg) : base (msg) {} - public ServerTooBusyException (string msg, Exception inner) - : base (msg, inner) {} + public ServerTooBusyException (string message) : base (message) {} + public ServerTooBusyException (string message, Exception innerException) + : base (message, innerException) {} protected ServerTooBusyException (SerializationInfo info, StreamingContext context) : base (info, context) {} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceActivationException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceActivationException.cs index 6fe64902d4..a55841387a 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceActivationException.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceActivationException.cs @@ -34,9 +34,9 @@ namespace System.ServiceModel { public class ServiceActivationException : CommunicationException { public ServiceActivationException () : base () {} - public ServiceActivationException (string msg) : base (msg) {} - public ServiceActivationException (string msg, Exception inner) - : base (msg, inner) {} + public ServiceActivationException (string message) : base (message) {} + public ServiceActivationException (string message, Exception innerException) + : base (message, innerException) {} protected ServiceActivationException (SerializationInfo info, StreamingContext context) : base (info, context) {} diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/SpnEndpointIdentity.cs b/mcs/class/System.ServiceModel/System.ServiceModel/SpnEndpointIdentity.cs index 396579fd25..4381d758cf 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/SpnEndpointIdentity.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/SpnEndpointIdentity.cs @@ -45,12 +45,12 @@ namespace System.ServiceModel Initialize (identity); } - public SpnEndpointIdentity (string spn) - : this (Claim.CreateSpnClaim (spn)) + public SpnEndpointIdentity (string spnName) + : this (Claim.CreateSpnClaim (spnName)) { } #else - public SpnEndpointIdentity (string spn) + public SpnEndpointIdentity (string spnName) { throw new NotImplementedException (); } diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/UpnEndpointIdentity.cs b/mcs/class/System.ServiceModel/System.ServiceModel/UpnEndpointIdentity.cs index e53d72009a..93863a78e5 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/UpnEndpointIdentity.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/UpnEndpointIdentity.cs @@ -45,12 +45,12 @@ namespace System.ServiceModel Initialize (identity); } - public UpnEndpointIdentity (string upn) - : this (Claim.CreateUpnClaim (upn)) + public UpnEndpointIdentity (string upnName) + : this (Claim.CreateUpnClaim (upnName)) { } #else - public UpnEndpointIdentity (string upn) + public UpnEndpointIdentity (string upnName) { throw new NotImplementedException (); } diff --git a/mcs/class/System/System.IO.Compression/DeflateStream.cs b/mcs/class/System/System.IO.Compression/DeflateStream.cs index 5c38fccfe1..0eb6f62931 100644 --- a/mcs/class/System/System.IO.Compression/DeflateStream.cs +++ b/mcs/class/System/System.IO.Compression/DeflateStream.cs @@ -52,13 +52,13 @@ namespace System.IO.Compression bool disposed; DeflateStreamNative native; - public DeflateStream (Stream compressedStream, CompressionMode mode) : - this (compressedStream, mode, false, false) + public DeflateStream (Stream stream, CompressionMode mode) : + this (stream, mode, false, false) { } - public DeflateStream (Stream compressedStream, CompressionMode mode, bool leaveOpen) : - this (compressedStream, mode, leaveOpen, false) + public DeflateStream (Stream stream, CompressionMode mode, bool leaveOpen) : + this (stream, mode, leaveOpen, false) { } @@ -124,23 +124,23 @@ namespace System.IO.Compression } } - public override int Read (byte[] dest, int dest_offset, int count) + public override int Read (byte[] array, int offset, int count) { if (disposed) throw new ObjectDisposedException (GetType ().FullName); - if (dest == null) + if (array == null) throw new ArgumentNullException ("Destination array is null."); if (!CanRead) throw new InvalidOperationException ("Stream does not support reading."); - int len = dest.Length; - if (dest_offset < 0 || count < 0) + int len = array.Length; + if (offset < 0 || count < 0) throw new ArgumentException ("Dest or count is negative."); - if (dest_offset > len) + if (offset > len) throw new ArgumentException ("destination offset is beyond array size"); - if ((dest_offset + count) > len) + if ((offset + count) > len) throw new ArgumentException ("Reading would overrun buffer"); - return ReadInternal (dest, dest_offset, count); + return ReadInternal (array, offset, count); } unsafe void WriteInternal (byte[] array, int offset, int count) @@ -154,16 +154,16 @@ namespace System.IO.Compression } } - public override void Write (byte[] src, int src_offset, int count) + public override void Write (byte[] array, int offset, int count) { if (disposed) throw new ObjectDisposedException (GetType ().FullName); - if (src == null) - throw new ArgumentNullException ("src"); + if (array == null) + throw new ArgumentNullException ("array"); - if (src_offset < 0) - throw new ArgumentOutOfRangeException ("src_offset"); + if (offset < 0) + throw new ArgumentOutOfRangeException ("offset"); if (count < 0) throw new ArgumentOutOfRangeException ("count"); @@ -171,10 +171,10 @@ namespace System.IO.Compression if (!CanWrite) throw new NotSupportedException ("Stream does not support writing"); - if (src_offset > src.Length - count) + if (offset > array.Length - count) throw new ArgumentException ("Buffer too small. count/offset wrong."); - WriteInternal (src, src_offset, count); + WriteInternal (array, offset, count); } public override void Flush () diff --git a/mcs/class/System/System.IO.Compression/GZipStream.cs b/mcs/class/System/System.IO.Compression/GZipStream.cs index 88f774ad09..edd8e93a89 100644 --- a/mcs/class/System/System.IO.Compression/GZipStream.cs +++ b/mcs/class/System/System.IO.Compression/GZipStream.cs @@ -70,21 +70,21 @@ namespace System.IO.Compression { base.Dispose (disposing); } - public override int Read (byte[] dest, int dest_offset, int count) + public override int Read (byte[] array, int offset, int count) { if (deflateStream == null) throw new ObjectDisposedException (GetType ().FullName); - return deflateStream.Read(dest, dest_offset, count); + return deflateStream.Read(array, offset, count); } - public override void Write (byte[] src, int src_offset, int count) + public override void Write (byte[] array, int offset, int count) { if (deflateStream == null) throw new ObjectDisposedException (GetType ().FullName); - deflateStream.Write (src, src_offset, count); + deflateStream.Write (array, offset, count); } public override void Flush() diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs.REMOVED.git-id b/mcs/class/System/System.Net.Sockets/Socket.cs.REMOVED.git-id index 063939da6a..deae1e53fd 100644 --- a/mcs/class/System/System.Net.Sockets/Socket.cs.REMOVED.git-id +++ b/mcs/class/System/System.Net.Sockets/Socket.cs.REMOVED.git-id @@ -1 +1 @@ -f894f490612fc2b6ff9f185bd113be8941234c9b \ No newline at end of file +3dd17d0c16ba42ad68b52821e4491c8eafe06c04 \ No newline at end of file diff --git a/mcs/class/System/System.Security.AccessControl/SemaphoreAccessRule.cs b/mcs/class/System/System.Security.AccessControl/SemaphoreAccessRule.cs index 97b7b1c70c..c9754ea299 100644 --- a/mcs/class/System/System.Security.AccessControl/SemaphoreAccessRule.cs +++ b/mcs/class/System/System.Security.AccessControl/SemaphoreAccessRule.cs @@ -34,16 +34,16 @@ namespace System.Security.AccessControl { public sealed class SemaphoreAccessRule : AccessRule { public SemaphoreAccessRule (IdentityReference identity, - SemaphoreRights semaphoreRights, + SemaphoreRights eventRights, AccessControlType type) - : base (identity, (int)semaphoreRights, false, InheritanceFlags.None, PropagationFlags.None, type) + : base (identity, (int)eventRights, false, InheritanceFlags.None, PropagationFlags.None, type) { } public SemaphoreAccessRule (string identity, - SemaphoreRights semaphoreRights, + SemaphoreRights eventRights, AccessControlType type) - : this (new NTAccount (identity), semaphoreRights, type) + : this (new NTAccount (identity), eventRights, type) { } diff --git a/mcs/class/System/System.Security.AccessControl/SemaphoreAuditRule.cs b/mcs/class/System/System.Security.AccessControl/SemaphoreAuditRule.cs index 5680f0f7ed..acc495ce45 100644 --- a/mcs/class/System/System.Security.AccessControl/SemaphoreAuditRule.cs +++ b/mcs/class/System/System.Security.AccessControl/SemaphoreAuditRule.cs @@ -35,9 +35,9 @@ namespace System.Security.AccessControl { : AuditRule { public SemaphoreAuditRule (IdentityReference identity, - SemaphoreRights semaphoreRights, + SemaphoreRights eventRights, AuditFlags flags) - : base (identity, (int)semaphoreRights, false, InheritanceFlags.None, PropagationFlags.None, flags) + : base (identity, (int)eventRights, false, InheritanceFlags.None, PropagationFlags.None, flags) { } diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs index 15de9f7b3c..192c9bd4d7 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509KeyUsageExtension.cs @@ -94,14 +94,14 @@ namespace System.Security.Cryptography.X509Certificates { // methods - public override void CopyFrom (AsnEncodedData encodedData) + public override void CopyFrom (AsnEncodedData asnEncodedData) { - if (encodedData == null) - throw new ArgumentNullException ("encodedData"); + if (asnEncodedData == null) + throw new ArgumentNullException ("asnEncodedData"); - X509Extension ex = (encodedData as X509Extension); + X509Extension ex = (asnEncodedData as X509Extension); if (ex == null) - throw new ArgumentException (Locale.GetText ("Wrong type."), "encodedData"); + throw new ArgumentException (Locale.GetText ("Wrong type."), "asnEncodedData"); if (ex._oid == null) _oid = new Oid (oid, friendlyName); diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs index 89e7afb963..bf24e85f8c 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509SubjectKeyIdentifierExtension.cs @@ -159,14 +159,14 @@ namespace System.Security.Cryptography.X509Certificates { // methods - public override void CopyFrom (AsnEncodedData encodedData) + public override void CopyFrom (AsnEncodedData asnEncodedData) { - if (encodedData == null) - throw new ArgumentNullException ("encodedData"); + if (asnEncodedData == null) + throw new ArgumentNullException ("asnEncodedData"); - X509Extension ex = (encodedData as X509Extension); + X509Extension ex = (asnEncodedData as X509Extension); if (ex == null) - throw new ArgumentException (Locale.GetText ("Wrong type."), "encodedData"); + throw new ArgumentException (Locale.GetText ("Wrong type."), "asnEncodedData"); if (ex._oid == null) _oid = new Oid (oid, friendlyName); diff --git a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs index ae4c08c10b..1f3919573e 100644 --- a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs +++ b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs @@ -37,10 +37,10 @@ using System; using System.Security; using System.Reflection; using System.Threading; +using System.Runtime.InteropServices.ComTypes; using System.Runtime.ConstrainedExecution; #if !FULL_AOT_RUNTIME -using System.Runtime.InteropServices.ComTypes; using Mono.Interop; #endif @@ -197,9 +197,11 @@ namespace System.Runtime.InteropServices return CreateAggregatedObject (pOuter, (object)o); } -#if !FULL_AOT_RUNTIME public static object CreateWrapperOfType (object o, Type t) { +#if FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else __ComObject co = o as __ComObject; if (co == null) throw new ArgumentException ("o must derive from __ComObject", "o"); @@ -213,12 +215,12 @@ namespace System.Runtime.InteropServices } return ComInteropProxy.GetProxy (co.IUnknown, t).GetTransparentProxy (); +#endif } public static TWrapper CreateWrapperOfType (T o) { return (TWrapper)CreateWrapperOfType ((object)o, typeof (TWrapper)); } -#endif [MethodImplAttribute(MethodImplOptions.InternalCall)] [ComVisible (true)] @@ -335,15 +337,16 @@ namespace System.Runtime.InteropServices return GetCCW (o, T); } #endif +#endif // !FULL_AOT_RUNTIME public static IntPtr GetComInterfaceForObject (object o, Type T) { -#if !MOBILE +#if MOBILE + throw new PlatformNotSupportedException (); +#else IntPtr pItf = GetComInterfaceForObjectInternal (o, T); AddRef (pItf); return pItf; -#else - throw new NotImplementedException (); #endif } @@ -357,6 +360,7 @@ namespace System.Runtime.InteropServices return GetComInterfaceForObject ((object)o, typeof (T)); } +#if !FULL_AOT_RUNTIME [MonoTODO] public static IntPtr GetComInterfaceForObjectInContext (object o, Type t) { @@ -395,12 +399,6 @@ namespace System.Runtime.InteropServices throw new NotImplementedException (); } - [MonoTODO] - public static int GetExceptionCode() - { - throw new NotImplementedException (); - } - [MonoTODO] [ComVisible (true)] public static IntPtr GetExceptionPointers() @@ -417,26 +415,35 @@ namespace System.Runtime.InteropServices } #endif // !FULL_AOT_RUNTIME -#if !FULL_AOT_RUNTIME + public static int GetExceptionCode () + { + throw new PlatformNotSupportedException (); + } + public static int GetHRForException (Exception e) { + if (e == null) return 0; + #if FEATURE_COMINTEROP var errorInfo = new ManagedErrorInfo(e); SetErrorInfo (0, errorInfo); +#endif return e._HResult; -#else - return -1; -#endif } [MonoTODO] [ReliabilityContract (Consistency.WillNotCorruptState, Cer.Success)] public static int GetHRForLastWin32Error() { +#if FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else throw new NotImplementedException (); +#endif } +#if !FULL_AOT_RUNTIME [MethodImplAttribute (MethodImplOptions.InternalCall)] private extern static IntPtr GetIDispatchForObjectInternal (object o); @@ -460,17 +467,6 @@ namespace System.Runtime.InteropServices throw new NotImplementedException (); } - [MethodImplAttribute (MethodImplOptions.InternalCall)] - private extern static IntPtr GetIUnknownForObjectInternal (object o); - - public static IntPtr GetIUnknownForObject (object o) - { - IntPtr pUnk = GetIUnknownForObjectInternal (o); - // Internal method does not AddRef - AddRef (pUnk); - return pUnk; - } - [MonoTODO] public static IntPtr GetIUnknownForObjectInContext (object o) { @@ -490,25 +486,48 @@ namespace System.Runtime.InteropServices throw new NotImplementedException (); } + [MethodImplAttribute (MethodImplOptions.InternalCall)] + private extern static IntPtr GetIUnknownForObjectInternal (object o); + +#endif // !FULL_AOT_RUNTIME + + public static IntPtr GetIUnknownForObject (object o) + { +#if FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else + IntPtr pUnk = GetIUnknownForObjectInternal (o); + // Internal method does not AddRef + AddRef (pUnk); + return pUnk; +#endif + } + public static void GetNativeVariantForObject (object obj, IntPtr pDstNativeVariant) { +#if FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else Variant vt = new Variant(); vt.SetValue(obj); Marshal.StructureToPtr(vt, pDstNativeVariant, false); +#endif } public static void GetNativeVariantForObject (T obj, IntPtr pDstNativeVariant) { GetNativeVariantForObject ((object)obj, pDstNativeVariant); } -#if !MOBILE +#if !MOBILE && !FULL_AOT_RUNTIME [MethodImplAttribute (MethodImplOptions.InternalCall)] private static extern object GetObjectForCCW (IntPtr pUnk); #endif public static object GetObjectForIUnknown (IntPtr pUnk) { -#if !MOBILE +#if MOBILE || FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else object obj = GetObjectForCCW (pUnk); // was not a CCW if (obj == null) { @@ -516,24 +535,34 @@ namespace System.Runtime.InteropServices obj = proxy.GetTransparentProxy (); } return obj; -#else - throw new NotImplementedException (); #endif } public static object GetObjectForNativeVariant (IntPtr pSrcNativeVariant) { +#if FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else Variant vt = (Variant)Marshal.PtrToStructure(pSrcNativeVariant, typeof(Variant)); return vt.GetValue(); +#endif } - public static T GetObjectForNativeVariant (IntPtr pSrcNativeVariant) { + public static T GetObjectForNativeVariant (IntPtr pSrcNativeVariant) + { +#if FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else Variant vt = (Variant)Marshal.PtrToStructure(pSrcNativeVariant, typeof(Variant)); return (T)vt.GetValue(); +#endif } public static object[] GetObjectsForNativeVariants (IntPtr aSrcNativeVariant, int cVars) { +#if FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else if (cVars < 0) throw new ArgumentOutOfRangeException ("cVars", "cVars cannot be a negative number."); object[] objects = new object[cVars]; @@ -541,9 +570,14 @@ namespace System.Runtime.InteropServices objects[i] = GetObjectForNativeVariant ((IntPtr)(aSrcNativeVariant.ToInt64 () + i * SizeOf (typeof(Variant)))); return objects; +#endif } - public static T[] GetObjectsForNativeVariants (IntPtr aSrcNativeVariant, int cVars) { + public static T[] GetObjectsForNativeVariants (IntPtr aSrcNativeVariant, int cVars) + { +#if FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else if (cVars < 0) throw new ArgumentOutOfRangeException ("cVars", "cVars cannot be a negative number."); T[] objects = new T[cVars]; @@ -551,14 +585,20 @@ namespace System.Runtime.InteropServices objects[i] = GetObjectForNativeVariant ((IntPtr)(aSrcNativeVariant.ToInt64 () + i * SizeOf (typeof(Variant)))); return objects; +#endif } [MonoTODO] public static int GetStartComSlot (Type t) { +#if FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else throw new NotImplementedException (); +#endif } +#if !FULL_AOT_RUNTIME [MonoTODO] [Obsolete ("This method has been deprecated")] public static Thread GetThreadFromFiberCookie (int cookie) @@ -585,12 +625,6 @@ namespace System.Runtime.InteropServices throw new NotImplementedException (); } - public static Type GetTypeFromCLSID (Guid clsid) - { - throw new NotImplementedException (); - } - -#if !FULL_AOT_RUNTIME [Obsolete] [MonoTODO] public static string GetTypeInfoName (UCOMITypeInfo pTI) @@ -598,11 +632,6 @@ namespace System.Runtime.InteropServices throw new NotImplementedException (); } - public static string GetTypeInfoName (ITypeInfo typeInfo) - { - throw new NotImplementedException (); - } - [Obsolete] [MonoTODO] public static Guid GetTypeLibGuid (UCOMITypeLib pTLB) @@ -654,12 +683,6 @@ namespace System.Runtime.InteropServices throw new NotImplementedException (); } - public static object GetUniqueObjectForIUnknown (IntPtr unknown) - { - throw new NotImplementedException (); - } -#endif - [MonoTODO] [Obsolete ("This method has been deprecated")] public static IntPtr GetUnmanagedThunkForManagedMethodPtr (IntPtr pfnMethodToWrap, IntPtr pbSignature, int cbSignature) @@ -667,16 +690,6 @@ namespace System.Runtime.InteropServices throw new NotImplementedException (); } -#if !MOBILE - [MethodImplAttribute (MethodImplOptions.InternalCall)] - public extern static bool IsComObject (object o); -#else - public static bool IsComObject (object o) - { - throw new NotImplementedException (); - } -#endif - [MonoTODO] public static bool IsTypeVisibleFromCom (Type t) { @@ -688,6 +701,31 @@ namespace System.Runtime.InteropServices { throw new NotImplementedException (); } +#endif // !FULL_AOT_RUNTIME + + public static Type GetTypeFromCLSID (Guid clsid) + { + throw new PlatformNotSupportedException (); + } + + public static string GetTypeInfoName (ITypeInfo typeInfo) + { + throw new PlatformNotSupportedException (); + } + + public static object GetUniqueObjectForIUnknown (IntPtr unknown) + { + throw new PlatformNotSupportedException (); + } + +#if !MOBILE + [MethodImplAttribute (MethodImplOptions.InternalCall)] + public extern static bool IsComObject (object o); +#else + public static bool IsComObject (object o) + { + throw new PlatformNotSupportedException (); + } #endif [MethodImplAttribute(MethodImplOptions.InternalCall)] @@ -950,16 +988,22 @@ namespace System.Runtime.InteropServices #if !FULL_AOT_RUNTIME [MethodImplAttribute (MethodImplOptions.InternalCall)] private extern static int ReleaseComObjectInternal (object co); +#endif public static int ReleaseComObject (object o) { +#if FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else if (o == null) throw new ArgumentException ("Value cannot be null.", "o"); if (!IsComObject (o)) throw new ArgumentException ("Value must be a Com object.", "o"); return ReleaseComObjectInternal (o); +#endif } +#if !FULL_AOT_RUNTIME [Obsolete] [MonoTODO] public static void ReleaseThreadCache() @@ -1630,13 +1674,11 @@ namespace System.Runtime.InteropServices #endif } -#if !FULL_AOT_RUNTIME public static int FinalReleaseComObject (object o) { while (ReleaseComObject (o) != 0); return 0; } -#endif [MethodImplAttribute(MethodImplOptions.InternalCall)] private static extern Delegate GetDelegateForFunctionPointerInternal (IntPtr ptr, Type t); diff --git a/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs b/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs index 4c38e08ed5..bde7be3fd1 100644 --- a/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs +++ b/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs @@ -260,6 +260,15 @@ namespace MonoTests.System.Runtime.InteropServices } } #endif + + [Test] + public void GetHRForException () + { + Assert.AreEqual (0, Marshal.GetHRForException (null)); + Assert.IsTrue (Marshal.GetHRForException (new Exception ()) < 0); + Assert.AreEqual (12345, Marshal.GetHRForException (new IOException ("test message", 12345))); + } + [Test] // bug #319009 public void StringToHGlobalUni () { diff --git a/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs b/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs index e0b127a0bc..15ee9bfbdc 100644 --- a/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs +++ b/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs @@ -1057,24 +1057,21 @@ namespace MonoTests.System.Threading.Tasks var token = source.Token; var evt = new ManualResetEventSlim (); bool result = false; - bool thrown = false; - var task = Task.Factory.StartNew (() => evt.Wait (100)); + var task = Task.Factory.StartNew (() => { Assert.IsTrue (evt.Wait (2000), "#1"); }); var cont = task.ContinueWith (t => result = true, token, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default); source.Cancel(); evt.Set (); - task.Wait (100); + Assert.IsTrue (task.Wait (2000), "#2"); try { - cont.Wait (100); - } catch (Exception ex) { - thrown = true; + Assert.IsFalse (cont.Wait (4000), "#3"); + } catch (AggregateException ex) { } - Assert.IsTrue (task.IsCompleted); - Assert.IsTrue (cont.IsCanceled); - Assert.IsFalse (result); - Assert.IsTrue (thrown); + Assert.IsTrue (task.IsCompleted, "#4"); + Assert.IsTrue (cont.IsCanceled, "#5"); + Assert.IsFalse (result, "#6"); } [Test] diff --git a/mcs/class/corlib/coreclr/AsyncLocal.cs b/mcs/class/corlib/coreclr/AsyncLocal.cs index 5b7b61f59f..38035bd922 100644 --- a/mcs/class/corlib/coreclr/AsyncLocal.cs +++ b/mcs/class/corlib/coreclr/AsyncLocal.cs @@ -64,21 +64,13 @@ namespace System.Threading [SecuritySafeCritical] get { -#if MONO - throw new NotImplementedException (); -#else object obj = ExecutionContext.GetLocalValue(this); return (obj == null) ? default(T) : (T)obj; -#endif } [SecuritySafeCritical] set { -#if MONO - throw new NotImplementedException (); -#else ExecutionContext.SetLocalValue(this, value, m_valueChangedHandler != null); -#endif } } diff --git a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id index e3d86e10cc..f1e970f4a6 100644 --- a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0c5ef03337e59385daaf2228b3602c0d70f132ac \ No newline at end of file +a03412e4144d551461b4f8b21d25f3258a2ec5f1 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.dll.REMOVED.git-id index 257600ba1a..4df4775fe2 100644 --- a/mcs/class/lib/monolite/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.dll.REMOVED.git-id @@ -1 +1 @@ -45f2e6ab0ada965bc6c4dc56f52568cd0359cc6b \ No newline at end of file +8ad53def268a4750474dee2731ef4039642458aa \ No newline at end of file diff --git a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id index 9a9acc2538..695bcfdbfe 100644 --- a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id @@ -1 +1 @@ -b0e49e89c4b7142b252ffb56d7ba8e094bf4b545 \ No newline at end of file +4ed6e201e6785a6e9e44a113d2be4c9fd569673c \ No newline at end of file diff --git a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id index 509009c25c..4629fff27b 100644 --- a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -505251ddf7c1902e9323cdc7755ca109aa15ab5e \ No newline at end of file +9d728aa18a9d89c58a94469c86f374658f784ccd \ No newline at end of file diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/attributes.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/attributes.cs index 756ff5d87c..17068f63bc 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/attributes.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/attributes.cs @@ -645,10 +645,7 @@ namespace System.Runtime.InteropServices{ #endif [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, Inherited = false)] [System.Runtime.InteropServices.ComVisible(true)] -#if !MONOTOUCH - public -#endif - sealed class ComImportAttribute : Attribute + public sealed class ComImportAttribute : Attribute { internal static Attribute GetCustomAttribute(RuntimeType type) { diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/dispatchwrapper.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/dispatchwrapper.cs index 50740031b6..9d0439d95c 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/dispatchwrapper.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/dispatchwrapper.cs @@ -12,7 +12,7 @@ ** ** =============================================================================*/ -#if !FULL_AOT_RUNTIME + namespace System.Runtime.InteropServices { using System; @@ -31,11 +31,15 @@ namespace System.Runtime.InteropServices { { if (obj != null) { +#if FULL_AOT_RUNTIME + throw new PlatformNotSupportedException (); +#else // Make sure this guy has an IDispatch IntPtr pdisp = Marshal.GetIDispatchForObject(obj); // If we got here without throwing an exception, the QI for IDispatch succeeded. Marshal.Release(pdisp); +#endif } m_WrappedObject = obj; } @@ -51,4 +55,3 @@ namespace System.Runtime.InteropServices { private Object m_WrappedObject; } } -#endif \ No newline at end of file diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/errorwrapper.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/errorwrapper.cs index 0cf3823868..694412fd47 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/errorwrapper.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/errorwrapper.cs @@ -12,7 +12,7 @@ ** ** =============================================================================*/ -#if !FULL_AOT_RUNTIME + namespace System.Runtime.InteropServices { using System; @@ -54,4 +54,3 @@ namespace System.Runtime.InteropServices { private int m_ErrorCode; } } -#endif \ No newline at end of file diff --git a/mcs/errors/cs0246-36.cs b/mcs/errors/cs0246-36.cs new file mode 100644 index 0000000000..2bd356715c --- /dev/null +++ b/mcs/errors/cs0246-36.cs @@ -0,0 +1,9 @@ +// CS0246: The type or namespace name `Foo' could not be found. Are you missing an assembly reference? +// Line: 8 + +class Crashy +{ + void Call (System.Action action) { } + + public void DoCrash () => Call (f => f as Foo); +} diff --git a/mcs/mcs/anonymous.cs b/mcs/mcs/anonymous.cs index 80481ed209..d27fe80604 100644 --- a/mcs/mcs/anonymous.cs +++ b/mcs/mcs/anonymous.cs @@ -1595,6 +1595,15 @@ namespace Mono.CSharp { if (res && errors != ec.Report.Errors) return null; + if (block.IsAsync && block.Original.ParametersBlock.HasCapturedThis && ec.CurrentAnonymousMethod != null && ec.CurrentAnonymousMethod.block.IsAsync) { + // + // We'll do ldftn to load the fabricated m_X method but + // because we are inside struct the method can be hoisted + // anywhere in the parent scope + // + ec.CurrentBlock.ParametersBlock.HasReferenceToStoreyForInstanceLambdas = true; + } + return res ? this : null; } @@ -1798,6 +1807,8 @@ namespace Mono.CSharp { parent = storey = sm; } } + } else if (src_block.ParametersBlock.HasReferenceToStoreyForInstanceLambdas) { + src_block.ParametersBlock.StateMachine.AddParentStoreyReference (ec, storey); } modifiers = storey != null ? Modifiers.INTERNAL : Modifiers.PRIVATE; diff --git a/mcs/mcs/expression.cs.REMOVED.git-id b/mcs/mcs/expression.cs.REMOVED.git-id index d71e19e50c..2711680215 100644 --- a/mcs/mcs/expression.cs.REMOVED.git-id +++ b/mcs/mcs/expression.cs.REMOVED.git-id @@ -1 +1 @@ -02ae36b34c16802d921a2476f4a1ab3d750052c3 \ No newline at end of file +2a9aa97fed0e62be46728b7c4dccb871de0ff0cc \ No newline at end of file diff --git a/mcs/mcs/statement.cs.REMOVED.git-id b/mcs/mcs/statement.cs.REMOVED.git-id index 03e686a601..8efe91f778 100644 --- a/mcs/mcs/statement.cs.REMOVED.git-id +++ b/mcs/mcs/statement.cs.REMOVED.git-id @@ -1 +1 @@ -ad08d02b5db754d3948bdb8ad9c4b690011c1aff \ No newline at end of file +7f54b33eeb599c16146c7adfcc0c2e12b3d5beaf \ No newline at end of file diff --git a/mcs/tests/test-async-88.cs b/mcs/tests/test-async-88.cs new file mode 100644 index 0000000000..813d51d6ce --- /dev/null +++ b/mcs/tests/test-async-88.cs @@ -0,0 +1,28 @@ +using System; +using System.Threading.Tasks; + +public class Test +{ + static async Task AsyncWithDeepTry () + { + try { + await Task.Yield (); + + try { + await Task.Yield (); + } catch { + } + } catch { + await Task.Yield (); + } finally { + } + + return null; + } + + + static void Main () + { + AsyncWithDeepTry ().Wait (); + } +} diff --git a/mcs/tests/test-async-89.cs b/mcs/tests/test-async-89.cs new file mode 100644 index 0000000000..5a69685ca9 --- /dev/null +++ b/mcs/tests/test-async-89.cs @@ -0,0 +1,51 @@ +using System; +using System.Threading.Tasks; + +class X +{ + public static void Main () + { + new X ().Test (); + } + + void Test () + { + object v1 = null; + + Action a = () => + { + if (v1 == null) + { + object v2 = null; + + Action a2 = () => + { + Console.WriteLine (v2); + }; + + Action a3 = async () => + { + // This scope needs to access to Scope which can do ldftn on instance method + { + Func a4 = async () => + { + await Foo (); + }; + } + + await Task.Yield (); + }; + + a3 (); + } + }; + + a (); + } + + async Task Foo () + { + await Task.FromResult (1); + } + +} \ No newline at end of file diff --git a/mcs/tests/ver-il-net_4_x.xml.REMOVED.git-id b/mcs/tests/ver-il-net_4_x.xml.REMOVED.git-id index af56d57f75..e7ea069d28 100644 --- a/mcs/tests/ver-il-net_4_x.xml.REMOVED.git-id +++ b/mcs/tests/ver-il-net_4_x.xml.REMOVED.git-id @@ -1 +1 @@ -c0e3e51ded0d42e24d7370dbaa3dccae45d71340 \ No newline at end of file +720ef10c534ff81a6c9296b3f09a50987144d5a9 \ No newline at end of file diff --git a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets index ffe1f63b83..b28194f9a2 100644 --- a/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets @@ -263,11 +263,10 @@ - + Outputs="$(TargetFrameworkMonikerAssemblyAttributesPath)"> + + + diff --git a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets index 433cffe8e6..89afe6502c 100644 --- a/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets @@ -265,11 +265,10 @@ - + Outputs="$(TargetFrameworkMonikerAssemblyAttributesPath)"> + + + diff --git a/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets index 152dd2b985..ff82f8195f 100644 --- a/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets @@ -263,11 +263,10 @@ - + Outputs="$(TargetFrameworkMonikerAssemblyAttributesPath)"> + + + diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index b88cf4a1a8..5b0b72b051 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -824,7 +824,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.6.0.165/23c6a4d\"" > version.h + echo "#define FULL_VERSION \"Stable 4.6.0.182/3ed2bba\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index b88cf4a1a8..5b0b72b051 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -824,7 +824,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.6.0.165/23c6a4d\"" > version.h + echo "#define FULL_VERSION \"Stable 4.6.0.182/3ed2bba\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index 4e8f2388db..4069a46d6d 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -0a7bed95863ec573d057b5483fa32bf8b8784029 \ No newline at end of file +95fb4f0f463f11376bc66366d33b0ada31e655e7 \ No newline at end of file diff --git a/mono/mini/alias-analysis.c b/mono/mini/alias-analysis.c index f40070aeb3..2e61c0f523 100644 --- a/mono/mini/alias-analysis.c +++ b/mono/mini/alias-analysis.c @@ -191,7 +191,9 @@ handle_instruction: case OP_LOADU4_MEMBASE: case OP_LOADI1_MEMBASE: case OP_LOADI8_MEMBASE: +#ifndef MONO_ARCH_SOFT_FLOAT_FALLBACK case OP_LOADR4_MEMBASE: +#endif case OP_LOADR8_MEMBASE: if (ins->inst_offset != 0) continue; @@ -211,7 +213,9 @@ handle_instruction: case OP_STOREI2_MEMBASE_REG: case OP_STOREI4_MEMBASE_REG: case OP_STOREI8_MEMBASE_REG: +#ifndef MONO_ARCH_SOFT_FLOAT_FALLBACK case OP_STORER4_MEMBASE_REG: +#endif case OP_STORER8_MEMBASE_REG: case OP_STOREV_MEMBASE: if (ins->inst_offset != 0) diff --git a/mono/mini/aot-runtime.c.REMOVED.git-id b/mono/mini/aot-runtime.c.REMOVED.git-id index 3fe7505841..079ea243cc 100644 --- a/mono/mini/aot-runtime.c.REMOVED.git-id +++ b/mono/mini/aot-runtime.c.REMOVED.git-id @@ -1 +1 @@ -04d5b1fd041a94fe234652daf1ae896b2891ee66 \ No newline at end of file +013d44207d4a363ed79bb112074971361023c73e \ No newline at end of file diff --git a/mono/mini/decompose.c b/mono/mini/decompose.c index 0409cd7d78..a883e70ee8 100644 --- a/mono/mini/decompose.c +++ b/mono/mini/decompose.c @@ -1889,6 +1889,13 @@ mono_local_emulate_ops (MonoCompile *cfg) int op_noimm = mono_op_imm_to_op (ins->opcode); MonoJitICallInfo *info; + /* + * These opcodes don't have logical equivalence to the emulating native + * function. They are decomposed in specific fashion in mono_decompose_soft_float. + */ + if (MONO_HAS_CUSTOM_EMULATION (ins)) + continue; + /* * Emulation can't handle _IMM ops. If this is an imm opcode we need * to check whether its non-imm counterpart is emulated and, if so, diff --git a/mono/mini/mini-llvm.c.REMOVED.git-id b/mono/mini/mini-llvm.c.REMOVED.git-id index f292f5b5c4..29e04d074a 100644 --- a/mono/mini/mini-llvm.c.REMOVED.git-id +++ b/mono/mini/mini-llvm.c.REMOVED.git-id @@ -1 +1 @@ -527f141538965a4146bbb20c5f3d5c86cca254d0 \ No newline at end of file +2fe69c378a64914c4bb35bf1a52a00153609255b \ No newline at end of file diff --git a/mono/mini/mini.h.REMOVED.git-id b/mono/mini/mini.h.REMOVED.git-id index ef36b481f0..27c5fdbcdf 100644 --- a/mono/mini/mini.h.REMOVED.git-id +++ b/mono/mini/mini.h.REMOVED.git-id @@ -1 +1 @@ -a26cd536b26205a3f69081a24c42314c0e520704 \ No newline at end of file +d1f83c4641b21eb86ef3a9291f1af35cf6f78be4 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 1da3d5771e..4ce6e3b414 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.6.0.165/23c6a4d" +#define FULL_VERSION "Stable 4.6.0.182/3ed2bba" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 5e7b554187..84476fbc69 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 7ac5d3dead..aad6dd6478 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -e47b1b63ee555feafc57418fcd77338fc19687f3 \ No newline at end of file +f70132cae7f2b6b9b69bf023807d00ef257e4adf \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index b49ba4f1d8..adb2b44323 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 9ea7965844..bd85b497b1 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -511abaa9c7942be0d6b3684b9d4b70fc47f66dff \ No newline at end of file +4788ec011a757c59b54897654dca4f00897523b0 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index e865044002..c5f6dc2008 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 1d479e9189..98fef2a286 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -c6cfde24e0884199a05be65c48322c97b8fb3c9d \ No newline at end of file +ce4d45ef0c66f99ecea8d48d9b1510e2fdc770aa \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 3c3e27642c..41a1ee8eec 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mono 4.6.0\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2016-08-25 09:40+0000\n" +"POT-Creation-Date: 2016-09-01 10:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -87,11 +87,11 @@ msgstr "" msgid "Cannot convert async {0} to delegate type `{1}'" msgstr "" -#: mcs/mcs/anonymous.cs:1728 +#: mcs/mcs/anonymous.cs:1737 msgid "An expression tree cannot contain an anonymous method expression" msgstr "" -#: mcs/mcs/anonymous.cs:2040 +#: mcs/mcs/anonymous.cs:2051 #, csharp-format msgid "" "`{0}': An anonymous type cannot have multiple properties with the same name" @@ -619,7 +619,7 @@ msgstr "" msgid "The operation overflows at compile time in checked mode" msgstr "" -#: mcs/mcs/cfold.cs:329 mcs/mcs/expression.cs:4954 +#: mcs/mcs/cfold.cs:329 mcs/mcs/expression.cs:4959 #, csharp-format msgid "Operator `{0}' is ambiguous on operands of type `{1}' and `{2}'" msgstr "" @@ -1354,13 +1354,13 @@ msgstr "" msgid "The operation in question is undefined on void pointers" msgstr "" -#: mcs/mcs/ecore.cs:524 mcs/mcs/statement.cs:3962 mcs/mcs/statement.cs:3964 +#: mcs/mcs/ecore.cs:524 mcs/mcs/statement.cs:3972 mcs/mcs/statement.cs:3974 #, csharp-format msgid "Internal compiler error: {0}" msgstr "" -#: mcs/mcs/ecore.cs:586 mcs/mcs/expression.cs:1840 mcs/mcs/expression.cs:7924 -#: mcs/mcs/expression.cs:7932 +#: mcs/mcs/ecore.cs:586 mcs/mcs/expression.cs:1840 mcs/mcs/expression.cs:7929 +#: mcs/mcs/expression.cs:7937 msgid "A constant value is expected" msgstr "" @@ -1874,264 +1874,264 @@ msgstr "" msgid "Property `{0}.get' accessor is required" msgstr "" -#: mcs/mcs/expression.cs:2368 +#: mcs/mcs/expression.cs:2373 #, csharp-format msgid "" "The `as' operator cannot be used with a non-reference type parameter `{0}'. " "Consider adding `class' or a reference type constraint" msgstr "" -#: mcs/mcs/expression.cs:2372 +#: mcs/mcs/expression.cs:2377 #, csharp-format msgid "The `as' operator cannot be used with a non-nullable value type `{0}'" msgstr "" -#: mcs/mcs/expression.cs:2406 +#: mcs/mcs/expression.cs:2411 #, csharp-format msgid "Cannot convert type `{0}' to `{1}' via a built-in conversion" msgstr "" -#: mcs/mcs/expression.cs:2447 +#: mcs/mcs/expression.cs:2452 #, csharp-format msgid "Cannot convert to static type `{0}'" msgstr "" -#: mcs/mcs/expression.cs:2550 +#: mcs/mcs/expression.cs:2555 msgid "An expression tree cannot contain a declaration expression" msgstr "" -#: mcs/mcs/expression.cs:2647 +#: mcs/mcs/expression.cs:2652 msgid "" "The `default value' operator cannot be applied to an operand of a static type" msgstr "" -#: mcs/mcs/expression.cs:3334 +#: mcs/mcs/expression.cs:3339 #, csharp-format msgid "Operator `{0}' cannot be applied to operands of type `{1}' and `{2}'" msgstr "" -#: mcs/mcs/expression.cs:4141 +#: mcs/mcs/expression.cs:4146 msgid "To cast a negative value, you must enclose the value in parentheses" msgstr "" -#: mcs/mcs/expression.cs:4234 +#: mcs/mcs/expression.cs:4239 #, csharp-format msgid "" "Expression must be implicitly convertible to Boolean or its type `{0}' must " "define operator `{1}'" msgstr "" -#: mcs/mcs/expression.cs:5846 +#: mcs/mcs/expression.cs:5851 #, csharp-format msgid "" "A user-defined operator `{0}' must have each parameter type and return type " "of the same type in order to be applicable as a short circuit operator" msgstr "" -#: mcs/mcs/expression.cs:5856 +#: mcs/mcs/expression.cs:5861 #, csharp-format msgid "" "The type `{0}' must have operator `true' and operator `false' defined when " "`{1}' is used as a short circuit operator" msgstr "" -#: mcs/mcs/expression.cs:6234 +#: mcs/mcs/expression.cs:6239 #, csharp-format msgid "" "Type of conditional expression cannot be determined as `{0}' and `{1}' " "convert implicitly to each other" msgstr "" -#: mcs/mcs/expression.cs:6247 +#: mcs/mcs/expression.cs:6252 #, csharp-format msgid "" "Type of conditional expression cannot be determined because there is no " "implicit conversion between `{0}' and `{1}'" msgstr "" -#: mcs/mcs/expression.cs:6594 +#: mcs/mcs/expression.cs:6599 #, csharp-format msgid "Use of unassigned local variable `{0}'" msgstr "" -#: mcs/mcs/expression.cs:6617 +#: mcs/mcs/expression.cs:6622 #, csharp-format msgid "" "Cannot use fixed local `{0}' inside an anonymous method, lambda expression " "or query expression" msgstr "" -#: mcs/mcs/expression.cs:6635 +#: mcs/mcs/expression.cs:6640 #, csharp-format msgid "Cannot use uninitialized variable `{0}'" msgstr "" -#: mcs/mcs/expression.cs:6807 +#: mcs/mcs/expression.cs:6812 #, csharp-format msgid "" "Parameter `{0}' cannot be used inside `{1}' when using `ref' or `out' " "modifier" msgstr "" -#: mcs/mcs/expression.cs:6877 +#: mcs/mcs/expression.cs:6882 #, csharp-format msgid "Use of unassigned out parameter `{0}'" msgstr "" -#: mcs/mcs/expression.cs:7096 +#: mcs/mcs/expression.cs:7101 #, csharp-format msgid "Cannot invoke a non-delegate type `{0}'" msgstr "" -#: mcs/mcs/expression.cs:7107 +#: mcs/mcs/expression.cs:7112 #, csharp-format msgid "The member `{0}' cannot be used as method or delegate" msgstr "" -#: mcs/mcs/expression.cs:7129 +#: mcs/mcs/expression.cs:7134 msgid "" "Do not directly call your base class Finalize method. It is called " "automatically from your destructor" msgstr "" -#: mcs/mcs/expression.cs:7131 +#: mcs/mcs/expression.cs:7136 msgid "" "Destructors and object.Finalize cannot be called directly. Consider calling " "IDisposable.Dispose if available" msgstr "" -#: mcs/mcs/expression.cs:7160 +#: mcs/mcs/expression.cs:7165 #, csharp-format msgid "" "The base call to method `{0}' cannot be dynamically dispatched. Consider " "casting the dynamic arguments or eliminating the base access" msgstr "" -#: mcs/mcs/expression.cs:7255 +#: mcs/mcs/expression.cs:7260 #, csharp-format msgid "`{0}': cannot explicitly call operator or accessor" msgstr "" -#: mcs/mcs/expression.cs:7445 +#: mcs/mcs/expression.cs:7450 #, csharp-format msgid "Unsafe type `{0}' cannot be used in an object creation expression" msgstr "" -#: mcs/mcs/expression.cs:7468 +#: mcs/mcs/expression.cs:7473 #, csharp-format msgid "" "Cannot create an instance of the variable type `{0}' because it does not " "have the new() constraint" msgstr "" -#: mcs/mcs/expression.cs:7474 +#: mcs/mcs/expression.cs:7479 #, csharp-format msgid "" "`{0}': cannot provide arguments when creating an instance of a variable type" msgstr "" -#: mcs/mcs/expression.cs:7483 +#: mcs/mcs/expression.cs:7488 #, csharp-format msgid "Cannot create an instance of the static class `{0}'" msgstr "" -#: mcs/mcs/expression.cs:7495 +#: mcs/mcs/expression.cs:7500 #, csharp-format msgid "Cannot create an instance of the abstract class or interface `{0}'" msgstr "" -#: mcs/mcs/expression.cs:7773 +#: mcs/mcs/expression.cs:7778 msgid "" "An implicitly typed local variable declarator cannot use an array initializer" msgstr "" -#: mcs/mcs/expression.cs:7938 mcs/mcs/expression.cs:7963 +#: mcs/mcs/expression.cs:7943 mcs/mcs/expression.cs:7968 #, csharp-format msgid "An array initializer of length `{0}' was expected" msgstr "" -#: mcs/mcs/expression.cs:7954 +#: mcs/mcs/expression.cs:7959 msgid "" "Array initializers can only be used in a variable or field initializer. Try " "using a new expression instead" msgstr "" -#: mcs/mcs/expression.cs:7971 +#: mcs/mcs/expression.cs:7976 msgid "A nested array initializer was expected" msgstr "" -#: mcs/mcs/expression.cs:8018 +#: mcs/mcs/expression.cs:8023 msgid "An expression tree cannot contain a multidimensional array initializer" msgstr "" -#: mcs/mcs/expression.cs:8054 +#: mcs/mcs/expression.cs:8059 msgid "Cannot create an array with a negative size" msgstr "" -#: mcs/mcs/expression.cs:8156 +#: mcs/mcs/expression.cs:8161 msgid "" "Can only use array initializer expressions to assign to array types. Try " "using a new expression instead" msgstr "" -#: mcs/mcs/expression.cs:8599 +#: mcs/mcs/expression.cs:8604 msgid "" "The type of an implicitly typed array cannot be inferred from the " "initializer. Try specifying array type explicitly" msgstr "" -#: mcs/mcs/expression.cs:8754 +#: mcs/mcs/expression.cs:8759 msgid "" "The `this' object cannot be used before all of its fields are assigned to" msgstr "" -#: mcs/mcs/expression.cs:8760 +#: mcs/mcs/expression.cs:8765 msgid "" "Keyword `this' is not valid in a static property, static method, or static " "field initializer" msgstr "" -#: mcs/mcs/expression.cs:8763 +#: mcs/mcs/expression.cs:8768 msgid "" "Anonymous methods inside structs cannot access instance members of `this'. " "Consider copying `this' to a local variable outside the anonymous method and " "using the local instead" msgstr "" -#: mcs/mcs/expression.cs:8766 +#: mcs/mcs/expression.cs:8771 msgid "Keyword `this' is not available in the current context" msgstr "" -#: mcs/mcs/expression.cs:8842 +#: mcs/mcs/expression.cs:8847 msgid "Cannot take the address of `this' because it is read-only" msgstr "" -#: mcs/mcs/expression.cs:8844 +#: mcs/mcs/expression.cs:8849 msgid "Cannot pass `this' as a ref or out argument because it is read-only" msgstr "" -#: mcs/mcs/expression.cs:8846 +#: mcs/mcs/expression.cs:8851 msgid "Cannot assign to `this' because it is read-only" msgstr "" -#: mcs/mcs/expression.cs:8914 +#: mcs/mcs/expression.cs:8919 msgid "The __arglist construct is valid only within a variable argument method" msgstr "" -#: mcs/mcs/expression.cs:8975 +#: mcs/mcs/expression.cs:8980 msgid "An expression tree cannot contain a method with variable arguments" msgstr "" -#: mcs/mcs/expression.cs:9249 +#: mcs/mcs/expression.cs:9254 msgid "The typeof operator cannot be used on the dynamic type" msgstr "" -#: mcs/mcs/expression.cs:9290 +#: mcs/mcs/expression.cs:9295 #, csharp-format msgid "`{0}': an attribute argument cannot use type parameters" msgstr "" -#: mcs/mcs/expression.cs:9505 +#: mcs/mcs/expression.cs:9510 #, csharp-format msgid "" "`{0}' does not have a predefined size, therefore sizeof can only be used in " @@ -2139,160 +2139,160 @@ msgid "" "SizeOf)" msgstr "" -#: mcs/mcs/expression.cs:9570 +#: mcs/mcs/expression.cs:9575 #, csharp-format msgid "Alias `{0}' not found" msgstr "" -#: mcs/mcs/expression.cs:9611 +#: mcs/mcs/expression.cs:9616 msgid "" "The namespace alias qualifier `::' cannot be used to invoke a method. " "Consider using `.' instead" msgstr "" -#: mcs/mcs/expression.cs:9701 +#: mcs/mcs/expression.cs:9706 msgid "Cannot perform member binding on `null' value" msgstr "" -#: mcs/mcs/expression.cs:9868 +#: mcs/mcs/expression.cs:9873 #, csharp-format msgid "" "`{0}': cannot reference a type through an expression. Consider using `{1}' " "instead" msgstr "" -#: mcs/mcs/expression.cs:9947 +#: mcs/mcs/expression.cs:9952 #, csharp-format msgid "A nested type cannot be specified through a type parameter `{0}'" msgstr "" -#: mcs/mcs/expression.cs:9955 +#: mcs/mcs/expression.cs:9960 #, csharp-format msgid "" "Alias `{0}' cannot be used with `::' since it denotes a type. Consider " "replacing `::' with `.'" msgstr "" -#: mcs/mcs/expression.cs:10024 +#: mcs/mcs/expression.cs:10029 #, csharp-format msgid "The nested type `{0}' does not exist in the type `{1}'" msgstr "" -#: mcs/mcs/expression.cs:10048 +#: mcs/mcs/expression.cs:10053 #, csharp-format msgid "" "Type `{0}' does not contain a definition for `{1}' and no extension method " "`{1}' of type `{0}' could be found. Are you missing {2}?" msgstr "" -#: mcs/mcs/expression.cs:10340 +#: mcs/mcs/expression.cs:10345 #, csharp-format msgid "Cannot apply indexing with [] to an expression of type `{0}'" msgstr "" -#: mcs/mcs/expression.cs:10477 +#: mcs/mcs/expression.cs:10482 #, csharp-format msgid "Wrong number of indexes `{0}' inside [], expected `{1}'" msgstr "" -#: mcs/mcs/expression.cs:10911 +#: mcs/mcs/expression.cs:10916 msgid "" "The indexer base access cannot be dynamically dispatched. Consider casting " "the dynamic arguments or eliminating the base access" msgstr "" -#: mcs/mcs/expression.cs:11001 +#: mcs/mcs/expression.cs:11006 msgid "An expression tree may not contain a base access" msgstr "" -#: mcs/mcs/expression.cs:11019 +#: mcs/mcs/expression.cs:11024 msgid "Keyword `base' is not available in a static method" msgstr "" -#: mcs/mcs/expression.cs:11021 +#: mcs/mcs/expression.cs:11026 msgid "Keyword `base' is not available in the current context" msgstr "" -#: mcs/mcs/expression.cs:11059 +#: mcs/mcs/expression.cs:11064 msgid "" "A property, indexer or dynamic member access may not be passed as `ref' or " "`out' parameter" msgstr "" -#: mcs/mcs/expression.cs:11405 +#: mcs/mcs/expression.cs:11410 #, csharp-format msgid "Array elements cannot be of type `{0}'" msgstr "" -#: mcs/mcs/expression.cs:11408 +#: mcs/mcs/expression.cs:11413 #, csharp-format msgid "Array elements cannot be of static type `{0}'" msgstr "" -#: mcs/mcs/expression.cs:11584 +#: mcs/mcs/expression.cs:11589 msgid "Cannot use a negative size with stackalloc" msgstr "" -#: mcs/mcs/expression.cs:11588 +#: mcs/mcs/expression.cs:11593 msgid "Cannot use stackalloc in finally or catch" msgstr "" -#: mcs/mcs/expression.cs:11747 +#: mcs/mcs/expression.cs:11752 #, csharp-format msgid "" "Member `{0}' cannot be initialized. An object initializer may only be used " "for fields, or properties" msgstr "" -#: mcs/mcs/expression.cs:11755 +#: mcs/mcs/expression.cs:11760 #, csharp-format msgid "" "Static field or property `{0}' cannot be assigned in an object initializer" msgstr "" -#: mcs/mcs/expression.cs:11826 +#: mcs/mcs/expression.cs:11831 msgid "" "An expression tree cannot contain a collection initializer with extension " "method" msgstr "" -#: mcs/mcs/expression.cs:11864 +#: mcs/mcs/expression.cs:11869 msgid "Expression tree cannot contain a dictionary initializer" msgstr "" -#: mcs/mcs/expression.cs:11989 +#: mcs/mcs/expression.cs:11994 #, csharp-format msgid "" "A field or property `{0}' cannot be initialized with a collection object " "initializer because type `{1}' does not implement `{2}' interface" msgstr "" -#: mcs/mcs/expression.cs:12000 +#: mcs/mcs/expression.cs:12005 #, csharp-format msgid "Inconsistent `{0}' member declaration" msgstr "" -#: mcs/mcs/expression.cs:12008 +#: mcs/mcs/expression.cs:12013 #, csharp-format msgid "" "An object initializer includes more than one member `{0}' initialization" msgstr "" -#: mcs/mcs/expression.cs:12026 +#: mcs/mcs/expression.cs:12031 #, csharp-format msgid "Cannot initialize object of type `{0}' with a collection initializer" msgstr "" -#: mcs/mcs/expression.cs:12171 +#: mcs/mcs/expression.cs:12176 msgid "" "Object and collection initializers cannot be used to instantiate a delegate" msgstr "" -#: mcs/mcs/expression.cs:12387 +#: mcs/mcs/expression.cs:12392 msgid "Anonymous types cannot be used in this expression" msgstr "" -#: mcs/mcs/expression.cs:12481 +#: mcs/mcs/expression.cs:12486 #, csharp-format msgid "An anonymous type property `{0}' cannot be initialized with `{1}'" msgstr "" @@ -2577,7 +2577,7 @@ msgstr "" msgid "Iterators cannot have unsafe parameters or yield types" msgstr "" -#: mcs/mcs/iterators.cs:1222 mcs/mcs/statement.cs:6317 +#: mcs/mcs/iterators.cs:1222 mcs/mcs/statement.cs:6327 msgid "Unsafe code may not appear in iterators" msgstr "" @@ -3475,7 +3475,7 @@ msgid "" "clause nested inside of the innermost catch clause" msgstr "" -#: mcs/mcs/statement.cs:1787 mcs/mcs/statement.cs:6876 +#: mcs/mcs/statement.cs:1787 mcs/mcs/statement.cs:6886 msgid "The type caught or thrown must be derived from System.Exception" msgstr "" @@ -3502,7 +3502,7 @@ msgid "" "declarators" msgstr "" -#: mcs/mcs/statement.cs:2791 +#: mcs/mcs/statement.cs:2792 #, csharp-format msgid "" "A local variable named `{0}' cannot be declared in this scope because it " @@ -3510,124 +3510,124 @@ msgid "" "scope to denote something else" msgstr "" -#: mcs/mcs/statement.cs:2803 +#: mcs/mcs/statement.cs:2804 #, csharp-format msgid "A local variable named `{0}' is already defined in this scope" msgstr "" -#: mcs/mcs/statement.cs:2810 +#: mcs/mcs/statement.cs:2811 #, csharp-format msgid "" "The type parameter name `{0}' is the same as local variable or parameter name" msgstr "" -#: mcs/mcs/statement.cs:3742 +#: mcs/mcs/statement.cs:3752 #, csharp-format msgid "" "The out parameter `{0}' must be assigned to before control leaves the " "current method" msgstr "" -#: mcs/mcs/statement.cs:4018 +#: mcs/mcs/statement.cs:4028 msgid "Async methods cannot have ref or out parameters" msgstr "" -#: mcs/mcs/statement.cs:4024 +#: mcs/mcs/statement.cs:4034 msgid "__arglist is not allowed in parameter list of async methods" msgstr "" -#: mcs/mcs/statement.cs:4030 +#: mcs/mcs/statement.cs:4040 msgid "Async methods cannot have unsafe parameters" msgstr "" -#: mcs/mcs/statement.cs:4227 +#: mcs/mcs/statement.cs:4237 #, csharp-format msgid "The label `{0}' is a duplicate" msgstr "" -#: mcs/mcs/statement.cs:4236 mcs/mcs/statement.cs:4247 +#: mcs/mcs/statement.cs:4246 mcs/mcs/statement.cs:4257 #, csharp-format msgid "" "The label `{0}' shadows another label by the same name in a contained scope" msgstr "" -#: mcs/mcs/statement.cs:4525 +#: mcs/mcs/statement.cs:4535 #, csharp-format msgid "`{0}': not all code paths return a value" msgstr "" -#: mcs/mcs/statement.cs:4657 +#: mcs/mcs/statement.cs:4667 #, csharp-format msgid "The label `{0}' already occurs in this switch statement" msgstr "" -#: mcs/mcs/statement.cs:4784 +#: mcs/mcs/statement.cs:4794 #, csharp-format msgid "" "Control cannot fall out of switch statement through final case label `{0}'" msgstr "" -#: mcs/mcs/statement.cs:4787 +#: mcs/mcs/statement.cs:4797 #, csharp-format msgid "Control cannot fall through from one case label `{0}' to another" msgstr "" -#: mcs/mcs/statement.cs:5224 +#: mcs/mcs/statement.cs:5234 #, csharp-format msgid "" "A switch expression of type `{0}' cannot be converted to an integral type, " "bool, char, string, enum or nullable type" msgstr "" -#: mcs/mcs/statement.cs:6083 +#: mcs/mcs/statement.cs:6093 #, csharp-format msgid "`{0}' is not a reference type as required by the lock statement" msgstr "" -#: mcs/mcs/statement.cs:6465 +#: mcs/mcs/statement.cs:6475 msgid "The type of locals declared in a fixed statement must be a pointer type" msgstr "" -#: mcs/mcs/statement.cs:6545 +#: mcs/mcs/statement.cs:6555 msgid "" "The right hand side of a fixed statement assignment may not be a cast " "expression" msgstr "" -#: mcs/mcs/statement.cs:6550 +#: mcs/mcs/statement.cs:6560 msgid "" "You cannot use the fixed statement to take the address of an already fixed " "expression" msgstr "" -#: mcs/mcs/statement.cs:6736 +#: mcs/mcs/statement.cs:6746 msgid "" "The `await' operator cannot be used in the filter expression of a catch " "clause" msgstr "" -#: mcs/mcs/statement.cs:7327 +#: mcs/mcs/statement.cs:7337 #, csharp-format msgid "" "A previous catch clause already catches all exceptions of this or a super " "type `{0}'" msgstr "" -#: mcs/mcs/statement.cs:7560 +#: mcs/mcs/statement.cs:7570 #, csharp-format msgid "" "`{0}': type used in a using statement must be implicitly convertible to " "`System.IDisposable'" msgstr "" -#: mcs/mcs/statement.cs:7976 +#: mcs/mcs/statement.cs:7986 #, csharp-format msgid "" "foreach statement requires that the return type `{0}' of `{1}' must have a " "suitable public MoveNext method and public Current property" msgstr "" -#: mcs/mcs/statement.cs:8020 +#: mcs/mcs/statement.cs:8030 #, csharp-format msgid "" "foreach statement cannot operate on variables of type `{0}' because it " @@ -3635,18 +3635,18 @@ msgid "" "implementation" msgstr "" -#: mcs/mcs/statement.cs:8042 +#: mcs/mcs/statement.cs:8052 #, csharp-format msgid "" "foreach statement cannot operate on variables of type `{0}' because it does " "not contain a definition for `{1}' or is inaccessible" msgstr "" -#: mcs/mcs/statement.cs:8280 +#: mcs/mcs/statement.cs:8290 msgid "Use of null is not valid in this context" msgstr "" -#: mcs/mcs/statement.cs:8292 +#: mcs/mcs/statement.cs:8302 #, csharp-format msgid "Foreach statement cannot operate on a `{0}'" msgstr "" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index a09750fc78..7409bd372f 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index ba0532ae3c..70c07c6a20 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -9e6c0ecb51781ce51ebc693adb2bd7fca229530d \ No newline at end of file +b6f991b7638cdd7773870c00d3c5110a47656110 \ No newline at end of file