diff options
Diffstat (limited to 'mcs/class/Facades/System.Linq.Parallel')
4 files changed, 29 insertions, 29 deletions
diff --git a/mcs/class/Facades/System.Linq.Parallel/AssemblyInfo.cs b/mcs/class/Facades/System.Linq.Parallel/AssemblyInfo.cs index 5824fc0e7c..b3d86f59f9 100644 --- a/mcs/class/Facades/System.Linq.Parallel/AssemblyInfo.cs +++ b/mcs/class/Facades/System.Linq.Parallel/AssemblyInfo.cs @@ -1,21 +1,16 @@ -// -// TypeForwarders.cs -// -// Author: -// Martin Baulig <martin.baulig@xamarin.com> -// +// // Copyright (c) 2013 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 @@ -23,6 +18,7 @@ // 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; @@ -31,10 +27,9 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTitle ("System.Linq.Parallel.dll")] [assembly: AssemblyDescription ("System.Linq.Parallel.dll")] [assembly: AssemblyDefaultAlias ("System.Linq.Parallel.dll")] - -[assembly: AssemblyCompany (Consts.MonoCompany)] -[assembly: AssemblyProduct (Consts.MonoProduct)] -[assembly: AssemblyCopyright (Consts.MonoCopyright)] +[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: AssemblyInformationalVersion ("4.0.0.0")] [assembly: AssemblyFileVersion ("4.0.0.0")] @@ -42,3 +37,5 @@ using System.Runtime.CompilerServices; [assembly: AssemblyKeyFile ("../../msfinal.pub")] [assembly: ReferenceAssembly] + + diff --git a/mcs/class/Facades/System.Linq.Parallel/Makefile b/mcs/class/Facades/System.Linq.Parallel/Makefile index bf9069a77b..54a937f7ed 100644 --- a/mcs/class/Facades/System.Linq.Parallel/Makefile +++ b/mcs/class/Facades/System.Linq.Parallel/Makefile @@ -1,15 +1,22 @@ +MCS_BUILD_DIR = ../../../build + thisdir = class/Facades/System.Linq.Parallel SUBDIRS = -include ../../../build/rules.make +include $(MCS_BUILD_DIR)/rules.make LIBRARY_SUBDIR = Facades LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades LIBRARY = System.Linq.Parallel.dll -LIB_MCS_FLAGS = /r:System.Core /r:System + +KEY_FILE = ../../msfinal.pub +SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 +LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core PLATFORM_DEBUG_FLAGS = NO_TEST = yes -include ../../../build/library.make +include $(MCS_BUILD_DIR)/library.make + + diff --git a/mcs/class/Facades/System.Linq.Parallel/System.Linq.Parallel.dll.sources b/mcs/class/Facades/System.Linq.Parallel/System.Linq.Parallel.dll.sources index 74532efb2e..8e33d4ddea 100644 --- a/mcs/class/Facades/System.Linq.Parallel/System.Linq.Parallel.dll.sources +++ b/mcs/class/Facades/System.Linq.Parallel/System.Linq.Parallel.dll.sources @@ -1,3 +1,3 @@ -AssemblyInfo.cs TypeForwarders.cs -../../../build/common/Consts.cs +AssemblyInfo.cs + diff --git a/mcs/class/Facades/System.Linq.Parallel/TypeForwarders.cs b/mcs/class/Facades/System.Linq.Parallel/TypeForwarders.cs index 8fab8b6f07..00445f24a3 100644 --- a/mcs/class/Facades/System.Linq.Parallel/TypeForwarders.cs +++ b/mcs/class/Facades/System.Linq.Parallel/TypeForwarders.cs @@ -1,21 +1,16 @@ -// -// TypeForwarders.cs -// -// Author: -// Martin Baulig <martin.baulig@xamarin.com> -// +// // Copyright (c) 2013 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 @@ -23,11 +18,12 @@ // 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.Linq.ParallelQuery))] -[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.ParallelQuery<>))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.OrderedParallelQuery<>))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.ParallelEnumerable))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.ParallelExecutionMode))] [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.ParallelMergeOptions))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.ParallelQuery))] +[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Linq.ParallelQuery<>))] |