Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mcs/build/executable.make4
-rw-r--r--mcs/build/library.make8
-rw-r--r--mcs/class/Accessibility/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Accessibility/Makefile1
-rw-r--r--mcs/class/Commons.Xml.Relaxng/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Commons.Xml.Relaxng/Makefile1
-rw-r--r--mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs1
-rw-r--r--mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile1
-rw-r--r--mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Cscompmgd/Makefile1
-rw-r--r--mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/CustomMarshalers/Makefile1
-rw-r--r--mcs/class/Facades/Microsoft.Win32.Primitives/Makefile4
-rw-r--r--mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Makefile4
-rw-r--r--mcs/class/Facades/Microsoft.Win32.Registry/Makefile4
-rw-r--r--mcs/class/Facades/System.AppContext/Makefile4
-rw-r--r--mcs/class/Facades/System.Collections.Concurrent/Makefile4
-rw-r--r--mcs/class/Facades/System.Collections.Concurrent/_Makefile23
-rw-r--r--mcs/class/Facades/System.Collections.NonGeneric/Makefile4
-rw-r--r--mcs/class/Facades/System.Collections.Specialized/Makefile4
-rw-r--r--mcs/class/Facades/System.Collections/Makefile4
-rw-r--r--mcs/class/Facades/System.ComponentModel.Annotations/Makefile4
-rw-r--r--mcs/class/Facades/System.ComponentModel.EventBasedAsync/Makefile4
-rw-r--r--mcs/class/Facades/System.ComponentModel.Primitives/Makefile4
-rw-r--r--mcs/class/Facades/System.ComponentModel.TypeConverter/Makefile4
-rw-r--r--mcs/class/Facades/System.ComponentModel/Makefile4
-rw-r--r--mcs/class/Facades/System.Console/Makefile4
-rw-r--r--mcs/class/Facades/System.Data.Common/Makefile4
-rw-r--r--mcs/class/Facades/System.Data.SqlClient/Makefile4
-rw-r--r--mcs/class/Facades/System.Diagnostics.Contracts/Makefile4
-rw-r--r--mcs/class/Facades/System.Diagnostics.Debug/Makefile4
-rw-r--r--mcs/class/Facades/System.Diagnostics.FileVersionInfo/Makefile4
-rw-r--r--mcs/class/Facades/System.Diagnostics.Process/Makefile4
-rw-r--r--mcs/class/Facades/System.Diagnostics.StackTrace/Makefile4
-rw-r--r--mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Makefile4
-rw-r--r--mcs/class/Facades/System.Diagnostics.Tools/Makefile4
-rw-r--r--mcs/class/Facades/System.Diagnostics.TraceEvent/Makefile4
-rw-r--r--mcs/class/Facades/System.Diagnostics.TraceSource/Makefile4
-rw-r--r--mcs/class/Facades/System.Diagnostics.Tracing/Makefile4
-rw-r--r--mcs/class/Facades/System.Drawing.Primitives/Makefile4
-rw-r--r--mcs/class/Facades/System.Dynamic.Runtime/Makefile4
-rw-r--r--mcs/class/Facades/System.Globalization.Calendars/Makefile4
-rw-r--r--mcs/class/Facades/System.Globalization.Extensions/Makefile4
-rw-r--r--mcs/class/Facades/System.Globalization/Makefile4
-rw-r--r--mcs/class/Facades/System.IO.Compression.ZipFile/Makefile4
-rw-r--r--mcs/class/Facades/System.IO.FileSystem.AccessControl/Makefile4
-rw-r--r--mcs/class/Facades/System.IO.FileSystem.DriveInfo/Makefile4
-rw-r--r--mcs/class/Facades/System.IO.FileSystem.Primitives/Makefile4
-rw-r--r--mcs/class/Facades/System.IO.FileSystem.Watcher/Makefile4
-rw-r--r--mcs/class/Facades/System.IO.FileSystem/Makefile4
-rw-r--r--mcs/class/Facades/System.IO.IsolatedStorage/Makefile4
-rw-r--r--mcs/class/Facades/System.IO.MemoryMappedFiles/Makefile4
-rw-r--r--mcs/class/Facades/System.IO.Pipes/Makefile4
-rw-r--r--mcs/class/Facades/System.IO.UnmanagedMemoryStream/Makefile4
-rw-r--r--mcs/class/Facades/System.IO/Makefile4
-rw-r--r--mcs/class/Facades/System.Linq.Expressions/Makefile4
-rw-r--r--mcs/class/Facades/System.Linq.Parallel/Makefile4
-rw-r--r--mcs/class/Facades/System.Linq.Queryable/Makefile4
-rw-r--r--mcs/class/Facades/System.Linq/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.AuthenticationManager/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.Cache/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.HttpListener/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.Mail/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.NameResolution/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.NetworkInformation/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.Ping/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.Primitives/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.Requests/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.Security/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.ServicePoint/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.Sockets/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.Utilities/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.WebHeaderCollection/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.WebSockets.Client/Makefile4
-rw-r--r--mcs/class/Facades/System.Net.WebSockets/Makefile4
-rw-r--r--mcs/class/Facades/System.ObjectModel/Makefile4
-rw-r--r--mcs/class/Facades/System.Reflection.DispatchProxy/Makefile4
-rw-r--r--mcs/class/Facades/System.Reflection.Emit.ILGeneration/Makefile4
-rw-r--r--mcs/class/Facades/System.Reflection.Emit.Lightweight/Makefile4
-rw-r--r--mcs/class/Facades/System.Reflection.Emit/Makefile4
-rw-r--r--mcs/class/Facades/System.Reflection.Extensions/Makefile4
-rw-r--r--mcs/class/Facades/System.Reflection.Primitives/Makefile4
-rw-r--r--mcs/class/Facades/System.Reflection.TypeExtensions/Makefile4
-rw-r--r--mcs/class/Facades/System.Reflection/Makefile4
-rw-r--r--mcs/class/Facades/System.Resources.ReaderWriter/Makefile4
-rw-r--r--mcs/class/Facades/System.Resources.ResourceManager/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.Extensions/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.Handles/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.InteropServices/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.Loader/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.Numerics/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.Serialization.Formatters/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.Serialization.Json/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.Serialization.Primitives/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile4
-rw-r--r--mcs/class/Facades/System.Runtime/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.AccessControl/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Claims/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Algorithms/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Cng/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Csp/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Encoding/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Encryption/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Hashing/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.OpenSsl/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Pkcs/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.Primitives/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.ProtectedData/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.RSA/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Cryptography.X509Certificates/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Principal.Windows/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.Principal/Makefile4
-rw-r--r--mcs/class/Facades/System.Security.SecureString/Makefile4
-rw-r--r--mcs/class/Facades/System.ServiceModel.Duplex/Makefile4
-rw-r--r--mcs/class/Facades/System.ServiceModel.Http/Makefile4
-rw-r--r--mcs/class/Facades/System.ServiceModel.NetTcp/Makefile4
-rw-r--r--mcs/class/Facades/System.ServiceModel.Primitives/Makefile4
-rw-r--r--mcs/class/Facades/System.ServiceModel.Security/Makefile4
-rw-r--r--mcs/class/Facades/System.ServiceProcess.ServiceController/Makefile4
-rw-r--r--mcs/class/Facades/System.Text.Encoding.CodePages/Makefile4
-rw-r--r--mcs/class/Facades/System.Text.Encoding.Extensions/Makefile4
-rw-r--r--mcs/class/Facades/System.Text.Encoding/Makefile4
-rw-r--r--mcs/class/Facades/System.Text.RegularExpressions/Makefile4
-rw-r--r--mcs/class/Facades/System.Threading.AccessControl/Makefile4
-rw-r--r--mcs/class/Facades/System.Threading.Overlapped/Makefile4
-rw-r--r--mcs/class/Facades/System.Threading.Tasks.Parallel/Makefile4
-rw-r--r--mcs/class/Facades/System.Threading.Tasks/Makefile4
-rw-r--r--mcs/class/Facades/System.Threading.Thread/Makefile4
-rw-r--r--mcs/class/Facades/System.Threading.ThreadPool/Makefile4
-rw-r--r--mcs/class/Facades/System.Threading.Timer/Makefile4
-rw-r--r--mcs/class/Facades/System.Threading/Makefile4
-rw-r--r--mcs/class/Facades/System.ValueTuple/Makefile6
-rw-r--r--mcs/class/Facades/System.Xml.ReaderWriter/Makefile4
-rw-r--r--mcs/class/Facades/System.Xml.XDocument/Makefile4
-rw-r--r--mcs/class/Facades/System.Xml.XPath.XDocument/Makefile4
-rw-r--r--mcs/class/Facades/System.Xml.XPath.XmlDocument/Makefile4
-rw-r--r--mcs/class/Facades/System.Xml.XPath/Makefile4
-rw-r--r--mcs/class/Facades/System.Xml.XmlDocument/Makefile4
-rw-r--r--mcs/class/Facades/System.Xml.XmlSerializer/Makefile4
-rw-r--r--mcs/class/Facades/System.Xml.Xsl.Primitives/Makefile4
-rw-r--r--mcs/class/Facades/netstandard/Makefile6
-rw-r--r--mcs/class/I18N/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/I18N/CJK/Makefile1
-rw-r--r--mcs/class/I18N/Common/Makefile1
-rw-r--r--mcs/class/I18N/MidEast/Makefile1
-rw-r--r--mcs/class/I18N/Other/Makefile1
-rw-r--r--mcs/class/I18N/Rare/Makefile1
-rw-r--r--mcs/class/I18N/West/Makefile1
-rw-r--r--mcs/class/IBM.Data.DB2/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/IBM.Data.DB2/Makefile1
-rw-r--r--mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs1
-rw-r--r--mcs/class/ICSharpCode.SharpZipLib/Makefile1
-rw-r--r--mcs/class/Microsoft.Build.Engine/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Microsoft.Build.Engine/Makefile1
-rw-r--r--mcs/class/Microsoft.Build.Framework/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Microsoft.Build.Framework/Makefile1
-rw-r--r--mcs/class/Microsoft.Build.Tasks/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Microsoft.Build.Tasks/Makefile1
-rw-r--r--mcs/class/Microsoft.Build.Utilities/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Microsoft.Build.Utilities/Makefile1
-rw-r--r--mcs/class/Microsoft.Build/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Microsoft.Build/Makefile1
-rw-r--r--mcs/class/Microsoft.CSharp/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Microsoft.CSharp/Makefile1
-rw-r--r--mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs2
-rw-r--r--mcs/class/Microsoft.VisualC/Makefile3
-rw-r--r--mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Microsoft.Web.Infrastructure/Makefile1
-rw-r--r--mcs/class/Mono.C5/C5/AssemblyInfo.cs2
-rw-r--r--mcs/class/Mono.C5/Makefile1
-rw-r--r--mcs/class/Mono.CSharp/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.CSharp/Makefile1
-rw-r--r--mcs/class/Mono.Cairo/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Cairo/Makefile1
-rw-r--r--mcs/class/Mono.CodeContracts/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.CodeContracts/Makefile1
-rw-r--r--mcs/class/Mono.CompilerServices.SymbolWriter/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.CompilerServices.SymbolWriter/Makefile1
-rw-r--r--mcs/class/Mono.Data.Sqlite/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Data.Sqlite/Makefile1
-rw-r--r--mcs/class/Mono.Data.Tds/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Data.Tds/Makefile1
-rw-r--r--mcs/class/Mono.Debugger.Soft/Makefile3
-rw-r--r--mcs/class/Mono.Http/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Http/Makefile1
-rw-r--r--mcs/class/Mono.Management/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Management/Makefile1
-rw-r--r--mcs/class/Mono.Messaging.RabbitMQ/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Messaging.RabbitMQ/Makefile1
-rw-r--r--mcs/class/Mono.Messaging/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Messaging/Makefile1
-rw-r--r--mcs/class/Mono.Options/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Options/Makefile1
-rw-r--r--mcs/class/Mono.Parallel/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Parallel/Makefile7
-rw-r--r--mcs/class/Mono.Posix/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Posix/Makefile1
-rw-r--r--mcs/class/Mono.Profiler.Log/Makefile3
-rw-r--r--mcs/class/Mono.Reactive.Testing/Makefile3
-rw-r--r--mcs/class/Mono.Reactive.Testing/more_build_args0
-rw-r--r--mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Security.Win32/Makefile1
-rw-r--r--mcs/class/Mono.Security/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Security/Makefile1
-rw-r--r--mcs/class/Mono.ServiceModel.IdentitySelectors/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.ServiceModel.IdentitySelectors/Makefile1
-rw-r--r--mcs/class/Mono.Simd/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Simd/Makefile1
-rw-r--r--mcs/class/Mono.Tasklets/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Tasklets/Makefile1
-rw-r--r--mcs/class/Mono.WebBrowser/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.WebBrowser/Makefile1
-rw-r--r--mcs/class/Mono.XBuild.Tasks/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.XBuild.Tasks/Makefile1
-rw-r--r--mcs/class/Mono.Xml.Ext/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/Mono.Xml.Ext/Makefile1
-rw-r--r--mcs/class/Novell.Directory.Ldap/Makefile1
-rw-r--r--mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs1
-rw-r--r--mcs/class/PEAPI/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/PEAPI/Makefile1
-rw-r--r--mcs/class/RabbitMQ.Client/src/client/AssemblyInfo.cs1
-rw-r--r--mcs/class/RabbitMQ.Client/src/client/Makefile1
-rw-r--r--mcs/class/System.ComponentModel.Composition.4.5/Makefile1
-rw-r--r--mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.ComponentModel.DataAnnotations/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.ComponentModel.DataAnnotations/Makefile1
-rw-r--r--mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Configuration.Install/Makefile1
-rw-r--r--mcs/class/System.Configuration/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Configuration/Makefile1
-rw-r--r--mcs/class/System.Data.DataSetExtensions/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Data.DataSetExtensions/Makefile1
-rw-r--r--mcs/class/System.Data.Entity/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Data.Entity/Makefile1
-rw-r--r--mcs/class/System.Data.Linq/Makefile1
-rw-r--r--mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile1
-rw-r--r--mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Data.OracleClient/Makefile1
-rw-r--r--mcs/class/System.Data.Services.Client/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Data.Services.Client/Makefile1
-rw-r--r--mcs/class/System.Data.Services/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Data.Services/Makefile1
-rw-r--r--mcs/class/System.Data/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Data/Makefile1
-rw-r--r--mcs/class/System.Design/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Design/Makefile2
-rw-r--r--mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.DirectoryServices.Protocols/Makefile1
-rw-r--r--mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.DirectoryServices/Makefile1
-rw-r--r--mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Drawing.Design/Makefile1
-rw-r--r--mcs/class/System.Drawing/Assembly/AssemblyInfo.cs7
-rw-r--r--mcs/class/System.Drawing/Makefile1
-rw-r--r--mcs/class/System.Dynamic/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Dynamic/Makefile1
-rw-r--r--mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.EnterpriseServices/Makefile1
-rw-r--r--mcs/class/System.IO.Compression.FileSystem/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.IO.Compression.FileSystem/Makefile1
-rw-r--r--mcs/class/System.IO.Compression/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.IO.Compression/Makefile1
-rw-r--r--mcs/class/System.IdentityModel.Selectors/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.IdentityModel.Selectors/Makefile1
-rw-r--r--mcs/class/System.IdentityModel/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.IdentityModel/Makefile1
-rw-r--r--mcs/class/System.Interactive.Async/Makefile5
-rw-r--r--mcs/class/System.Interactive.Async/more_build_args3
-rw-r--r--mcs/class/System.Interactive.Providers/Makefile5
-rw-r--r--mcs/class/System.Interactive.Providers/more_build_args3
-rw-r--r--mcs/class/System.Interactive/Makefile5
-rw-r--r--mcs/class/System.Interactive/more_build_args3
-rwxr-xr-xmcs/class/System.Json/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Json/Makefile1
-rw-r--r--mcs/class/System.Management/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Management/Makefile1
-rw-r--r--mcs/class/System.Messaging/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Messaging/Makefile1
-rw-r--r--mcs/class/System.Net.Http.WebRequest/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Net.Http.WebRequest/Makefile1
-rw-r--r--mcs/class/System.Net.Http.WinHttpHandler/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Net.Http.WinHttpHandler/Makefile1
-rw-r--r--mcs/class/System.Net.Http/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Net.Http/Makefile1
-rw-r--r--mcs/class/System.Numerics.Vectors/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Numerics.Vectors/Makefile1
-rw-r--r--mcs/class/System.Numerics/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Numerics/Makefile1
-rw-r--r--mcs/class/System.Reactive.Core/Makefile6
-rw-r--r--mcs/class/System.Reactive.Core/more_build_args4
-rw-r--r--mcs/class/System.Reactive.Debugger/Makefile5
-rw-r--r--mcs/class/System.Reactive.Debugger/more_build_args3
-rw-r--r--mcs/class/System.Reactive.Experimental/Makefile5
-rw-r--r--mcs/class/System.Reactive.Experimental/more_build_args3
-rw-r--r--mcs/class/System.Reactive.Interfaces/Makefile5
-rw-r--r--mcs/class/System.Reactive.Interfaces/more_build_args3
-rw-r--r--mcs/class/System.Reactive.Linq/Makefile6
-rw-r--r--mcs/class/System.Reactive.Linq/more_build_args4
-rw-r--r--mcs/class/System.Reactive.Observable.Aliases/Makefile6
-rw-r--r--mcs/class/System.Reactive.Observable.Aliases/more_build_args3
-rw-r--r--mcs/class/System.Reactive.PlatformServices/Makefile6
-rw-r--r--mcs/class/System.Reactive.PlatformServices/more_build_args4
-rw-r--r--mcs/class/System.Reactive.Providers/Makefile6
-rw-r--r--mcs/class/System.Reactive.Providers/more_build_args4
-rw-r--r--mcs/class/System.Reactive.Runtime.Remoting/Makefile6
-rw-r--r--mcs/class/System.Reactive.Runtime.Remoting/more_build_args3
-rw-r--r--mcs/class/System.Reactive.Windows.Forms/Makefile6
-rw-r--r--mcs/class/System.Reactive.Windows.Forms/more_build_args3
-rw-r--r--mcs/class/System.Reactive.Windows.Threading/Makefile6
-rw-r--r--mcs/class/System.Reactive.Windows.Threading/more_build_args4
-rw-r--r--mcs/class/System.Reflection.Context/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Reflection.Context/Makefile1
-rw-r--r--mcs/class/System.Runtime.Caching/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Runtime.Caching/Makefile1
-rw-r--r--mcs/class/System.Runtime.DurableInstancing/Assembly/AssemblyInfo.cs5
-rw-r--r--mcs/class/System.Runtime.DurableInstancing/Makefile6
-rw-r--r--mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Runtime.Remoting/Makefile1
-rw-r--r--mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Runtime.Serialization.Formatters.Soap/Makefile1
-rw-r--r--mcs/class/System.Security/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Security/Makefile1
-rw-r--r--mcs/class/System.ServiceModel.Activation/Assembly/AssemblyInfo.cs2
-rw-r--r--mcs/class/System.ServiceModel.Activation/Makefile1
-rw-r--r--mcs/class/System.ServiceModel.Discovery/Assembly/AssemblyInfo.cs5
-rw-r--r--mcs/class/System.ServiceModel.Discovery/Makefile6
-rw-r--r--mcs/class/System.ServiceModel.Routing/Assembly/AssemblyInfo.cs5
-rw-r--r--mcs/class/System.ServiceModel.Routing/Makefile6
-rw-r--r--mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs2
-rw-r--r--mcs/class/System.ServiceModel.Web/Makefile6
-rw-r--r--mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.ServiceProcess/Makefile1
-rw-r--r--mcs/class/System.Threading.Tasks.Dataflow/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Threading.Tasks.Dataflow/Makefile5
-rw-r--r--mcs/class/System.Transactions/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Transactions/Makefile1
-rw-r--r--mcs/class/System.Web.Abstractions/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Web.Abstractions/Makefile1
-rw-r--r--mcs/class/System.Web.ApplicationServices/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Web.ApplicationServices/Makefile1
-rw-r--r--mcs/class/System.Web.DynamicData/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Web.DynamicData/Makefile1
-rw-r--r--mcs/class/System.Web.DynamicData/Test/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Web.Extensions.Design/Makefile1
-rw-r--r--mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Web.Extensions/Makefile1
-rw-r--r--mcs/class/System.Web.Http/Makefile5
-rw-r--r--mcs/class/System.Web.Mvc3/Makefile2
-rw-r--r--mcs/class/System.Web.Razor/Makefile6
-rw-r--r--mcs/class/System.Web.Routing/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Web.Routing/Makefile1
-rw-r--r--mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Web.Services/Makefile1
-rw-r--r--mcs/class/System.Web.WebPages.Deployment/Makefile7
-rw-r--r--mcs/class/System.Web.WebPages.Razor/Makefile6
-rw-r--r--mcs/class/System.Web.WebPages/Makefile6
-rw-r--r--mcs/class/System.Web/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Web/Makefile1
-rw-r--r--mcs/class/System.Windows.Forms.DataVisualization/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Windows.Forms.DataVisualization/Makefile1
-rw-r--r--mcs/class/System.Windows.Forms/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Windows.Forms/Makefile1
-rw-r--r--mcs/class/System.Windows/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Windows/Makefile1
-rw-r--r--mcs/class/System.Xml.Serialization/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Xml.Serialization/Makefile1
-rw-r--r--mcs/class/SystemWebTestShim/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/SystemWebTestShim/Makefile1
-rw-r--r--mcs/class/WebMatrix.Data/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/WebMatrix.Data/Makefile1
-rw-r--r--mcs/class/WindowsBase/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/WindowsBase/Makefile1
-rw-r--r--mcs/class/monodoc/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/monodoc/Makefile1
385 files changed, 485 insertions, 530 deletions
diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index 902697219b4..020609b26a4 100644
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -45,6 +45,10 @@ makefrag = $(depsdir)/$(PROFILE)_$(base_prog).makefrag
MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS))
MCS_REFERENCES += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.exe,$(EXE_REFS))
+ifdef KEYFILE
+LIB_MCS_FLAGS += /keyfile:$(KEYFILE)
+endif
+
ifndef NO_BUILD
all-local: $(the_lib) $(PROGRAM_config)
endif
diff --git a/mcs/build/library.make b/mcs/build/library.make
index 6f3e0a8c2d2..3fe7d922338 100644
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -26,6 +26,10 @@ LIB_REFS_ALIAS = $(filter-out $(LIB_REFS_FULL),$(LIB_REFS))
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_FULL))
LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/class/lib/$(PROFILE_DIRECTORY)/,$(LIB_REFS_ALIAS)))
+ifdef KEYFILE
+KEYFILE_MCS_FLAGS += /keyfile:$(KEYFILE)
+endif
+
ifndef LIBRARY_NAME
LIBRARY_NAME = $(LIBRARY)
endif
@@ -104,7 +108,7 @@ csproj-library:
case "$(thisdir)" in *"Facades"*) config_file=Facades_$$config_file;; *"legacy"*) config_file=legacy_$$config_file;; esac; \
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
(echo $(is_boot); \
- echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
+ echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(KEYFILE_MCS_FLAGS); \
echo $(LIBRARY_NAME); \
echo $(BUILT_SOURCES_cmdline); \
echo $(build_lib); \
@@ -308,7 +312,7 @@ endif
ifndef NO_BUILD
$(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir)/.stamp $(GEN_RESOURCE_DEPS)
- $(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(GEN_RESOURCE_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
+ $(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(KEYFILE_MCS_FLAGS) $(GEN_RESOURCE_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
ifdef RESOURCE_STRINGS_FILES
$(Q) $(STRING_REPLACER) $(RESOURCE_STRINGS_FILES) $@
endif
diff --git a/mcs/class/Accessibility/Assembly/AssemblyInfo.cs b/mcs/class/Accessibility/Assembly/AssemblyInfo.cs
index 2b7c5494fed..9b481a90294 100644
--- a/mcs/class/Accessibility/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Accessibility/Assembly/AssemblyInfo.cs
@@ -56,7 +56,6 @@ using System.Runtime.InteropServices;
[assembly: AllowPartiallyTrustedCallers]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: ImportedFromTypeLib ("Accessibility")]
diff --git a/mcs/class/Accessibility/Makefile b/mcs/class/Accessibility/Makefile
index 8700935681b..435a3c7b044 100644
--- a/mcs/class/Accessibility/Makefile
+++ b/mcs/class/Accessibility/Makefile
@@ -3,6 +3,7 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = Accessibility.dll
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
NO_TEST = yes
diff --git a/mcs/class/Commons.Xml.Relaxng/Assembly/AssemblyInfo.cs b/mcs/class/Commons.Xml.Relaxng/Assembly/AssemblyInfo.cs
index d0a7fa24bec..368de21261e 100644
--- a/mcs/class/Commons.Xml.Relaxng/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Commons.Xml.Relaxng/Assembly/AssemblyInfo.cs
@@ -44,5 +44,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/Commons.Xml.Relaxng/Makefile b/mcs/class/Commons.Xml.Relaxng/Makefile
index d63e7af0565..1febae4eb1e 100644
--- a/mcs/class/Commons.Xml.Relaxng/Makefile
+++ b/mcs/class/Commons.Xml.Relaxng/Makefile
@@ -8,6 +8,7 @@ OTHER_RES = $(RESOURCE_FILES)
LIBRARY = Commons.Xml.Relaxng.dll
LIB_REFS = System System.Xml
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = \
$(foreach r, $(OTHER_RES), /resource:$(r),$(notdir $(r)))
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
diff --git a/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs b/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs
index 6cb9fb392a3..be6b32da09a 100644
--- a/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs
+++ b/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs
@@ -50,4 +50,3 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("2.6.0.0")]
[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile ("SharpZipLib.pub")]
diff --git a/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile b/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile
index 74debbe57e6..fd6ced25e83 100644
--- a/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile
+++ b/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile
@@ -8,6 +8,7 @@ LIBRARY_COMPAT = yes
LIBRARY_SNK = SharpZipLib.key
LIB_REFS = System System.Xml
+KEYFILE = SharpZipLib.pub
LIB_MCS_FLAGS =
NO_TEST = yes
EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
diff --git a/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs b/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs
index 1150e8257f8..cf0fdf4084b 100644
--- a/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Cscompmgd/Assembly/AssemblyInfo.cs
@@ -45,7 +45,6 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: AssemblyTitle ("cscompmgd.dll")]
[assembly: AssemblyDefaultAlias ("cscompmgd.dll")]
diff --git a/mcs/class/Cscompmgd/Makefile b/mcs/class/Cscompmgd/Makefile
index 54ff581cee0..8f52ee52cf7 100644
--- a/mcs/class/Cscompmgd/Makefile
+++ b/mcs/class/Cscompmgd/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = Cscompmgd.dll
LIB_REFS = System
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
LIBRARY_NAME = cscompmgd.dll
diff --git a/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs b/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs
index 0f297530ca6..70f5c461101 100644
--- a/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs
+++ b/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs
@@ -39,7 +39,6 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: AssemblyTitle ("CustomMarshalers.dll")]
[assembly: AssemblyDescription ("CustomMarshalers.dll")]
diff --git a/mcs/class/CustomMarshalers/Makefile b/mcs/class/CustomMarshalers/Makefile
index 366921c583f..96da1f60b22 100644
--- a/mcs/class/CustomMarshalers/Makefile
+++ b/mcs/class/CustomMarshalers/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = CustomMarshalers.dll
LIB_REFS = System
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
NO_TEST = yes
diff --git a/mcs/class/Facades/Microsoft.Win32.Primitives/Makefile b/mcs/class/Facades/Microsoft.Win32.Primitives/Makefile
index d1b93730000..0c97f371a8f 100644
--- a/mcs/class/Facades/Microsoft.Win32.Primitives/Makefile
+++ b/mcs/class/Facades/Microsoft.Win32.Primitives/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = Microsoft.Win32.Primitives.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Makefile b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Makefile
index 4197137c95e..6f39a8b55c0 100644
--- a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Makefile
+++ b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = Microsoft.Win32.Registry.AccessControl.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/Microsoft.Win32.Registry/Makefile b/mcs/class/Facades/Microsoft.Win32.Registry/Makefile
index 5f1030b7c72..e4919fa9e9a 100644
--- a/mcs/class/Facades/Microsoft.Win32.Registry/Makefile
+++ b/mcs/class/Facades/Microsoft.Win32.Registry/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = Microsoft.Win32.Registry.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.AppContext/Makefile b/mcs/class/Facades/System.AppContext/Makefile
index 9170d927e04..8ae9028aa41 100644
--- a/mcs/class/Facades/System.AppContext/Makefile
+++ b/mcs/class/Facades/System.AppContext/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.AppContext.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Collections.Concurrent/Makefile b/mcs/class/Facades/System.Collections.Concurrent/Makefile
index d94e5d55dd2..2fd47eb37c8 100644
--- a/mcs/class/Facades/System.Collections.Concurrent/Makefile
+++ b/mcs/class/Facades/System.Collections.Concurrent/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Collections.Concurrent.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Collections.Concurrent/_Makefile b/mcs/class/Facades/System.Collections.Concurrent/_Makefile
deleted file mode 100644
index 4eeef250d28..00000000000
--- a/mcs/class/Facades/System.Collections.Concurrent/_Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-MCS_BUILD_DIR = ../../../build
-
-thisdir = class/Facades/System.Collections.Concurrent
-SUBDIRS =
-include $(MCS_BUILD_DIR)/rules.make
-
-LIBRARY_SUBDIR = Facades
-LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
-
-LIBRARY = System.Collections.Concurrent.dll
-
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
-LIB_REFS = System
-LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
-
-PLATFORM_DEBUG_FLAGS =
-
-NO_TEST = yes
-
-include $(MCS_BUILD_DIR)/library.make
-
-
diff --git a/mcs/class/Facades/System.Collections.NonGeneric/Makefile b/mcs/class/Facades/System.Collections.NonGeneric/Makefile
index f2f3cdb4772..c186c06955c 100644
--- a/mcs/class/Facades/System.Collections.NonGeneric/Makefile
+++ b/mcs/class/Facades/System.Collections.NonGeneric/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Collections.NonGeneric.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Collections.Specialized/Makefile b/mcs/class/Facades/System.Collections.Specialized/Makefile
index d391fa9ac51..f5cf8f67590 100644
--- a/mcs/class/Facades/System.Collections.Specialized/Makefile
+++ b/mcs/class/Facades/System.Collections.Specialized/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Collections.Specialized.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Collections/Makefile b/mcs/class/Facades/System.Collections/Makefile
index dc6dca0073a..a75dbb70dc8 100644
--- a/mcs/class/Facades/System.Collections/Makefile
+++ b/mcs/class/Facades/System.Collections/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Collections.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ComponentModel.Annotations/Makefile b/mcs/class/Facades/System.ComponentModel.Annotations/Makefile
index a4f1cc41c4d..ff94c07db1b 100644
--- a/mcs/class/Facades/System.ComponentModel.Annotations/Makefile
+++ b/mcs/class/Facades/System.ComponentModel.Annotations/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ComponentModel.Annotations.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.ComponentModel.DataAnnotations
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Makefile b/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Makefile
index 48a6b9c11e6..2def8432572 100644
--- a/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Makefile
+++ b/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ComponentModel.EventBasedAsync.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ComponentModel.Primitives/Makefile b/mcs/class/Facades/System.ComponentModel.Primitives/Makefile
index dac065757de..fd01c011f85 100644
--- a/mcs/class/Facades/System.ComponentModel.Primitives/Makefile
+++ b/mcs/class/Facades/System.ComponentModel.Primitives/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ComponentModel.Primitives.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ComponentModel.TypeConverter/Makefile b/mcs/class/Facades/System.ComponentModel.TypeConverter/Makefile
index 6062e304a95..7a0a3354d82 100644
--- a/mcs/class/Facades/System.ComponentModel.TypeConverter/Makefile
+++ b/mcs/class/Facades/System.ComponentModel.TypeConverter/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ComponentModel.TypeConverter.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ComponentModel/Makefile b/mcs/class/Facades/System.ComponentModel/Makefile
index 33b88f9541e..f213856470f 100644
--- a/mcs/class/Facades/System.ComponentModel/Makefile
+++ b/mcs/class/Facades/System.ComponentModel/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ComponentModel.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Console/Makefile b/mcs/class/Facades/System.Console/Makefile
index ea7312a4d70..cc851e10ccc 100644
--- a/mcs/class/Facades/System.Console/Makefile
+++ b/mcs/class/Facades/System.Console/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Console.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Data.Common/Makefile b/mcs/class/Facades/System.Data.Common/Makefile
index ff6d0356789..36cc55f5a81 100644
--- a/mcs/class/Facades/System.Data.Common/Makefile
+++ b/mcs/class/Facades/System.Data.Common/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Data.Common.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Data System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Data.SqlClient/Makefile b/mcs/class/Facades/System.Data.SqlClient/Makefile
index f5eb7097fd6..a2fce4d2d98 100644
--- a/mcs/class/Facades/System.Data.SqlClient/Makefile
+++ b/mcs/class/Facades/System.Data.SqlClient/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Data.SqlClient.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Data System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Diagnostics.Contracts/Makefile b/mcs/class/Facades/System.Diagnostics.Contracts/Makefile
index 391da57605b..150500c8465 100644
--- a/mcs/class/Facades/System.Diagnostics.Contracts/Makefile
+++ b/mcs/class/Facades/System.Diagnostics.Contracts/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Diagnostics.Contracts.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Diagnostics.Debug/Makefile b/mcs/class/Facades/System.Diagnostics.Debug/Makefile
index 0eccd876719..2ceeb32a62b 100644
--- a/mcs/class/Facades/System.Diagnostics.Debug/Makefile
+++ b/mcs/class/Facades/System.Diagnostics.Debug/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Diagnostics.Debug.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Makefile b/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Makefile
index 1ac2f6cc2a0..14fd656d5fc 100644
--- a/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Makefile
+++ b/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Diagnostics.FileVersionInfo.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Diagnostics.Process/Makefile b/mcs/class/Facades/System.Diagnostics.Process/Makefile
index 83fd768e251..039455814be 100644
--- a/mcs/class/Facades/System.Diagnostics.Process/Makefile
+++ b/mcs/class/Facades/System.Diagnostics.Process/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Diagnostics.Process.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Diagnostics.StackTrace/Makefile b/mcs/class/Facades/System.Diagnostics.StackTrace/Makefile
index 4cc9d7f1a3b..f7f79d2545c 100644
--- a/mcs/class/Facades/System.Diagnostics.StackTrace/Makefile
+++ b/mcs/class/Facades/System.Diagnostics.StackTrace/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Diagnostics.StackTrace.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Makefile b/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Makefile
index aa7c6dc119f..e1d059ff25b 100644
--- a/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Makefile
+++ b/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Diagnostics.TextWriterTraceListener.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Diagnostics.Tools/Makefile b/mcs/class/Facades/System.Diagnostics.Tools/Makefile
index 3d9b5158255..fe925a8d7f5 100644
--- a/mcs/class/Facades/System.Diagnostics.Tools/Makefile
+++ b/mcs/class/Facades/System.Diagnostics.Tools/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Diagnostics.Tools.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Diagnostics.TraceEvent/Makefile b/mcs/class/Facades/System.Diagnostics.TraceEvent/Makefile
index 342e82dbf4a..89f5a007fd6 100644
--- a/mcs/class/Facades/System.Diagnostics.TraceEvent/Makefile
+++ b/mcs/class/Facades/System.Diagnostics.TraceEvent/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Diagnostics.TraceEvent.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Diagnostics.TraceSource/Makefile b/mcs/class/Facades/System.Diagnostics.TraceSource/Makefile
index 3467273f7c9..8d3d7c882a1 100644
--- a/mcs/class/Facades/System.Diagnostics.TraceSource/Makefile
+++ b/mcs/class/Facades/System.Diagnostics.TraceSource/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Diagnostics.TraceSource.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Diagnostics.Tracing/Makefile b/mcs/class/Facades/System.Diagnostics.Tracing/Makefile
index 14b380da866..9e31fe9431e 100644
--- a/mcs/class/Facades/System.Diagnostics.Tracing/Makefile
+++ b/mcs/class/Facades/System.Diagnostics.Tracing/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Diagnostics.Tracing.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Drawing.Primitives/Makefile b/mcs/class/Facades/System.Drawing.Primitives/Makefile
index 0ef7aa55d0c..d0d4f2dea9f 100644
--- a/mcs/class/Facades/System.Drawing.Primitives/Makefile
+++ b/mcs/class/Facades/System.Drawing.Primitives/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Drawing.Primitives.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
diff --git a/mcs/class/Facades/System.Dynamic.Runtime/Makefile b/mcs/class/Facades/System.Dynamic.Runtime/Makefile
index a6bcda9f3de..f1502c47b2b 100644
--- a/mcs/class/Facades/System.Dynamic.Runtime/Makefile
+++ b/mcs/class/Facades/System.Dynamic.Runtime/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Dynamic.Runtime.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Core System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Globalization.Calendars/Makefile b/mcs/class/Facades/System.Globalization.Calendars/Makefile
index 5f419e9b635..952194574c2 100644
--- a/mcs/class/Facades/System.Globalization.Calendars/Makefile
+++ b/mcs/class/Facades/System.Globalization.Calendars/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Globalization.Calendars.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Globalization.Extensions/Makefile b/mcs/class/Facades/System.Globalization.Extensions/Makefile
index 446a4127607..8827c291726 100644
--- a/mcs/class/Facades/System.Globalization.Extensions/Makefile
+++ b/mcs/class/Facades/System.Globalization.Extensions/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Globalization.Extensions.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Globalization/Makefile b/mcs/class/Facades/System.Globalization/Makefile
index 4f01dfeb762..3577310f354 100644
--- a/mcs/class/Facades/System.Globalization/Makefile
+++ b/mcs/class/Facades/System.Globalization/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Globalization.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.IO.Compression.ZipFile/Makefile b/mcs/class/Facades/System.IO.Compression.ZipFile/Makefile
index b4e4896a629..92949d59ddf 100644
--- a/mcs/class/Facades/System.IO.Compression.ZipFile/Makefile
+++ b/mcs/class/Facades/System.IO.Compression.ZipFile/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.IO.Compression.ZipFile.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.IO.Compression.FileSystem
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.IO.FileSystem.AccessControl/Makefile b/mcs/class/Facades/System.IO.FileSystem.AccessControl/Makefile
index 9efb35542bf..ad10cb9bf17 100644
--- a/mcs/class/Facades/System.IO.FileSystem.AccessControl/Makefile
+++ b/mcs/class/Facades/System.IO.FileSystem.AccessControl/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.IO.FileSystem.AccessControl.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Makefile b/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Makefile
index 0925c49d155..61a960476ea 100644
--- a/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Makefile
+++ b/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.IO.FileSystem.DriveInfo.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.IO.FileSystem.Primitives/Makefile b/mcs/class/Facades/System.IO.FileSystem.Primitives/Makefile
index 31b27077e45..6b2f4ce93cf 100644
--- a/mcs/class/Facades/System.IO.FileSystem.Primitives/Makefile
+++ b/mcs/class/Facades/System.IO.FileSystem.Primitives/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.IO.FileSystem.Primitives.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.IO.FileSystem.Watcher/Makefile b/mcs/class/Facades/System.IO.FileSystem.Watcher/Makefile
index caade8a02a0..276b8ea4524 100644
--- a/mcs/class/Facades/System.IO.FileSystem.Watcher/Makefile
+++ b/mcs/class/Facades/System.IO.FileSystem.Watcher/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.IO.FileSystem.Watcher.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.IO.FileSystem/Makefile b/mcs/class/Facades/System.IO.FileSystem/Makefile
index 178aa60efea..881bb1e0049 100644
--- a/mcs/class/Facades/System.IO.FileSystem/Makefile
+++ b/mcs/class/Facades/System.IO.FileSystem/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.IO.FileSystem.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.IO.IsolatedStorage/Makefile b/mcs/class/Facades/System.IO.IsolatedStorage/Makefile
index be6a315004b..e45aaaaf734 100644
--- a/mcs/class/Facades/System.IO.IsolatedStorage/Makefile
+++ b/mcs/class/Facades/System.IO.IsolatedStorage/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.IO.IsolatedStorage.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.IO.MemoryMappedFiles/Makefile b/mcs/class/Facades/System.IO.MemoryMappedFiles/Makefile
index 656b03cd126..62b0958b9d6 100644
--- a/mcs/class/Facades/System.IO.MemoryMappedFiles/Makefile
+++ b/mcs/class/Facades/System.IO.MemoryMappedFiles/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.IO.MemoryMappedFiles.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.IO.Pipes/Makefile b/mcs/class/Facades/System.IO.Pipes/Makefile
index 0d156aafeb1..690c3b8a387 100644
--- a/mcs/class/Facades/System.IO.Pipes/Makefile
+++ b/mcs/class/Facades/System.IO.Pipes/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.IO.Pipes.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Makefile b/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Makefile
index c1605d9ccf8..867f697ca1f 100644
--- a/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Makefile
+++ b/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.IO.UnmanagedMemoryStream.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.IO/Makefile b/mcs/class/Facades/System.IO/Makefile
index 89fc0db0963..96f2b867bf6 100644
--- a/mcs/class/Facades/System.IO/Makefile
+++ b/mcs/class/Facades/System.IO/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.IO.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Linq.Expressions/Makefile b/mcs/class/Facades/System.Linq.Expressions/Makefile
index bb78580fb43..136c8ff6390 100644
--- a/mcs/class/Facades/System.Linq.Expressions/Makefile
+++ b/mcs/class/Facades/System.Linq.Expressions/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Linq.Expressions.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Linq.Parallel/Makefile b/mcs/class/Facades/System.Linq.Parallel/Makefile
index 7d314bf5e95..4f5c1170695 100644
--- a/mcs/class/Facades/System.Linq.Parallel/Makefile
+++ b/mcs/class/Facades/System.Linq.Parallel/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Linq.Parallel.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Linq.Queryable/Makefile b/mcs/class/Facades/System.Linq.Queryable/Makefile
index 6ea4c746ec8..835b13ff141 100644
--- a/mcs/class/Facades/System.Linq.Queryable/Makefile
+++ b/mcs/class/Facades/System.Linq.Queryable/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Linq.Queryable.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Linq/Makefile b/mcs/class/Facades/System.Linq/Makefile
index d9778697d4c..d2b82435312 100644
--- a/mcs/class/Facades/System.Linq/Makefile
+++ b/mcs/class/Facades/System.Linq/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Linq.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.AuthenticationManager/Makefile b/mcs/class/Facades/System.Net.AuthenticationManager/Makefile
index 293f80d25d3..f8504ec7419 100644
--- a/mcs/class/Facades/System.Net.AuthenticationManager/Makefile
+++ b/mcs/class/Facades/System.Net.AuthenticationManager/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.AuthenticationManager.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.Cache/Makefile b/mcs/class/Facades/System.Net.Cache/Makefile
index bbdcfce7592..54928e09ec0 100644
--- a/mcs/class/Facades/System.Net.Cache/Makefile
+++ b/mcs/class/Facades/System.Net.Cache/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.Cache.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.HttpListener/Makefile b/mcs/class/Facades/System.Net.HttpListener/Makefile
index 3109e707615..c603bdeb2b6 100644
--- a/mcs/class/Facades/System.Net.HttpListener/Makefile
+++ b/mcs/class/Facades/System.Net.HttpListener/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.HttpListener.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.Mail/Makefile b/mcs/class/Facades/System.Net.Mail/Makefile
index fe936b17d91..6c3ba47a4c9 100644
--- a/mcs/class/Facades/System.Net.Mail/Makefile
+++ b/mcs/class/Facades/System.Net.Mail/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.Mail.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.NameResolution/Makefile b/mcs/class/Facades/System.Net.NameResolution/Makefile
index 142a303c38e..a43cc24df3e 100644
--- a/mcs/class/Facades/System.Net.NameResolution/Makefile
+++ b/mcs/class/Facades/System.Net.NameResolution/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.NameResolution.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.NetworkInformation/Makefile b/mcs/class/Facades/System.Net.NetworkInformation/Makefile
index bc2a7ec8166..c9f9c1bbe86 100644
--- a/mcs/class/Facades/System.Net.NetworkInformation/Makefile
+++ b/mcs/class/Facades/System.Net.NetworkInformation/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.NetworkInformation.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.Ping/Makefile b/mcs/class/Facades/System.Net.Ping/Makefile
index 750ace69439..f18b50e7e4c 100644
--- a/mcs/class/Facades/System.Net.Ping/Makefile
+++ b/mcs/class/Facades/System.Net.Ping/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.Ping.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.Primitives/Makefile b/mcs/class/Facades/System.Net.Primitives/Makefile
index bc362713259..08e719e2bef 100644
--- a/mcs/class/Facades/System.Net.Primitives/Makefile
+++ b/mcs/class/Facades/System.Net.Primitives/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.Primitives.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.Requests/Makefile b/mcs/class/Facades/System.Net.Requests/Makefile
index 7a8a231bc3b..f1e06d28a56 100644
--- a/mcs/class/Facades/System.Net.Requests/Makefile
+++ b/mcs/class/Facades/System.Net.Requests/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.Requests.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.Security/Makefile b/mcs/class/Facades/System.Net.Security/Makefile
index cdd7db906c9..dd4a723ab07 100644
--- a/mcs/class/Facades/System.Net.Security/Makefile
+++ b/mcs/class/Facades/System.Net.Security/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.Security.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.ServicePoint/Makefile b/mcs/class/Facades/System.Net.ServicePoint/Makefile
index f0d095317dc..fbb5065de20 100644
--- a/mcs/class/Facades/System.Net.ServicePoint/Makefile
+++ b/mcs/class/Facades/System.Net.ServicePoint/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.ServicePoint.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.Sockets/Makefile b/mcs/class/Facades/System.Net.Sockets/Makefile
index bf60d5fef6b..3384d7b1cde 100644
--- a/mcs/class/Facades/System.Net.Sockets/Makefile
+++ b/mcs/class/Facades/System.Net.Sockets/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.Sockets.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.Utilities/Makefile b/mcs/class/Facades/System.Net.Utilities/Makefile
index 6f1a5166b8a..138be5a83ca 100644
--- a/mcs/class/Facades/System.Net.Utilities/Makefile
+++ b/mcs/class/Facades/System.Net.Utilities/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.Utilities.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.WebHeaderCollection/Makefile b/mcs/class/Facades/System.Net.WebHeaderCollection/Makefile
index f6ec2a06526..1533bb4d1e5 100644
--- a/mcs/class/Facades/System.Net.WebHeaderCollection/Makefile
+++ b/mcs/class/Facades/System.Net.WebHeaderCollection/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.WebHeaderCollection.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.WebSockets.Client/Makefile b/mcs/class/Facades/System.Net.WebSockets.Client/Makefile
index 2552b0e0d5b..08e44b8c42f 100644
--- a/mcs/class/Facades/System.Net.WebSockets.Client/Makefile
+++ b/mcs/class/Facades/System.Net.WebSockets.Client/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.WebSockets.Client.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Net.WebSockets/Makefile b/mcs/class/Facades/System.Net.WebSockets/Makefile
index e9fa98fd8b4..ed8a427060a 100644
--- a/mcs/class/Facades/System.Net.WebSockets/Makefile
+++ b/mcs/class/Facades/System.Net.WebSockets/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Net.WebSockets.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ObjectModel/Makefile b/mcs/class/Facades/System.ObjectModel/Makefile
index 0838b23d3cf..432314520fd 100644
--- a/mcs/class/Facades/System.ObjectModel/Makefile
+++ b/mcs/class/Facades/System.ObjectModel/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ObjectModel.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Reflection.DispatchProxy/Makefile b/mcs/class/Facades/System.Reflection.DispatchProxy/Makefile
index 0dab0689253..3c949251b97 100644
--- a/mcs/class/Facades/System.Reflection.DispatchProxy/Makefile
+++ b/mcs/class/Facades/System.Reflection.DispatchProxy/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Reflection.DispatchProxy.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe
diff --git a/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Makefile b/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Makefile
index 6ee536f7b71..8c0e2259b0d 100644
--- a/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Makefile
+++ b/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Reflection.Emit.ILGeneration.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Reflection.Emit.Lightweight/Makefile b/mcs/class/Facades/System.Reflection.Emit.Lightweight/Makefile
index 93292276ab1..2144babc916 100644
--- a/mcs/class/Facades/System.Reflection.Emit.Lightweight/Makefile
+++ b/mcs/class/Facades/System.Reflection.Emit.Lightweight/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Reflection.Emit.Lightweight.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Reflection.Emit/Makefile b/mcs/class/Facades/System.Reflection.Emit/Makefile
index 798d457271e..444fd0e2111 100644
--- a/mcs/class/Facades/System.Reflection.Emit/Makefile
+++ b/mcs/class/Facades/System.Reflection.Emit/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Reflection.Emit.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Reflection.Extensions/Makefile b/mcs/class/Facades/System.Reflection.Extensions/Makefile
index e1799cc150e..43c598e6777 100644
--- a/mcs/class/Facades/System.Reflection.Extensions/Makefile
+++ b/mcs/class/Facades/System.Reflection.Extensions/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Reflection.Extensions.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Reflection.Primitives/Makefile b/mcs/class/Facades/System.Reflection.Primitives/Makefile
index ee500e52ecb..2ddef8d13b8 100644
--- a/mcs/class/Facades/System.Reflection.Primitives/Makefile
+++ b/mcs/class/Facades/System.Reflection.Primitives/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Reflection.Primitives.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Reflection.TypeExtensions/Makefile b/mcs/class/Facades/System.Reflection.TypeExtensions/Makefile
index 155f59caeb1..bcc4bc697d5 100644
--- a/mcs/class/Facades/System.Reflection.TypeExtensions/Makefile
+++ b/mcs/class/Facades/System.Reflection.TypeExtensions/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Reflection.TypeExtensions.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Reflection/Makefile b/mcs/class/Facades/System.Reflection/Makefile
index 3061a268a23..78492b63967 100644
--- a/mcs/class/Facades/System.Reflection/Makefile
+++ b/mcs/class/Facades/System.Reflection/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Reflection.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Resources.ReaderWriter/Makefile b/mcs/class/Facades/System.Resources.ReaderWriter/Makefile
index e2795e40f7d..c8c1215b15f 100644
--- a/mcs/class/Facades/System.Resources.ReaderWriter/Makefile
+++ b/mcs/class/Facades/System.Resources.ReaderWriter/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Resources.ReaderWriter.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Resources.ResourceManager/Makefile b/mcs/class/Facades/System.Resources.ResourceManager/Makefile
index 15f241e4091..a54293846a3 100644
--- a/mcs/class/Facades/System.Resources.ResourceManager/Makefile
+++ b/mcs/class/Facades/System.Resources.ResourceManager/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Resources.ResourceManager.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Makefile b/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Makefile
index 6f7f15c612e..6658273fff4 100644
--- a/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Makefile
+++ b/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.CompilerServices.VisualC.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Runtime.Extensions/Makefile b/mcs/class/Facades/System.Runtime.Extensions/Makefile
index 70fd8c93305..3331d195d56 100644
--- a/mcs/class/Facades/System.Runtime.Extensions/Makefile
+++ b/mcs/class/Facades/System.Runtime.Extensions/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.Extensions.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Runtime.Handles/Makefile b/mcs/class/Facades/System.Runtime.Handles/Makefile
index db800c29abf..f323de6a290 100644
--- a/mcs/class/Facades/System.Runtime.Handles/Makefile
+++ b/mcs/class/Facades/System.Runtime.Handles/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.Handles.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile
index fe76e860baa..b8d2105de84 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile
+++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Makefile
@@ -11,8 +11,8 @@ LIBRARY = System.Runtime.InteropServices.RuntimeInformation.dll
RESX_RESOURCE_STRING = ../../../../external/corefx/src/System.Runtime.InteropServices.RuntimeInformation/src/Resources/Strings.resx
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699,436
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699,436
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe
diff --git a/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Makefile b/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Makefile
index 1aaf02e2fc5..b17d1819e61 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Makefile
+++ b/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.InteropServices.WindowsRuntime.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Runtime.InteropServices/Makefile b/mcs/class/Facades/System.Runtime.InteropServices/Makefile
index dd20654dcd3..57253668eb1 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices/Makefile
+++ b/mcs/class/Facades/System.Runtime.InteropServices/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.InteropServices.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Runtime.Loader/Makefile b/mcs/class/Facades/System.Runtime.Loader/Makefile
index 46af65f9f1e..6a8f55e9304 100644
--- a/mcs/class/Facades/System.Runtime.Loader/Makefile
+++ b/mcs/class/Facades/System.Runtime.Loader/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.Loader.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /unsafe
diff --git a/mcs/class/Facades/System.Runtime.Numerics/Makefile b/mcs/class/Facades/System.Runtime.Numerics/Makefile
index 57867bb26a1..165769dd72a 100644
--- a/mcs/class/Facades/System.Runtime.Numerics/Makefile
+++ b/mcs/class/Facades/System.Runtime.Numerics/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.Numerics.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Numerics
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Formatters/Makefile b/mcs/class/Facades/System.Runtime.Serialization.Formatters/Makefile
index a8c237d1da4..e139de49ce4 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Formatters/Makefile
+++ b/mcs/class/Facades/System.Runtime.Serialization.Formatters/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.Serialization.Formatters.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Json/Makefile b/mcs/class/Facades/System.Runtime.Serialization.Json/Makefile
index b5ca5ce40b2..a0f4f29a48f 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Json/Makefile
+++ b/mcs/class/Facades/System.Runtime.Serialization.Json/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.Serialization.Json.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Runtime.Serialization
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Primitives/Makefile b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Makefile
index 3a2519549fc..6b245e862d2 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Primitives/Makefile
+++ b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.Serialization.Primitives.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Runtime.Serialization
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile b/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile
index 1314e94f39d..b1ac8e4fa89 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile
+++ b/mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.Serialization.Xml.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Runtime.Serialization System.Xml Facades/System.Runtime.Serialization.Primitives
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Runtime/Makefile b/mcs/class/Facades/System.Runtime/Makefile
index e8ab4049a26..4add1cf8a8c 100644
--- a/mcs/class/Facades/System.Runtime/Makefile
+++ b/mcs/class/Facades/System.Runtime/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Runtime.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.ComponentModel.Composition System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.AccessControl/Makefile b/mcs/class/Facades/System.Security.AccessControl/Makefile
index 5c6ad1c09ec..ee11a9e1b42 100644
--- a/mcs/class/Facades/System.Security.AccessControl/Makefile
+++ b/mcs/class/Facades/System.Security.AccessControl/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.AccessControl.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Claims/Makefile b/mcs/class/Facades/System.Security.Claims/Makefile
index 36ff76137ba..0878fb2b9e0 100644
--- a/mcs/class/Facades/System.Security.Claims/Makefile
+++ b/mcs/class/Facades/System.Security.Claims/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Claims.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Algorithms/Makefile b/mcs/class/Facades/System.Security.Cryptography.Algorithms/Makefile
index e65ee83c7ab..e7340a15c49 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Algorithms/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Algorithms/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Algorithms.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Cng/Makefile b/mcs/class/Facades/System.Security.Cryptography.Cng/Makefile
index 4912aa302c0..dbe16f2bc33 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Cng/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Cng/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Cng.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Csp/Makefile b/mcs/class/Facades/System.Security.Cryptography.Csp/Makefile
index 91d09321a61..b2de0bab841 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Csp/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Csp/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Csp.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Makefile b/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Makefile
index 4988d34843d..96f9c3f75d5 100644
--- a/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.DeriveBytes.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encoding/Makefile b/mcs/class/Facades/System.Security.Cryptography.Encoding/Makefile
index 71d37e200e0..48dbf670bb4 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encoding/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Encoding/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Encoding.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Makefile b/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Makefile
index 0598a53f1d4..b1aa2c7b69f 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Encryption.Aes.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Makefile b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Makefile
index 03e69f1f95a..5c9fb92bc34 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Encryption.ECDiffieHellman.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Makefile b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Makefile
index 08e99941082..dba6dbf2ead 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Encryption.ECDsa.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption/Makefile b/mcs/class/Facades/System.Security.Cryptography.Encryption/Makefile
index 0e8b1644280..9b390318385 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Encryption.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Makefile b/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Makefile
index 45dad5331da..3f93566e6ef 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Hashing.Algorithms.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Hashing/Makefile b/mcs/class/Facades/System.Security.Cryptography.Hashing/Makefile
index 9df5800609b..c93063093a5 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Hashing/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Hashing/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Hashing.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Makefile b/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Makefile
index dd0cdefc6f5..84f6c2d338b 100644
--- a/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.OpenSsl/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.OpenSsl.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Core Facades/System.Security.Cryptography.Algorithms
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Pkcs/Makefile b/mcs/class/Facades/System.Security.Cryptography.Pkcs/Makefile
index b98a24269be..4c2bd4ec1ac 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Pkcs/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Pkcs/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Pkcs.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Security
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.Primitives/Makefile b/mcs/class/Facades/System.Security.Cryptography.Primitives/Makefile
index b4c114a7e1c..ba7b52bb016 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Primitives/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.Primitives/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.Primitives.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Makefile b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Makefile
index 1cdbf1de8f3..9f883f43a82 100644
--- a/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.ProtectedData.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Security
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.RSA/Makefile b/mcs/class/Facades/System.Security.Cryptography.RSA/Makefile
index ea7df7a042a..53cd128022e 100644
--- a/mcs/class/Facades/System.Security.Cryptography.RSA/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.RSA/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.RSA.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Makefile b/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Makefile
index 2ffcdbc236f..6eb8586c9b4 100644
--- a/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.RandomNumberGenerator.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Makefile b/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Makefile
index 8b01e585ecb..f68880eb5d1 100644
--- a/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Makefile
+++ b/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Cryptography.X509Certificates.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Principal.Windows/Makefile b/mcs/class/Facades/System.Security.Principal.Windows/Makefile
index a287f05cb84..5532e363317 100644
--- a/mcs/class/Facades/System.Security.Principal.Windows/Makefile
+++ b/mcs/class/Facades/System.Security.Principal.Windows/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Principal.Windows.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Security.Principal/Makefile b/mcs/class/Facades/System.Security.Principal/Makefile
index 1a1265a0e05..63c51293e1b 100644
--- a/mcs/class/Facades/System.Security.Principal/Makefile
+++ b/mcs/class/Facades/System.Security.Principal/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.Principal.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Security.SecureString/Makefile b/mcs/class/Facades/System.Security.SecureString/Makefile
index 0569f621974..c195a70652a 100644
--- a/mcs/class/Facades/System.Security.SecureString/Makefile
+++ b/mcs/class/Facades/System.Security.SecureString/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Security.SecureString.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ServiceModel.Duplex/Makefile b/mcs/class/Facades/System.ServiceModel.Duplex/Makefile
index a8f568f78b5..1d0ba06cb32 100644
--- a/mcs/class/Facades/System.ServiceModel.Duplex/Makefile
+++ b/mcs/class/Facades/System.ServiceModel.Duplex/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ServiceModel.Duplex.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.ServiceModel
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ServiceModel.Http/Makefile b/mcs/class/Facades/System.ServiceModel.Http/Makefile
index 05f7925c2c6..260ea217d58 100644
--- a/mcs/class/Facades/System.ServiceModel.Http/Makefile
+++ b/mcs/class/Facades/System.ServiceModel.Http/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ServiceModel.Http.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.ServiceModel
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ServiceModel.NetTcp/Makefile b/mcs/class/Facades/System.ServiceModel.NetTcp/Makefile
index f0af8c7dc60..283865ebe99 100644
--- a/mcs/class/Facades/System.ServiceModel.NetTcp/Makefile
+++ b/mcs/class/Facades/System.ServiceModel.NetTcp/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ServiceModel.NetTcp.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.ServiceModel
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ServiceModel.Primitives/Makefile b/mcs/class/Facades/System.ServiceModel.Primitives/Makefile
index dde66a181cf..14d3275d717 100644
--- a/mcs/class/Facades/System.ServiceModel.Primitives/Makefile
+++ b/mcs/class/Facades/System.ServiceModel.Primitives/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ServiceModel.Primitives.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.ServiceModel System.Xml System.IdentityModel Facades/System.Security.Cryptography.X509Certificates
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ServiceModel.Security/Makefile b/mcs/class/Facades/System.ServiceModel.Security/Makefile
index f68beafd26e..15823300d31 100644
--- a/mcs/class/Facades/System.ServiceModel.Security/Makefile
+++ b/mcs/class/Facades/System.ServiceModel.Security/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ServiceModel.Security.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.ServiceModel
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ServiceProcess.ServiceController/Makefile b/mcs/class/Facades/System.ServiceProcess.ServiceController/Makefile
index fe6edb861f2..ecd265aa685 100644
--- a/mcs/class/Facades/System.ServiceProcess.ServiceController/Makefile
+++ b/mcs/class/Facades/System.ServiceProcess.ServiceController/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ServiceProcess.ServiceController.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
ifneq (2.1, $(FRAMEWORK_VERSION))
diff --git a/mcs/class/Facades/System.Text.Encoding.CodePages/Makefile b/mcs/class/Facades/System.Text.Encoding.CodePages/Makefile
index 3c678ee54f7..a6298e86969 100644
--- a/mcs/class/Facades/System.Text.Encoding.CodePages/Makefile
+++ b/mcs/class/Facades/System.Text.Encoding.CodePages/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Text.Encoding.CodePages.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Text.Encoding.Extensions/Makefile b/mcs/class/Facades/System.Text.Encoding.Extensions/Makefile
index e851968fdb4..bb30affbf51 100644
--- a/mcs/class/Facades/System.Text.Encoding.Extensions/Makefile
+++ b/mcs/class/Facades/System.Text.Encoding.Extensions/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Text.Encoding.Extensions.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Text.Encoding/Makefile b/mcs/class/Facades/System.Text.Encoding/Makefile
index fdfff718497..d25143a8dc5 100644
--- a/mcs/class/Facades/System.Text.Encoding/Makefile
+++ b/mcs/class/Facades/System.Text.Encoding/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Text.Encoding.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Text.RegularExpressions/Makefile b/mcs/class/Facades/System.Text.RegularExpressions/Makefile
index b345b0d5dcd..a02563fdaca 100644
--- a/mcs/class/Facades/System.Text.RegularExpressions/Makefile
+++ b/mcs/class/Facades/System.Text.RegularExpressions/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Text.RegularExpressions.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Threading.AccessControl/Makefile b/mcs/class/Facades/System.Threading.AccessControl/Makefile
index a5de66c9998..1339538dad0 100644
--- a/mcs/class/Facades/System.Threading.AccessControl/Makefile
+++ b/mcs/class/Facades/System.Threading.AccessControl/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Threading.AccessControl.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Threading.Overlapped/Makefile b/mcs/class/Facades/System.Threading.Overlapped/Makefile
index 44d534b1843..2d4a6318f07 100644
--- a/mcs/class/Facades/System.Threading.Overlapped/Makefile
+++ b/mcs/class/Facades/System.Threading.Overlapped/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Threading.Overlapped.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Threading.Tasks.Parallel/Makefile b/mcs/class/Facades/System.Threading.Tasks.Parallel/Makefile
index 7e350f61c2a..53d59c867f2 100644
--- a/mcs/class/Facades/System.Threading.Tasks.Parallel/Makefile
+++ b/mcs/class/Facades/System.Threading.Tasks.Parallel/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Threading.Tasks.Parallel.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/Facades/System.Threading.Tasks/Makefile b/mcs/class/Facades/System.Threading.Tasks/Makefile
index deea2c66a8a..953f111a804 100644
--- a/mcs/class/Facades/System.Threading.Tasks/Makefile
+++ b/mcs/class/Facades/System.Threading.Tasks/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Threading.Tasks.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Threading.Thread/Makefile b/mcs/class/Facades/System.Threading.Thread/Makefile
index cc0bb96aa06..da4f03883ff 100644
--- a/mcs/class/Facades/System.Threading.Thread/Makefile
+++ b/mcs/class/Facades/System.Threading.Thread/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Threading.Thread.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Threading.ThreadPool/Makefile b/mcs/class/Facades/System.Threading.ThreadPool/Makefile
index 604a88c87e7..97bcfb54cb4 100644
--- a/mcs/class/Facades/System.Threading.ThreadPool/Makefile
+++ b/mcs/class/Facades/System.Threading.ThreadPool/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Threading.ThreadPool.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Threading.Timer/Makefile b/mcs/class/Facades/System.Threading.Timer/Makefile
index 5ab3f840901..33e5fb3af3a 100644
--- a/mcs/class/Facades/System.Threading.Timer/Makefile
+++ b/mcs/class/Facades/System.Threading.Timer/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Threading.Timer.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Threading/Makefile b/mcs/class/Facades/System.Threading/Makefile
index b6b5c4cd67b..7fce19b89a6 100644
--- a/mcs/class/Facades/System.Threading/Makefile
+++ b/mcs/class/Facades/System.Threading/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Threading.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.ValueTuple/Makefile b/mcs/class/Facades/System.ValueTuple/Makefile
index b8c4fda3869..7fc177c6aaf 100644
--- a/mcs/class/Facades/System.ValueTuple/Makefile
+++ b/mcs/class/Facades/System.ValueTuple/Makefile
@@ -9,9 +9,9 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.ValueTuple.dll
-KEY_FILE = ../../Open.snk
-LIBRARY_SNK = $(KEY_FILE)
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../Open.snk
+LIBRARY_SNK = $(KEYFILE)
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS =
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Xml.ReaderWriter/Makefile b/mcs/class/Facades/System.Xml.ReaderWriter/Makefile
index 27f820f582e..1a55d74db4d 100644
--- a/mcs/class/Facades/System.Xml.ReaderWriter/Makefile
+++ b/mcs/class/Facades/System.Xml.ReaderWriter/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Xml.ReaderWriter.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Xml.XDocument/Makefile b/mcs/class/Facades/System.Xml.XDocument/Makefile
index 79eaaf44249..92c55d47cf7 100644
--- a/mcs/class/Facades/System.Xml.XDocument/Makefile
+++ b/mcs/class/Facades/System.Xml.XDocument/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Xml.XDocument.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Xml.Linq System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Xml.XPath.XDocument/Makefile b/mcs/class/Facades/System.Xml.XPath.XDocument/Makefile
index 36a3de971bd..90037087ee5 100644
--- a/mcs/class/Facades/System.Xml.XPath.XDocument/Makefile
+++ b/mcs/class/Facades/System.Xml.XPath.XDocument/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Xml.XPath.XDocument.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Xml System.Xml.Linq
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Xml.XPath.XmlDocument/Makefile b/mcs/class/Facades/System.Xml.XPath.XmlDocument/Makefile
index 38259e63b52..ec55218d410 100644
--- a/mcs/class/Facades/System.Xml.XPath.XmlDocument/Makefile
+++ b/mcs/class/Facades/System.Xml.XPath.XmlDocument/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Xml.XPath.XmlDocument.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Xml.XPath/Makefile b/mcs/class/Facades/System.Xml.XPath/Makefile
index 7a7ebf6de9d..201a9057c25 100644
--- a/mcs/class/Facades/System.Xml.XPath/Makefile
+++ b/mcs/class/Facades/System.Xml.XPath/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Xml.XPath.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Xml.XmlDocument/Makefile b/mcs/class/Facades/System.Xml.XmlDocument/Makefile
index 8628579f2f1..5322e9bf477 100644
--- a/mcs/class/Facades/System.Xml.XmlDocument/Makefile
+++ b/mcs/class/Facades/System.Xml.XmlDocument/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Xml.XmlDocument.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Xml.XmlSerializer/Makefile b/mcs/class/Facades/System.Xml.XmlSerializer/Makefile
index f8c09af8c35..2be46b395b9 100644
--- a/mcs/class/Facades/System.Xml.XmlSerializer/Makefile
+++ b/mcs/class/Facades/System.Xml.XmlSerializer/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Xml.XmlSerializer.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/System.Xml.Xsl.Primitives/Makefile b/mcs/class/Facades/System.Xml.Xsl.Primitives/Makefile
index abddd14886e..11d787512db 100644
--- a/mcs/class/Facades/System.Xml.Xsl.Primitives/Makefile
+++ b/mcs/class/Facades/System.Xml.Xsl.Primitives/Makefile
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Xml.Xsl.Primitives.dll
-KEY_FILE = ../../msfinal.pub
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
+KEYFILE = ../../msfinal.pub
+SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Facades/netstandard/Makefile b/mcs/class/Facades/netstandard/Makefile
index 1ea58dbfe7e..d664a0a1c00 100644
--- a/mcs/class/Facades/netstandard/Makefile
+++ b/mcs/class/Facades/netstandard/Makefile
@@ -9,9 +9,9 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = netstandard.dll
-KEY_FILE = ../../Open.snk
-LIBRARY_SNK = $(KEY_FILE)
-SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 /nowarn:618
+KEYFILE = ../../Open.snk
+LIBRARY_SNK = $(KEYFILE)
+SIGN_FLAGS = /delaysign /nowarn:1616,1699 /nowarn:618
LIB_REFS = System System.Xml System.Xml.Linq System.Runtime.Serialization System.Core System.Numerics System.Numerics.Vectors System.Net.Http System.Transactions \
System.IO.Compression System.Data System.ComponentModel.Composition System.IO.Compression.FileSystem Facades/System.Runtime.InteropServices.RuntimeInformation \
Facades/System.Security.Cryptography.Algorithms Facades/System.Globalization.Extensions Facades/System.Data.Common \
diff --git a/mcs/class/I18N/Assembly/AssemblyInfo.cs b/mcs/class/I18N/Assembly/AssemblyInfo.cs
index d27db9ad22c..0059c4d71ca 100644
--- a/mcs/class/I18N/Assembly/AssemblyInfo.cs
+++ b/mcs/class/I18N/Assembly/AssemblyInfo.cs
@@ -27,5 +27,4 @@ using System.Runtime.InteropServices;
*/
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../../mono.pub")]
diff --git a/mcs/class/I18N/CJK/Makefile b/mcs/class/I18N/CJK/Makefile
index e5b85c14f00..f4edf52eea3 100644
--- a/mcs/class/I18N/CJK/Makefile
+++ b/mcs/class/I18N/CJK/Makefile
@@ -4,6 +4,7 @@ include ../../../build/rules.make
LIBRARY = I18N.CJK.dll
LIB_REFS = I18N
+KEYFILE = ../../mono.pub
LOCAL_MCS_FLAGS = /unsafe /resource:big5.table /resource:gb2312.table /resource:jis.table /resource:ks.table /resource:gb18030.table /define:DISABLE_UNSAFE
TEST_LIB_REFS = I18N
diff --git a/mcs/class/I18N/Common/Makefile b/mcs/class/I18N/Common/Makefile
index b68973bdc26..232eff09a5b 100644
--- a/mcs/class/I18N/Common/Makefile
+++ b/mcs/class/I18N/Common/Makefile
@@ -3,6 +3,7 @@ SUBDIRS =
include ../../../build/rules.make
LIBRARY = I18N.dll
+KEYFILE = ../../mono.pub
LOCAL_MCS_FLAGS = /unsafe /define:DISABLE_UNSAFE
NO_TEST = yes
diff --git a/mcs/class/I18N/MidEast/Makefile b/mcs/class/I18N/MidEast/Makefile
index 1872c831e58..1fa7d0533d3 100644
--- a/mcs/class/I18N/MidEast/Makefile
+++ b/mcs/class/I18N/MidEast/Makefile
@@ -4,6 +4,7 @@ include ../../../build/rules.make
LIBRARY = I18N.MidEast.dll
LIB_REFS = I18N
+KEYFILE = ../../mono.pub
LOCAL_MCS_FLAGS = /unsafe
TEST_LIB_REFS = I18N
diff --git a/mcs/class/I18N/Other/Makefile b/mcs/class/I18N/Other/Makefile
index 47fac195ad9..3107ad6aa8a 100644
--- a/mcs/class/I18N/Other/Makefile
+++ b/mcs/class/I18N/Other/Makefile
@@ -4,6 +4,7 @@ include ../../../build/rules.make
LIBRARY = I18N.Other.dll
LIB_REFS = I18N
+KEYFILE = ../../mono.pub
LOCAL_MCS_FLAGS = /unsafe
NO_TEST = yes
diff --git a/mcs/class/I18N/Rare/Makefile b/mcs/class/I18N/Rare/Makefile
index f558e20e555..acbb6351c2b 100644
--- a/mcs/class/I18N/Rare/Makefile
+++ b/mcs/class/I18N/Rare/Makefile
@@ -4,6 +4,7 @@ include ../../../build/rules.make
LIBRARY = I18N.Rare.dll
LIB_REFS = I18N
+KEYFILE = ../../mono.pub
LOCAL_MCS_FLAGS = /unsafe
NO_TEST = yes
diff --git a/mcs/class/I18N/West/Makefile b/mcs/class/I18N/West/Makefile
index bc4b2386188..1a2e72ea219 100644
--- a/mcs/class/I18N/West/Makefile
+++ b/mcs/class/I18N/West/Makefile
@@ -4,6 +4,7 @@ include ../../../build/rules.make
LIBRARY = I18N.West.dll
LIB_REFS = I18N
+KEYFILE = ../../mono.pub
LOCAL_MCS_FLAGS = /unsafe
#NO_TEST = yes
diff --git a/mcs/class/IBM.Data.DB2/Assembly/AssemblyInfo.cs b/mcs/class/IBM.Data.DB2/Assembly/AssemblyInfo.cs
index 0f157445025..e2710ffa097 100644
--- a/mcs/class/IBM.Data.DB2/Assembly/AssemblyInfo.cs
+++ b/mcs/class/IBM.Data.DB2/Assembly/AssemblyInfo.cs
@@ -50,4 +50,3 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("ibm.pub")]
diff --git a/mcs/class/IBM.Data.DB2/Makefile b/mcs/class/IBM.Data.DB2/Makefile
index 630df027785..f95fea1fd71 100644
--- a/mcs/class/IBM.Data.DB2/Makefile
+++ b/mcs/class/IBM.Data.DB2/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = IBM.Data.DB2.dll
LIB_REFS = System System.Xml System.Data
+KEYFILE = ibm.pub
LIB_MCS_FLAGS = /unsafe -warn:1
NO_TEST = yes
diff --git a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs
index e61769c1e86..5de3a1a91f4 100644
--- a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs
+++ b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs
@@ -51,4 +51,3 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("4.84.0.0")]
[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("SharpZipLib.pub")]
diff --git a/mcs/class/ICSharpCode.SharpZipLib/Makefile b/mcs/class/ICSharpCode.SharpZipLib/Makefile
index bd64d2a4d66..c99cde5cbf9 100644
--- a/mcs/class/ICSharpCode.SharpZipLib/Makefile
+++ b/mcs/class/ICSharpCode.SharpZipLib/Makefile
@@ -6,6 +6,7 @@ LIBRARY = ICSharpCode.SharpZipLib.dll
LIBRARY_SNK = SharpZipLib.key
LIB_REFS = System System.Xml
+KEYFILE = SharpZipLib.pub
LIB_MCS_FLAGS = -warn:1
NO_TEST = yes
EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
diff --git a/mcs/class/Microsoft.Build.Engine/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Build.Engine/Assembly/AssemblyInfo.cs
index 52cbf310891..9cbd593124c 100644
--- a/mcs/class/Microsoft.Build.Engine/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.Build.Engine/Assembly/AssemblyInfo.cs
@@ -53,7 +53,6 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
diff --git a/mcs/class/Microsoft.Build.Engine/Makefile b/mcs/class/Microsoft.Build.Engine/Makefile
index 57beae86432..c8ce9a22816 100644
--- a/mcs/class/Microsoft.Build.Engine/Makefile
+++ b/mcs/class/Microsoft.Build.Engine/Makefile
@@ -8,6 +8,7 @@ include $(XBUILD_DIR)/xbuild.make
LIBRARY = Microsoft.Build.Engine.dll
LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml $(XBUILD_FRAMEWORK) $(XBUILD_UTILITIES)
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS =
diff --git a/mcs/class/Microsoft.Build.Framework/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Build.Framework/Assembly/AssemblyInfo.cs
index 2110fd06684..24ee297d3cd 100644
--- a/mcs/class/Microsoft.Build.Framework/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.Build.Framework/Assembly/AssemblyInfo.cs
@@ -54,7 +54,6 @@ using System.Runtime.InteropServices;
[assembly: Guid ("D8A9BA71-4724-481d-9CA7-0DA23A1D615C")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
diff --git a/mcs/class/Microsoft.Build.Framework/Makefile b/mcs/class/Microsoft.Build.Framework/Makefile
index edd7cc2e8eb..d1b0cd09382 100644
--- a/mcs/class/Microsoft.Build.Framework/Makefile
+++ b/mcs/class/Microsoft.Build.Framework/Makefile
@@ -8,6 +8,7 @@ include $(XBUILD_DIR)/xbuild.make
LIBRARY = Microsoft.Build.Framework.dll
LIB_REFS = $(PARENT_PROFILE)System
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
TEST_NUNITLITE_APP_CONFIG_RUNTIME=Test/test-config-file-$(PROFILE)
diff --git a/mcs/class/Microsoft.Build.Tasks/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Build.Tasks/Assembly/AssemblyInfo.cs
index 172f71e95b9..8e7c07d0e17 100644
--- a/mcs/class/Microsoft.Build.Tasks/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Assembly/AssemblyInfo.cs
@@ -54,6 +54,5 @@ using System.Runtime.InteropServices;
[assembly: Guid ("E3D4D3B9-944C-407b-A82E-B19719EA7FB3")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
diff --git a/mcs/class/Microsoft.Build.Tasks/Makefile b/mcs/class/Microsoft.Build.Tasks/Makefile
index a919129b083..b926ba9ff31 100644
--- a/mcs/class/Microsoft.Build.Tasks/Makefile
+++ b/mcs/class/Microsoft.Build.Tasks/Makefile
@@ -11,6 +11,7 @@ LIBRARY_NAME = Microsoft.Build.Tasks$(NAME_SUFFIX).dll
LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml $(PARENT_PROFILE)System.Windows.Forms \
$(XBUILD_UTILITIES) $(XBUILD_FRAMEWORK) $(XBUILD_ENGINE) $(XBUILD_TASKS)
+KEYFILE = ../msfinal.pub
TEST_MCS_FLAGS =
TEST_LIB_REFS = $(PARENT_PROFILE)System.Xml $(XBUILD_ENGINE) $(XBUILD_FRAMEWORK) $(XBUILD_TASKS) $(XBUILD_UTILITIES) $(PARENT_PROFILE)System.Core
diff --git a/mcs/class/Microsoft.Build.Utilities/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Build.Utilities/Assembly/AssemblyInfo.cs
index 5fb93ebdece..2e9b394f1cc 100644
--- a/mcs/class/Microsoft.Build.Utilities/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Assembly/AssemblyInfo.cs
@@ -54,7 +54,6 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
diff --git a/mcs/class/Microsoft.Build.Utilities/Makefile b/mcs/class/Microsoft.Build.Utilities/Makefile
index 2c644346e2c..0a3f0d2ed47 100644
--- a/mcs/class/Microsoft.Build.Utilities/Makefile
+++ b/mcs/class/Microsoft.Build.Utilities/Makefile
@@ -9,6 +9,7 @@ LIBRARY = Microsoft.Build.Utilities.dll
LIBRARY_NAME = Microsoft.Build.Utilities$(NAME_SUFFIX).dll
LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml $(XBUILD_FRAMEWORK)
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
TEST_RESX_RESOURCES = Test/Microsoft.Build.Utilities/Strings.resources
diff --git a/mcs/class/Microsoft.Build/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Build/Assembly/AssemblyInfo.cs
index e14ad00346b..8880058c371 100644
--- a/mcs/class/Microsoft.Build/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.Build/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.Versioning;
[assembly: ComVisible (false)]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/Microsoft.Build/Makefile b/mcs/class/Microsoft.Build/Makefile
index 47e9cf9ad41..2dcbefdf7f9 100644
--- a/mcs/class/Microsoft.Build/Makefile
+++ b/mcs/class/Microsoft.Build/Makefile
@@ -8,6 +8,7 @@ include $(XBUILD_DIR)/xbuild.make
LIBRARY = Microsoft.Build.dll
LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml Microsoft.Build.Engine Microsoft.Build.Framework
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = \
/d:MICROSOFT_BUILD_DLL
diff --git a/mcs/class/Microsoft.CSharp/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.CSharp/Assembly/AssemblyInfo.cs
index 6c7a223682f..f3bf440699d 100644
--- a/mcs/class/Microsoft.CSharp/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.CSharp/Assembly/AssemblyInfo.cs
@@ -53,7 +53,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: SecurityCritical]
diff --git a/mcs/class/Microsoft.CSharp/Makefile b/mcs/class/Microsoft.CSharp/Makefile
index e22eae3e178..cb754267a9d 100644
--- a/mcs/class/Microsoft.CSharp/Makefile
+++ b/mcs/class/Microsoft.CSharp/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = Microsoft.CSharp.dll
LIB_REFS = System.Core System
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
RESX_RESOURCE_STRING = ../../../external/corefx/src/Microsoft.CSharp/src/Resources/Strings.resx
diff --git a/mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs
index e95d06e151d..c6b2a0b65db 100644
--- a/mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs
@@ -48,5 +48,3 @@ using System.Resources;
*/
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
-
diff --git a/mcs/class/Microsoft.VisualC/Makefile b/mcs/class/Microsoft.VisualC/Makefile
index 5d38210947f..26661e4955a 100644
--- a/mcs/class/Microsoft.VisualC/Makefile
+++ b/mcs/class/Microsoft.VisualC/Makefile
@@ -4,7 +4,8 @@ include ../../build/rules.make
LIBRARY = Microsoft.VisualC.dll
LIB_REFS = System
-LIB_MCS_FLAGS =
+KEYFILE = ../msfinal.pub
+
NO_TEST = yes
include ../../build/library.make
diff --git a/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs
index 4b6ac0cc472..c2731485dde 100644
--- a/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.Web.Infrastructure/Assembly/AssemblyInfo.cs
@@ -48,4 +48,3 @@ using System.Security;
[assembly: AssemblyTitle ("Microsoft.Web.Infrastructure")]
[assembly: AssemblyDescription ("")]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../winfx.pub")]
diff --git a/mcs/class/Microsoft.Web.Infrastructure/Makefile b/mcs/class/Microsoft.Web.Infrastructure/Makefile
index d02caf9c02f..edf1ff0755a 100644
--- a/mcs/class/Microsoft.Web.Infrastructure/Makefile
+++ b/mcs/class/Microsoft.Web.Infrastructure/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = Microsoft.Web.Infrastructure.dll
LIB_REFS = System System.Configuration System.Web
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS =
EXTRA_DISTFILES = $(RESOURCE_FILES)
diff --git a/mcs/class/Mono.C5/C5/AssemblyInfo.cs b/mcs/class/Mono.C5/C5/AssemblyInfo.cs
index b9e028c4332..0ee82c0a990 100644
--- a/mcs/class/Mono.C5/C5/AssemblyInfo.cs
+++ b/mcs/class/Mono.C5/C5/AssemblyInfo.cs
@@ -76,6 +76,4 @@ using System;
// documentation for more information on this.
//
[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("c5.pub")]
-
[assembly: CLSCompliant(true)]
diff --git a/mcs/class/Mono.C5/Makefile b/mcs/class/Mono.C5/Makefile
index c5f80e37114..7be812689ec 100644
--- a/mcs/class/Mono.C5/Makefile
+++ b/mcs/class/Mono.C5/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = Mono.C5.dll
LIBRARY_SNK = c5.snk
LIB_REFS = System
+KEYFILE = c5.pub
LIB_MCS_FLAGS = -nowarn:169,219,414,1030,3001,3005,3006
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
diff --git a/mcs/class/Mono.CSharp/Assembly/AssemblyInfo.cs b/mcs/class/Mono.CSharp/Assembly/AssemblyInfo.cs
index 541e803c2ac..5e4912d0152 100644
--- a/mcs/class/Mono.CSharp/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.CSharp/Assembly/AssemblyInfo.cs
@@ -53,7 +53,6 @@ using System.Runtime.InteropServices;
//[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
[assembly: ComVisible (false)]
diff --git a/mcs/class/Mono.CSharp/Makefile b/mcs/class/Mono.CSharp/Makefile
index 75c6a530943..7b1986b78e5 100644
--- a/mcs/class/Mono.CSharp/Makefile
+++ b/mcs/class/Mono.CSharp/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = Mono.CSharp.dll
LIB_REFS = System.Core System.Xml System
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS =
ifdef AOT_FRIENDLY_PROFILE
diff --git a/mcs/class/Mono.Cairo/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Cairo/Assembly/AssemblyInfo.cs
index d28fb41bb80..2a29b82315d 100644
--- a/mcs/class/Mono.Cairo/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Cairo/Assembly/AssemblyInfo.cs
@@ -48,5 +48,4 @@ using System.Runtime.InteropServices;
*/
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/Mono.Cairo/Makefile b/mcs/class/Mono.Cairo/Makefile
index dda9fe920e3..eaad983d6f0 100644
--- a/mcs/class/Mono.Cairo/Makefile
+++ b/mcs/class/Mono.Cairo/Makefile
@@ -3,6 +3,7 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = Mono.Cairo.dll
+KEYFILE = ../mono.pub
#LIB_MCS_FLAGS = -d:CAIRO_1_2
NO_TEST = yes
diff --git a/mcs/class/Mono.CodeContracts/Assembly/AssemblyInfo.cs b/mcs/class/Mono.CodeContracts/Assembly/AssemblyInfo.cs
index 91b1067b15a..932a54ba64a 100644
--- a/mcs/class/Mono.CodeContracts/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.CodeContracts/Assembly/AssemblyInfo.cs
@@ -53,4 +53,3 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/Mono.CodeContracts/Makefile b/mcs/class/Mono.CodeContracts/Makefile
index af71c42f65c..5c2a816ba1e 100644
--- a/mcs/class/Mono.CodeContracts/Makefile
+++ b/mcs/class/Mono.CodeContracts/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = Mono.CodeContracts.dll
LIB_REFS = System System.Core Mono.Cecil Mono.Cecil.Mdb
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = -nowarn:618
TEST_MCS_FLAGS =
diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Assembly/AssemblyInfo.cs b/mcs/class/Mono.CompilerServices.SymbolWriter/Assembly/AssemblyInfo.cs
index 87b442c59bd..86d979b29e7 100644
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Assembly/AssemblyInfo.cs
@@ -48,5 +48,4 @@ using System.Runtime.InteropServices;
*/
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile b/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile
index d30779ce7f1..0c116da9d19 100644
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = Mono.CompilerServices.SymbolWriter.dll
LIB_REFS = System
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS =
NO_TEST = yes
diff --git a/mcs/class/Mono.Data.Sqlite/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Data.Sqlite/Assembly/AssemblyInfo.cs
index a1c13b6fbd9..30f1b233209 100644
--- a/mcs/class/Mono.Data.Sqlite/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Data.Sqlite/Assembly/AssemblyInfo.cs
@@ -57,4 +57,3 @@ using System.Runtime.ConstrainedExecution;
#endif
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/Mono.Data.Sqlite/Makefile b/mcs/class/Mono.Data.Sqlite/Makefile
index 35eb5c1bb81..bde698a46ee 100644
--- a/mcs/class/Mono.Data.Sqlite/Makefile
+++ b/mcs/class/Mono.Data.Sqlite/Makefile
@@ -11,6 +11,7 @@ PREBUILT = $(RESX_RESOURCES:=.prebuilt)
LIBRARY = Mono.Data.Sqlite.dll
LIB_REFS = System System.Data System.Transactions System.Xml
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = /unsafe \
$(RESOURCES:%=-resource:%) -d:SQLITE_STANDARD
diff --git a/mcs/class/Mono.Data.Tds/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Data.Tds/Assembly/AssemblyInfo.cs
index e06154cd236..0059c4d71ca 100644
--- a/mcs/class/Mono.Data.Tds/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Data.Tds/Assembly/AssemblyInfo.cs
@@ -27,5 +27,4 @@ using System.Runtime.InteropServices;
*/
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/Mono.Data.Tds/Makefile b/mcs/class/Mono.Data.Tds/Makefile
index f1764c2282b..6a265b8dd96 100644
--- a/mcs/class/Mono.Data.Tds/Makefile
+++ b/mcs/class/Mono.Data.Tds/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = Mono.Data.Tds.dll
LIB_REFS = System System.Xml Mono.Security
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS =
diff --git a/mcs/class/Mono.Debugger.Soft/Makefile b/mcs/class/Mono.Debugger.Soft/Makefile
index e2fa98dcebe..5e926275772 100644
--- a/mcs/class/Mono.Debugger.Soft/Makefile
+++ b/mcs/class/Mono.Debugger.Soft/Makefile
@@ -5,7 +5,8 @@ LIBRARY = Mono.Debugger.Soft.dll
LIBRARY_SNK = ../mono.snk
LIB_REFS = System Mono.Cecil System.Core
-LIB_MCS_FLAGS = /unsafe -D:MONO_DATACONVERTER_STATIC_METHODS -keyfile:$(LIBRARY_SNK) /publicsign
+LIB_MCS_FLAGS = /unsafe -D:MONO_DATACONVERTER_STATIC_METHODS /publicsign
+KEYFILE = $(LIBRARY_SNK)
TEST_MCS_FLAGS =
TEST_LIB_REFS = Mono.Cecil System System.Core
diff --git a/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs
index f4c03dc360c..96c277d1e61 100644
--- a/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Http/Assembly/AssemblyInfo.cs
@@ -41,4 +41,3 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCopyright("(c) 2003 Various Authors")]
[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("../mono.pub")]
diff --git a/mcs/class/Mono.Http/Makefile b/mcs/class/Mono.Http/Makefile
index f3801411afa..dd0047afa2a 100644
--- a/mcs/class/Mono.Http/Makefile
+++ b/mcs/class/Mono.Http/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = Mono.Http.dll
LIB_REFS = System System.Xml System.Web ICSharpCode.SharpZipLib Mono.Security
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = -nowarn:618
NO_TEST = yes
diff --git a/mcs/class/Mono.Management/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Management/Assembly/AssemblyInfo.cs
index 87b442c59bd..86d979b29e7 100644
--- a/mcs/class/Mono.Management/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Management/Assembly/AssemblyInfo.cs
@@ -48,5 +48,4 @@ using System.Runtime.InteropServices;
*/
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/Mono.Management/Makefile b/mcs/class/Mono.Management/Makefile
index 5b7c92c5e4d..4aba679060d 100644
--- a/mcs/class/Mono.Management/Makefile
+++ b/mcs/class/Mono.Management/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = Mono.Management.dll
LIB_REFS = System Mono.Posix
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS =
NO_TEST = yes
diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Messaging.RabbitMQ/Assembly/AssemblyInfo.cs
index f167ef96de7..0ac9e258846 100644
--- a/mcs/class/Mono.Messaging.RabbitMQ/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Messaging.RabbitMQ/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (false)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../mono.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Makefile b/mcs/class/Mono.Messaging.RabbitMQ/Makefile
index 67f382812d8..9a3b3007f13 100644
--- a/mcs/class/Mono.Messaging.RabbitMQ/Makefile
+++ b/mcs/class/Mono.Messaging.RabbitMQ/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = Mono.Messaging.RabbitMQ.dll
LIB_REFS = System System.Messaging Mono.Messaging RabbitMQ.Client
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = -nowarn:618
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
diff --git a/mcs/class/Mono.Messaging/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Messaging/Assembly/AssemblyInfo.cs
index 0f202bfc011..4e27c0ab234 100644
--- a/mcs/class/Mono.Messaging/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Messaging/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../mono.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/Mono.Messaging/Makefile b/mcs/class/Mono.Messaging/Makefile
index 7788dfb60c8..7eef3a9aa2a 100644
--- a/mcs/class/Mono.Messaging/Makefile
+++ b/mcs/class/Mono.Messaging/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = Mono.Messaging.dll
LIB_REFS = System System.Configuration
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
diff --git a/mcs/class/Mono.Options/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Options/Assembly/AssemblyInfo.cs
index fa9c43f3772..16cf07ae5d6 100644
--- a/mcs/class/Mono.Options/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Options/Assembly/AssemblyInfo.cs
@@ -48,5 +48,4 @@ using System.Security.Permissions;
)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/Mono.Options/Makefile b/mcs/class/Mono.Options/Makefile
index af1350df5b0..cf83d944572 100644
--- a/mcs/class/Mono.Options/Makefile
+++ b/mcs/class/Mono.Options/Makefile
@@ -8,6 +8,7 @@ LIBRARY_PACKAGE = none
NO_INSTALL = yes
LIB_REFS = System
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS =
TEST_LIB_REFS = Mono.Posix System System.Core
diff --git a/mcs/class/Mono.Parallel/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Parallel/Assembly/AssemblyInfo.cs
index 83267087b61..c67214a8346 100644
--- a/mcs/class/Mono.Parallel/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Parallel/Assembly/AssemblyInfo.cs
@@ -15,4 +15,3 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/Mono.Parallel/Makefile b/mcs/class/Mono.Parallel/Makefile
index 75b5aff640b..9a97ff305e5 100644
--- a/mcs/class/Mono.Parallel/Makefile
+++ b/mcs/class/Mono.Parallel/Makefile
@@ -2,12 +2,13 @@ thisdir = class/Mono.Parallel
SUBDIRS =
include ../../build/rules.make
+LIB_REFS = System.Core System
+LIB_MCS_FLAGS = -d:INSIDE_MONO_PARALLEL
+KEYFILE = ../mono.pub
+
LIBRARY = Mono.Parallel.dll
include ../../build/library.make
TEST_MCS_FLAGS =
TEST_LIB_REFS = System.Core
-
-LIB_REFS += System.Core System
-LIB_MCS_FLAGS += -d:INSIDE_MONO_PARALLEL
diff --git a/mcs/class/Mono.Posix/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Posix/Assembly/AssemblyInfo.cs
index ce6b749678d..d5e0ea66d78 100644
--- a/mcs/class/Mono.Posix/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Posix/Assembly/AssemblyInfo.cs
@@ -58,7 +58,6 @@ using System.Security.Permissions;
#if !MONO_POSIX_NETSTANDARD_BUILD
// We are using ../Open.snk for MONO_POSIX_NETSTANDARD_BUILD
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
#endif
/*
* TODO:
diff --git a/mcs/class/Mono.Posix/Makefile b/mcs/class/Mono.Posix/Makefile
index 10d14fc45ed..15b9c0cf2db 100644
--- a/mcs/class/Mono.Posix/Makefile
+++ b/mcs/class/Mono.Posix/Makefile
@@ -6,6 +6,7 @@ LIBRARY = Mono.Posix.dll
# Don't warn about [Obsolete] members, as there are now *lots* of [Obsolete]
# members, generating volumes of output.
LIB_REFS = System
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = /unsafe /nowarn:0618,612
TEST_MCS_FLAGS = /unsafe /nowarn:0219,0618
TEST_LIB_REFS = Mono.Posix System
diff --git a/mcs/class/Mono.Profiler.Log/Makefile b/mcs/class/Mono.Profiler.Log/Makefile
index 1f860ab0eb4..282c92d7665 100644
--- a/mcs/class/Mono.Profiler.Log/Makefile
+++ b/mcs/class/Mono.Profiler.Log/Makefile
@@ -5,7 +5,8 @@ LIBRARY = Mono.Profiler.Log.dll
LIBRARY_SNK = ../mono.snk
LIB_REFS = System System.Core
-LIB_MCS_FLAGS = /unsafe /keyfile:$(LIBRARY_SNK) /publicsign
+KEYFILE = $(LIBRARY_SNK)
+LIB_MCS_FLAGS = /unsafe /publicsign
NO_TEST = yes
diff --git a/mcs/class/Mono.Reactive.Testing/Makefile b/mcs/class/Mono.Reactive.Testing/Makefile
index aa931ee9db7..25038b344bf 100644
--- a/mcs/class/Mono.Reactive.Testing/Makefile
+++ b/mcs/class/Mono.Reactive.Testing/Makefile
@@ -5,7 +5,6 @@ include ../../build/rules.make
LIBRARY = Mono.Reactive.Testing.dll
LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq System.Reactive.PlatformServices System.Reactive.Providers System.Reactive.Runtime.Remoting System.Reactive.Experimental System.Reactive.Windows.Forms System.Reactive.Windows.Threading System.Reactive.Observable.Aliases System.Windows.Forms WindowsBase nunitlite
LIB_MCS_FLAGS = \
- @more_build_args \
-d:NUNIT -d:MONO -d:DESKTOPCLR
# NO_PERF is required to disable ObservableMultipleTest.Catch_TailRecursive2 which blocked test execution.
# disabled -d:HAS_WINFORMS
@@ -21,7 +20,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618
-EXTRA_DISTFILES = more_build_args
+EXTRA_DISTFILES =
VALID_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef VALID_PROFILE
diff --git a/mcs/class/Mono.Reactive.Testing/more_build_args b/mcs/class/Mono.Reactive.Testing/more_build_args
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/mcs/class/Mono.Reactive.Testing/more_build_args
+++ /dev/null
diff --git a/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs
index 3e9e4909674..ef215933c13 100644
--- a/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Security.Win32/Assembly/AssemblyInfo.cs
@@ -32,4 +32,3 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/Mono.Security.Win32/Makefile b/mcs/class/Mono.Security.Win32/Makefile
index 0797ae27094..3d44f96a571 100644
--- a/mcs/class/Mono.Security.Win32/Makefile
+++ b/mcs/class/Mono.Security.Win32/Makefile
@@ -3,6 +3,7 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = Mono.Security.Win32.dll
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = /unsafe
EXTRA_DISTFILES = README
diff --git a/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs
index 0140af6ace8..e9c4f87a6f5 100644
--- a/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Security/Assembly/AssemblyInfo.cs
@@ -52,7 +52,6 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
[assembly: InternalsVisibleTo ("System, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull2)]
diff --git a/mcs/class/Mono.Security/Makefile b/mcs/class/Mono.Security/Makefile
index 6d62eca583d..abe9fe6ac42 100644
--- a/mcs/class/Mono.Security/Makefile
+++ b/mcs/class/Mono.Security/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = Mono.Security.dll
LOCAL_MCS_FLAGS =
LIB_REFS = bare/System
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = -unsafe -nowarn:1030,3009
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:169,219,618,672
diff --git a/mcs/class/Mono.ServiceModel.IdentitySelectors/Assembly/AssemblyInfo.cs b/mcs/class/Mono.ServiceModel.IdentitySelectors/Assembly/AssemblyInfo.cs
index a1531139e48..62b76bfd697 100644
--- a/mcs/class/Mono.ServiceModel.IdentitySelectors/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.ServiceModel.IdentitySelectors/Assembly/AssemblyInfo.cs
@@ -56,4 +56,3 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../mono.pub")]
diff --git a/mcs/class/Mono.ServiceModel.IdentitySelectors/Makefile b/mcs/class/Mono.ServiceModel.IdentitySelectors/Makefile
index 42f1432b07b..a0d7a20f575 100644
--- a/mcs/class/Mono.ServiceModel.IdentitySelectors/Makefile
+++ b/mcs/class/Mono.ServiceModel.IdentitySelectors/Makefile
@@ -7,6 +7,7 @@ RESOURCE_FILES = \
LIBRARY = Mono.ServiceModel.IdentitySelectors.dll
LIB_REFS = System System.Xml System.Configuration System.Security System.Transactions System.Web System.Web.Services Mono.Security
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = \
/nowarn:414,169,67,3005,436 \
/unsafe \
diff --git a/mcs/class/Mono.Simd/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Simd/Assembly/AssemblyInfo.cs
index 895aa8c707c..42591688b83 100644
--- a/mcs/class/Mono.Simd/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Simd/Assembly/AssemblyInfo.cs
@@ -45,5 +45,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("../mono.pub")]
[assembly: CLSCompliant(true)]
diff --git a/mcs/class/Mono.Simd/Makefile b/mcs/class/Mono.Simd/Makefile
index d8e1e474141..8fda9237ff5 100644
--- a/mcs/class/Mono.Simd/Makefile
+++ b/mcs/class/Mono.Simd/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = Mono.Simd.dll
LIB_REFS = System.Core
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = /unsafe
NO_TEST = yes
diff --git a/mcs/class/Mono.Tasklets/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Tasklets/Assembly/AssemblyInfo.cs
index a461e90522f..6f95a487515 100644
--- a/mcs/class/Mono.Tasklets/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Tasklets/Assembly/AssemblyInfo.cs
@@ -27,4 +27,3 @@ using System.Runtime.InteropServices;
*/
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/Mono.Tasklets/Makefile b/mcs/class/Mono.Tasklets/Makefile
index 19a6cc1ceed..d9940e6ded8 100644
--- a/mcs/class/Mono.Tasklets/Makefile
+++ b/mcs/class/Mono.Tasklets/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = Mono.Tasklets.dll
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
diff --git a/mcs/class/Mono.WebBrowser/Assembly/AssemblyInfo.cs b/mcs/class/Mono.WebBrowser/Assembly/AssemblyInfo.cs
index fda8f30a493..f005b9d0076 100644
--- a/mcs/class/Mono.WebBrowser/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.WebBrowser/Assembly/AssemblyInfo.cs
@@ -15,4 +15,3 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("../mono.snk")]
diff --git a/mcs/class/Mono.WebBrowser/Makefile b/mcs/class/Mono.WebBrowser/Makefile
index d632681cdb0..65b6d44df17 100644
--- a/mcs/class/Mono.WebBrowser/Makefile
+++ b/mcs/class/Mono.WebBrowser/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = Mono.WebBrowser.dll
LIB_REFS = System
+KEYFILE = ../mono.snk
LIB_MCS_FLAGS = -warn:1
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
diff --git a/mcs/class/Mono.XBuild.Tasks/Assembly/AssemblyInfo.cs b/mcs/class/Mono.XBuild.Tasks/Assembly/AssemblyInfo.cs
index 3effdb25f8a..aa4123b46ad 100644
--- a/mcs/class/Mono.XBuild.Tasks/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.XBuild.Tasks/Assembly/AssemblyInfo.cs
@@ -48,6 +48,5 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../mono.pub")]
[assembly: AssemblyFileVersion (XBuildConsts.FileVersion)]
diff --git a/mcs/class/Mono.XBuild.Tasks/Makefile b/mcs/class/Mono.XBuild.Tasks/Makefile
index 11f7b791c43..476b57f1982 100644
--- a/mcs/class/Mono.XBuild.Tasks/Makefile
+++ b/mcs/class/Mono.XBuild.Tasks/Makefile
@@ -8,6 +8,7 @@ include $(XBUILD_DIR)/xbuild.make
LIBRARY = Mono.XBuild.Tasks.dll
LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Xml
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS =
TEST_NUNITLITE_APP_CONFIG_RUNTIME=Test/test-config-file-$(PROFILE)
diff --git a/mcs/class/Mono.Xml.Ext/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Xml.Ext/Assembly/AssemblyInfo.cs
index 30ef7fd99f7..0644fe75c26 100644
--- a/mcs/class/Mono.Xml.Ext/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Mono.Xml.Ext/Assembly/AssemblyInfo.cs
@@ -56,4 +56,3 @@ using System.Runtime.InteropServices;
[assembly: AllowPartiallyTrustedCallers]
[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("../ecma.pub")]
diff --git a/mcs/class/Mono.Xml.Ext/Makefile b/mcs/class/Mono.Xml.Ext/Makefile
index e7ac06790fb..dc49f816fee 100644
--- a/mcs/class/Mono.Xml.Ext/Makefile
+++ b/mcs/class/Mono.Xml.Ext/Makefile
@@ -11,6 +11,7 @@ SCARY_LIB=/lib:$(prefix)/lib
endif
LIB_REFS = System System.Xml
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = $(SCARY_LIB) /unsafe
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
diff --git a/mcs/class/Novell.Directory.Ldap/Makefile b/mcs/class/Novell.Directory.Ldap/Makefile
index 4f24b424a7f..e7ffb40774e 100644
--- a/mcs/class/Novell.Directory.Ldap/Makefile
+++ b/mcs/class/Novell.Directory.Ldap/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = Novell.Directory.Ldap.dll
LIB_REFS = System Mono.Security
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = -warn:1 -nowarn:612
RESOURCE_DEFS = ResultCodeMessages,Novell.Directory.Ldap.Utilclass/ResultCodeMessages.txt
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs
index cba8084028d..a524d953f33 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs
@@ -64,5 +64,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/PEAPI/Assembly/AssemblyInfo.cs b/mcs/class/PEAPI/Assembly/AssemblyInfo.cs
index a461e90522f..6f95a487515 100644
--- a/mcs/class/PEAPI/Assembly/AssemblyInfo.cs
+++ b/mcs/class/PEAPI/Assembly/AssemblyInfo.cs
@@ -27,4 +27,3 @@ using System.Runtime.InteropServices;
*/
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/PEAPI/Makefile b/mcs/class/PEAPI/Makefile
index f303415ba6d..1a1c4cd83e6 100644
--- a/mcs/class/PEAPI/Makefile
+++ b/mcs/class/PEAPI/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = PEAPI.dll
LIB_REFS = System
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS = -nowarn:414,618
NO_TEST = yes
diff --git a/mcs/class/RabbitMQ.Client/src/client/AssemblyInfo.cs b/mcs/class/RabbitMQ.Client/src/client/AssemblyInfo.cs
index e575e78b1fa..645cb4ae8f4 100644
--- a/mcs/class/RabbitMQ.Client/src/client/AssemblyInfo.cs
+++ b/mcs/class/RabbitMQ.Client/src/client/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
//[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../../../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/RabbitMQ.Client/src/client/Makefile b/mcs/class/RabbitMQ.Client/src/client/Makefile
index be9e284a176..82873f0983e 100644
--- a/mcs/class/RabbitMQ.Client/src/client/Makefile
+++ b/mcs/class/RabbitMQ.Client/src/client/Makefile
@@ -4,6 +4,7 @@ include ../../../../build/rules.make
LIBRARY = RabbitMQ.Client.dll
LIB_REFS = System System.Xml
+KEYFILE = ../../../msfinal.pub
LIB_MCS_FLAGS = -nowarn:618
NO_TEST = yes
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/Makefile b/mcs/class/System.ComponentModel.Composition.4.5/Makefile
index b5c914f72b1..2ced9882dae 100644
--- a/mcs/class/System.ComponentModel.Composition.4.5/Makefile
+++ b/mcs/class/System.ComponentModel.Composition.4.5/Makefile
@@ -10,6 +10,7 @@ ifndef NO_RESGEN
RESOURCE_DEFS = Microsoft.Internal.Strings,src/ComponentModel/Strings.resx
endif
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = -d:CLR40 -d:USE_ECMA_KEY,FEATURE_REFLECTIONCONTEXT,FEATURE_REFLECTIONFILEIO,FEATURE_SERIALIZATION,FEATURE_SLIMLOCK -nowarn:219,414 -nowarn:436
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs b/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs
index a1cceccbcd3..85e91c4f565 100644
--- a/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs
@@ -53,7 +53,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
[assembly: SecurityCritical]
[assembly: AllowPartiallyTrustedCallers]
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Assembly/AssemblyInfo.cs b/mcs/class/System.ComponentModel.DataAnnotations/Assembly/AssemblyInfo.cs
index 38ca8af332c..b2d658bf3a4 100644
--- a/mcs/class/System.ComponentModel.DataAnnotations/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
[assembly: ComVisible (false)]
[assembly: AllowPartiallyTrustedCallers]
diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Makefile b/mcs/class/System.ComponentModel.DataAnnotations/Makefile
index dacf6d719f7..53519907a9c 100644
--- a/mcs/class/System.ComponentModel.DataAnnotations/Makefile
+++ b/mcs/class/System.ComponentModel.DataAnnotations/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.ComponentModel.DataAnnotations.dll
LIB_REFS = System System.Core System.Data System.Xml
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS = -nowarn:414
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
diff --git a/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs b/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs
index c0b4d2807f1..cc8817f8c11 100644
--- a/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs
@@ -56,7 +56,6 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
diff --git a/mcs/class/System.Configuration.Install/Makefile b/mcs/class/System.Configuration.Install/Makefile
index cc8b4f8e95c..612aa9cb9b2 100644
--- a/mcs/class/System.Configuration.Install/Makefile
+++ b/mcs/class/System.Configuration.Install/Makefile
@@ -3,6 +3,7 @@ include ../../build/rules.make
LIBRARY = System.Configuration.Install.dll
LIB_REFS = System System.Xml
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
NO_TEST = yes
diff --git a/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs b/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs
index 49025b78c09..a850786fa21 100644
--- a/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs
@@ -57,7 +57,6 @@ using System.Runtime.InteropServices;
[assembly: AllowPartiallyTrustedCallers]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: InternalsVisibleTo ("System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
diff --git a/mcs/class/System.Configuration/Makefile b/mcs/class/System.Configuration/Makefile
index e6f48050a99..918a4e9325e 100644
--- a/mcs/class/System.Configuration/Makefile
+++ b/mcs/class/System.Configuration/Makefile
@@ -7,6 +7,7 @@ LIBRARY = System.Configuration.dll
LOCAL_MCS_FLAGS =
LIB_REFS = secxml/System bare/System.Xml System.Security
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = -nowarn:618
TEST_MCS_FLAGS =
TEST_LIB_REFS = System.Xml System
diff --git a/mcs/class/System.Data.DataSetExtensions/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.DataSetExtensions/Assembly/AssemblyInfo.cs
index 2d977b1dceb..7fa4eb790eb 100644
--- a/mcs/class/System.Data.DataSetExtensions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Data.DataSetExtensions/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
[assembly: ComVisible (false)]
[assembly: AllowPartiallyTrustedCallers]
diff --git a/mcs/class/System.Data.DataSetExtensions/Makefile b/mcs/class/System.Data.DataSetExtensions/Makefile
index 9ece8d9c3ba..0e92b9ee3b4 100644
--- a/mcs/class/System.Data.DataSetExtensions/Makefile
+++ b/mcs/class/System.Data.DataSetExtensions/Makefile
@@ -7,6 +7,7 @@ LIBRARY = System.Data.DataSetExtensions.dll
TXT_RESOURCE_STRINGS = ../referencesource/System.Data.DataSetExtensions/System.Data.DataSetExtensions.txt
LIB_REFS = System.Core System System.Data System.Xml
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = -nowarn:436
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219 -nowarn:169 $(NUNIT_RESOURCE_FILES:%=/resource:%)
diff --git a/mcs/class/System.Data.Entity/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.Entity/Assembly/AssemblyInfo.cs
index 84393c411db..91b0367a88d 100644
--- a/mcs/class/System.Data.Entity/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Data.Entity/Assembly/AssemblyInfo.cs
@@ -61,7 +61,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
[assembly: ComVisible (false)]
diff --git a/mcs/class/System.Data.Entity/Makefile b/mcs/class/System.Data.Entity/Makefile
index b011913994e..59e87ccac24 100644
--- a/mcs/class/System.Data.Entity/Makefile
+++ b/mcs/class/System.Data.Entity/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Data.Entity.dll
LIB_REFS = System System.Core System.Data System.Xml System.Xml.Linq System.Transactions System.Runtime.Serialization System.ComponentModel.DataAnnotations System.Configuration
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = -warn:2
TXT_RESOURCE_STRINGS = ../referencesource/System.Data.Entity/System.Data.Entity.txt
diff --git a/mcs/class/System.Data.Linq/Makefile b/mcs/class/System.Data.Linq/Makefile
index 15a84430222..b55cdb9e3c5 100644
--- a/mcs/class/System.Data.Linq/Makefile
+++ b/mcs/class/System.Data.Linq/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Data.Linq.dll
LIB_REFS = System System.Core System.Xml System.Data System.Runtime.Serialization
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = \
/resource:./src/DbLinq/Schema/Dbml/DbmlSchema.xsd,DbLinq.Schema.Dbml.DbmlSchema.xsd \
/d:MONO_STRICT /d:MONO_DEPLOY -warn:1
diff --git a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Assembly/AssemblyInfo.cs
index 04a391d4dfc..16668d8ba85 100644
--- a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Assembly/AssemblyInfo.cs
@@ -57,7 +57,6 @@ using DbLinq.Factory;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
#endif
[assembly: ComVisible (false)]
diff --git a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile
index befed69def8..20cc4b10bca 100644
--- a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile
+++ b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Data.Linq.dll
LIB_REFS = System System.Core System.Data System.Transactions System.Xml
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS =
NO_TEST = yes
diff --git a/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs
index ae6d540857f..ee792bac6f3 100644
--- a/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs
@@ -34,7 +34,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile ("../ecma.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AllowPartiallyTrustedCallers]
diff --git a/mcs/class/System.Data.OracleClient/Makefile b/mcs/class/System.Data.OracleClient/Makefile
index 2a70299375e..66fbba34971 100644
--- a/mcs/class/System.Data.OracleClient/Makefile
+++ b/mcs/class/System.Data.OracleClient/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Data.OracleClient.dll
LIB_REFS = System System.Xml System.Data System.EnterpriseServices System.Drawing
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618
diff --git a/mcs/class/System.Data.Services.Client/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.Services.Client/Assembly/AssemblyInfo.cs
index b5d9b925392..da69def72bd 100644
--- a/mcs/class/System.Data.Services.Client/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Data.Services.Client/Assembly/AssemblyInfo.cs
@@ -41,7 +41,6 @@ using System.Runtime.InteropServices;
using System.Runtime.Versioning;
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
[assembly: System.Security.SecurityCritical]
[assembly: ComVisible(false)]
diff --git a/mcs/class/System.Data.Services.Client/Makefile b/mcs/class/System.Data.Services.Client/Makefile
index f635e808fc3..73c724a151c 100644
--- a/mcs/class/System.Data.Services.Client/Makefile
+++ b/mcs/class/System.Data.Services.Client/Makefile
@@ -7,6 +7,7 @@ LIBRARY = System.Data.Services.Client.dll
RESOURCE_DEFS = System.Data.Services.Client,Client/System.Data.Services.Client.txt
LIB_REFS = System System.Core System.Xml.Linq System.Data System.Xml
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = \
-d:NET_3_5 \
-warn:2
diff --git a/mcs/class/System.Data.Services/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.Services/Assembly/AssemblyInfo.cs
index 64ce7b2bb47..fcec6633d3e 100644
--- a/mcs/class/System.Data.Services/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Data.Services/Assembly/AssemblyInfo.cs
@@ -21,7 +21,6 @@ using System.Security;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
[assembly: ComVisible (false)]
[assembly: CLSCompliant (true)]
diff --git a/mcs/class/System.Data.Services/Makefile b/mcs/class/System.Data.Services/Makefile
index b5fb3cb6fdd..c1cb788e648 100644
--- a/mcs/class/System.Data.Services/Makefile
+++ b/mcs/class/System.Data.Services/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.Data.Services.dll
LIB_REFS = System System.Core System.ServiceModel System.ServiceModel.Web System.Data.Services.Client
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = -d:NET_3_5
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
diff --git a/mcs/class/System.Data/Assembly/AssemblyInfo.cs b/mcs/class/System.Data/Assembly/AssemblyInfo.cs
index 55252a3c447..accfd22f258 100644
--- a/mcs/class/System.Data/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Data/Assembly/AssemblyInfo.cs
@@ -58,7 +58,6 @@ using System.Runtime.InteropServices;
[assembly: AllowPartiallyTrustedCallers]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile("../ecma.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: InternalsVisibleTo ("System.Data.DataSetExtensions, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull)]
diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile
index 992f970601b..f24fe8932aa 100644
--- a/mcs/class/System.Data/Makefile
+++ b/mcs/class/System.Data/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.Data.dll
LIB_REFS = System System.Xml System.Core System.Numerics
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = \
-nowarn:219,414,649 \
-d:COREFX \
diff --git a/mcs/class/System.Design/Assembly/AssemblyInfo.cs b/mcs/class/System.Design/Assembly/AssemblyInfo.cs
index 80e434ea1b9..5ac82993dec 100644
--- a/mcs/class/System.Design/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Design/Assembly/AssemblyInfo.cs
@@ -56,7 +56,6 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile
index 2272546a83c..4ff4c5e8c4f 100644
--- a/mcs/class/System.Design/Makefile
+++ b/mcs/class/System.Design/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.Design.dll
LIB_REFS = System System.Xml plainweb/System.Web System.Windows.Forms System.Drawing Accessibility System.Data System.Configuration
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = -nowarn:436 -nowarn:612,618,649,67,672
TEST_LIB_REFS = System System.Drawing System.Windows.Forms
@@ -18,5 +19,6 @@ csproj-local:
$(the_libdir_base)plaindesign/System.Design.dll:
$(MAKE) intermediate=plaindesign/ $(the_libdir_base)plaindesign/System.Design.dll
+
endif
diff --git a/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs b/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs
index a633fe836e4..b75c0508b79 100644
--- a/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs
@@ -33,7 +33,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AllowPartiallyTrustedCallers]
diff --git a/mcs/class/System.DirectoryServices.Protocols/Makefile b/mcs/class/System.DirectoryServices.Protocols/Makefile
index 693e1b273fd..4fa33aba1af 100644
--- a/mcs/class/System.DirectoryServices.Protocols/Makefile
+++ b/mcs/class/System.DirectoryServices.Protocols/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.DirectoryServices.Protocols.dll
LIB_REFS = System System.DirectoryServices System.Xml
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
NO_TEST = yes
diff --git a/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs b/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs
index eda06fb8885..fa22aa74a1d 100644
--- a/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.DirectoryServices/Assembly/AssemblyInfo.cs
@@ -33,7 +33,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AllowPartiallyTrustedCallers]
diff --git a/mcs/class/System.DirectoryServices/Makefile b/mcs/class/System.DirectoryServices/Makefile
index 7eccfe87a4e..44058ce5db1 100644
--- a/mcs/class/System.DirectoryServices/Makefile
+++ b/mcs/class/System.DirectoryServices/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.DirectoryServices.dll
LIB_REFS = System Novell.Directory.Ldap
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
diff --git a/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs b/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs
index adfcac1097b..9f8ea58c4e0 100644
--- a/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs
@@ -54,7 +54,6 @@ using System.Diagnostics;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/System.Drawing.Design/Makefile b/mcs/class/System.Drawing.Design/Makefile
index 7abb4b3f3ae..79c4f90dd38 100644
--- a/mcs/class/System.Drawing.Design/Makefile
+++ b/mcs/class/System.Drawing.Design/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Drawing.Design.dll
LIB_REFS = System System.Drawing System.Windows.Forms
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
NO_TEST = yes
diff --git a/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs b/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs
index c036603b98a..508c578f9db 100644
--- a/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Drawing/Assembly/AssemblyInfo.cs
@@ -54,11 +54,8 @@ using System.Runtime.InteropServices;
[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
[assembly: AllowPartiallyTrustedCallers]
- [assembly: CLSCompliant (true)]
- [assembly: AssemblyDelaySign (true)]
-#if !MOBILE
- [assembly: AssemblyKeyFile("../msfinal.pub")]
-#endif
+[assembly: CLSCompliant (true)]
+[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/System.Drawing/Makefile b/mcs/class/System.Drawing/Makefile
index 685b8fb6d80..bbc6a132f9f 100644
--- a/mcs/class/System.Drawing/Makefile
+++ b/mcs/class/System.Drawing/Makefile
@@ -5,6 +5,7 @@ SUBDIRS =
LIBRARY = System.Drawing.dll
LIB_REFS = System
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = /unsafe \
-resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico \
-resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico \
diff --git a/mcs/class/System.Dynamic/Assembly/AssemblyInfo.cs b/mcs/class/System.Dynamic/Assembly/AssemblyInfo.cs
index 314ff860f0e..6eb80aae50a 100644
--- a/mcs/class/System.Dynamic/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Dynamic/Assembly/AssemblyInfo.cs
@@ -53,7 +53,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
[assembly: SecurityCritical]
diff --git a/mcs/class/System.Dynamic/Makefile b/mcs/class/System.Dynamic/Makefile
index 5956e751d0c..b4706f3d03f 100644
--- a/mcs/class/System.Dynamic/Makefile
+++ b/mcs/class/System.Dynamic/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.Dynamic.dll
LIB_REFS = System.Core System
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = -unsafe -d:CODEPLEX_40 -nowarn:414,169
# This is a .NET 4.0+ only assembly
diff --git a/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs b/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs
index fa68aa7a7eb..cf00a4b0439 100644
--- a/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs
@@ -58,7 +58,6 @@ using System.EnterpriseServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
diff --git a/mcs/class/System.EnterpriseServices/Makefile b/mcs/class/System.EnterpriseServices/Makefile
index 90f38e9fc9a..c2e327221c8 100644
--- a/mcs/class/System.EnterpriseServices/Makefile
+++ b/mcs/class/System.EnterpriseServices/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.EnterpriseServices.dll
LIB_REFS = System.Transactions
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = /nowarn:0168 /nowarn:0162
NO_TEST = yes
diff --git a/mcs/class/System.IO.Compression.FileSystem/AssemblyInfo.cs b/mcs/class/System.IO.Compression.FileSystem/AssemblyInfo.cs
index fa0af8e06ed..26a4b510054 100644
--- a/mcs/class/System.IO.Compression.FileSystem/AssemblyInfo.cs
+++ b/mcs/class/System.IO.Compression.FileSystem/AssemblyInfo.cs
@@ -36,4 +36,3 @@ using System.Reflection;
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
diff --git a/mcs/class/System.IO.Compression.FileSystem/Makefile b/mcs/class/System.IO.Compression.FileSystem/Makefile
index 9e7a4b0efcc..bb28e11d66e 100644
--- a/mcs/class/System.IO.Compression.FileSystem/Makefile
+++ b/mcs/class/System.IO.Compression.FileSystem/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.IO.Compression.FileSystem.dll
LIB_REFS = System System.IO.Compression
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = -unsafe
TEST_MCS_FLAGS =
TEST_LIB_REFS = System System.Core System.IO.Compression
diff --git a/mcs/class/System.IO.Compression/AssemblyInfo.cs b/mcs/class/System.IO.Compression/AssemblyInfo.cs
index b173b20da51..d89e9e473bd 100644
--- a/mcs/class/System.IO.Compression/AssemblyInfo.cs
+++ b/mcs/class/System.IO.Compression/AssemblyInfo.cs
@@ -36,4 +36,3 @@ using System.Reflection;
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
diff --git a/mcs/class/System.IO.Compression/Makefile b/mcs/class/System.IO.Compression/Makefile
index 327f7e0b1cd..738e9be17a2 100644
--- a/mcs/class/System.IO.Compression/Makefile
+++ b/mcs/class/System.IO.Compression/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.IO.Compression.dll
LIB_REFS = System
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS =
TEST_LIB_REFS = System System.Core
diff --git a/mcs/class/System.IdentityModel.Selectors/Assembly/AssemblyInfo.cs b/mcs/class/System.IdentityModel.Selectors/Assembly/AssemblyInfo.cs
index f221823bdf7..b3f7b278f35 100644
--- a/mcs/class/System.IdentityModel.Selectors/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.IdentityModel.Selectors/Assembly/AssemblyInfo.cs
@@ -56,6 +56,5 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
[assembly: ComVisible (false)]
diff --git a/mcs/class/System.IdentityModel.Selectors/Makefile b/mcs/class/System.IdentityModel.Selectors/Makefile
index bb7ade20bbc..cb72dfddcb1 100644
--- a/mcs/class/System.IdentityModel.Selectors/Makefile
+++ b/mcs/class/System.IdentityModel.Selectors/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.IdentityModel.Selectors.dll
LIB_REFS = System System.Xml System.Security System.Runtime.Serialization System.IdentityModel
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = /d:NET_3_0
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
diff --git a/mcs/class/System.IdentityModel/Assembly/AssemblyInfo.cs b/mcs/class/System.IdentityModel/Assembly/AssemblyInfo.cs
index 0b98df20420..eef8acc5a63 100644
--- a/mcs/class/System.IdentityModel/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.IdentityModel/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
[assembly: ComVisible (false)]
[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
diff --git a/mcs/class/System.IdentityModel/Makefile b/mcs/class/System.IdentityModel/Makefile
index 29bb7acd6ee..aad3b05831f 100644
--- a/mcs/class/System.IdentityModel/Makefile
+++ b/mcs/class/System.IdentityModel/Makefile
@@ -8,6 +8,7 @@ endif
LIBRARY = System.IdentityModel.dll
LIB_REFS = System System.Xml System.Security $(MONO_SECURITY) System.Runtime.Serialization
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = \
/d:NET_3_0 \
$(OTHER_LIB_MCS_FLAGS)
diff --git a/mcs/class/System.Interactive.Async/Makefile b/mcs/class/System.Interactive.Async/Makefile
index 5813d31276b..074236261cd 100644
--- a/mcs/class/System.Interactive.Async/Makefile
+++ b/mcs/class/System.Interactive.Async/Makefile
@@ -4,7 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Interactive.Async.dll
LIB_REFS = System System.Core
-LIB_MCS_FLAGS = @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign
ifeq (2.1, $(FRAMEWORK_VERSION))
LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT
@@ -17,7 +18,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args
+EXTRA_DISTFILES =
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Interactive.Async/more_build_args b/mcs/class/System.Interactive.Async/more_build_args
deleted file mode 100644
index a53ee7b7f9c..00000000000
--- a/mcs/class/System.Interactive.Async/more_build_args
+++ /dev/null
@@ -1,3 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
diff --git a/mcs/class/System.Interactive.Providers/Makefile b/mcs/class/System.Interactive.Providers/Makefile
index 71d92cbd728..45ff7df72b9 100644
--- a/mcs/class/System.Interactive.Providers/Makefile
+++ b/mcs/class/System.Interactive.Providers/Makefile
@@ -4,7 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Interactive.Providers.dll
LIB_REFS = System System.Core System.Interactive
-LIB_MCS_FLAGS = @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign
ifeq (2.1, $(FRAMEWORK_VERSION))
LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT
@@ -17,7 +18,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args
+EXTRA_DISTFILES =
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Interactive.Providers/more_build_args b/mcs/class/System.Interactive.Providers/more_build_args
deleted file mode 100644
index a53ee7b7f9c..00000000000
--- a/mcs/class/System.Interactive.Providers/more_build_args
+++ /dev/null
@@ -1,3 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
diff --git a/mcs/class/System.Interactive/Makefile b/mcs/class/System.Interactive/Makefile
index 83def3c2ea5..64318f07277 100644
--- a/mcs/class/System.Interactive/Makefile
+++ b/mcs/class/System.Interactive/Makefile
@@ -4,7 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Interactive.dll
LIB_REFS = System System.Core
-LIB_MCS_FLAGS = @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign
ifeq (2.1, $(FRAMEWORK_VERSION))
LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT
@@ -17,7 +18,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args
+EXTRA_DISTFILES =
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Interactive/more_build_args b/mcs/class/System.Interactive/more_build_args
deleted file mode 100644
index a53ee7b7f9c..00000000000
--- a/mcs/class/System.Interactive/more_build_args
+++ /dev/null
@@ -1,3 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
diff --git a/mcs/class/System.Json/Assembly/AssemblyInfo.cs b/mcs/class/System.Json/Assembly/AssemblyInfo.cs
index b8c49cd952b..b01d482984f 100755
--- a/mcs/class/System.Json/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Json/Assembly/AssemblyInfo.cs
@@ -51,7 +51,6 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
[assembly: ComVisible (false)]
diff --git a/mcs/class/System.Json/Makefile b/mcs/class/System.Json/Makefile
index 4a4b5c80e68..b515027edca 100644
--- a/mcs/class/System.Json/Makefile
+++ b/mcs/class/System.Json/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Json.dll
LIB_REFS = System System.Xml System.Core
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
diff --git a/mcs/class/System.Management/Assembly/AssemblyInfo.cs b/mcs/class/System.Management/Assembly/AssemblyInfo.cs
index 7f5675a5b1e..be7bd784564 100644
--- a/mcs/class/System.Management/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Management/Assembly/AssemblyInfo.cs
@@ -53,7 +53,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/System.Management/Makefile b/mcs/class/System.Management/Makefile
index df76cf43bc2..c5d34b93931 100644
--- a/mcs/class/System.Management/Makefile
+++ b/mcs/class/System.Management/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Management.dll
LIB_REFS = System System.Configuration.Install
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
NO_TEST = yes
diff --git a/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs b/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs
index 7c1947b9950..9b52cb178ab 100644
--- a/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Messaging/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/System.Messaging/Makefile b/mcs/class/System.Messaging/Makefile
index 0412ea01555..3d0c23e4d89 100644
--- a/mcs/class/System.Messaging/Makefile
+++ b/mcs/class/System.Messaging/Makefile
@@ -9,6 +9,7 @@ ifndef NO_SYSTEM_DRAWING_DEPENDENCY
LIB_REFS += System.Drawing
endif
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = /resource:System.Messaging/MessageQueue.resx
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
TEST_LIB_REFS = nunit.mocks
diff --git a/mcs/class/System.Net.Http.WebRequest/Assembly/AssemblyInfo.cs b/mcs/class/System.Net.Http.WebRequest/Assembly/AssemblyInfo.cs
index f646f54ef77..929d9c4da81 100644
--- a/mcs/class/System.Net.Http.WebRequest/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Net.Http.WebRequest/Assembly/AssemblyInfo.cs
@@ -52,7 +52,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: ComVisible (false)]
diff --git a/mcs/class/System.Net.Http.WebRequest/Makefile b/mcs/class/System.Net.Http.WebRequest/Makefile
index b0d8e7a1a87..20b890747f5 100644
--- a/mcs/class/System.Net.Http.WebRequest/Makefile
+++ b/mcs/class/System.Net.Http.WebRequest/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.Net.Http.WebRequest.dll
LIB_REFS = System.Net.Http System
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS =
diff --git a/mcs/class/System.Net.Http.WinHttpHandler/Assembly/AssemblyInfo.cs b/mcs/class/System.Net.Http.WinHttpHandler/Assembly/AssemblyInfo.cs
index d477aee4490..0222314c486 100644
--- a/mcs/class/System.Net.Http.WinHttpHandler/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Net.Http.WinHttpHandler/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: SecurityCritical]
diff --git a/mcs/class/System.Net.Http.WinHttpHandler/Makefile b/mcs/class/System.Net.Http.WinHttpHandler/Makefile
index 55b07ffdd63..026c4644a46 100644
--- a/mcs/class/System.Net.Http.WinHttpHandler/Makefile
+++ b/mcs/class/System.Net.Http.WinHttpHandler/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Net.Http.WinHttpHandler.dll
LIB_REFS = System System.Net.Http
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
NO_TEST = yes
diff --git a/mcs/class/System.Net.Http/Assembly/AssemblyInfo.cs b/mcs/class/System.Net.Http/Assembly/AssemblyInfo.cs
index 6aa0c9d0b8b..7cd48a91baa 100644
--- a/mcs/class/System.Net.Http/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Net.Http/Assembly/AssemblyInfo.cs
@@ -61,7 +61,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: ComVisible (false)]
diff --git a/mcs/class/System.Net.Http/Makefile b/mcs/class/System.Net.Http/Makefile
index 9abcf2e80f6..6f7f878ff7f 100644
--- a/mcs/class/System.Net.Http/Makefile
+++ b/mcs/class/System.Net.Http/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.Net.Http.dll
LIB_REFS = System.Core System
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = $(EXTRA_LIB_MCS_FLAGS)
ifeq (monodroid,$(PROFILE))
LIB_MCS_FLAGS += -d:XAMARIN_MODERN
diff --git a/mcs/class/System.Numerics.Vectors/Assembly/AssemblyInfo.cs b/mcs/class/System.Numerics.Vectors/Assembly/AssemblyInfo.cs
index f2d3b307d32..140938dd025 100644
--- a/mcs/class/System.Numerics.Vectors/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Numerics.Vectors/Assembly/AssemblyInfo.cs
@@ -53,7 +53,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: SecurityCritical]
diff --git a/mcs/class/System.Numerics.Vectors/Makefile b/mcs/class/System.Numerics.Vectors/Makefile
index 6500f93995c..e816423aae5 100644
--- a/mcs/class/System.Numerics.Vectors/Makefile
+++ b/mcs/class/System.Numerics.Vectors/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Numerics.Vectors.dll
LIB_REFS = System System.Numerics
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = -unsafe
RESX_RESOURCE_STRING = ../../../external/corefx/src/System.Numerics.Vectors/src/Resources/Strings.resx
diff --git a/mcs/class/System.Numerics/Assembly/AssemblyInfo.cs b/mcs/class/System.Numerics/Assembly/AssemblyInfo.cs
index 44dd5538405..89775699f03 100644
--- a/mcs/class/System.Numerics/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Numerics/Assembly/AssemblyInfo.cs
@@ -53,7 +53,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
[assembly: SecurityCritical]
diff --git a/mcs/class/System.Numerics/Makefile b/mcs/class/System.Numerics/Makefile
index 1e05c08cfeb..a7b25f1b140 100644
--- a/mcs/class/System.Numerics/Makefile
+++ b/mcs/class/System.Numerics/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Numerics.dll
LIB_REFS = System
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = /unsafe
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
XTEST_LIB_REFS = System Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation System.Core System.Numerics.Vectors Microsoft.CSharp
diff --git a/mcs/class/System.Reactive.Core/Makefile b/mcs/class/System.Reactive.Core/Makefile
index fc666baf51c..819b9adb9d3 100644
--- a/mcs/class/System.Reactive.Core/Makefile
+++ b/mcs/class/System.Reactive.Core/Makefile
@@ -4,8 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Reactive.Core.dll
LIB_REFS = System System.Core System.Reactive.Interfaces
-LIB_MCS_FLAGS = \
- @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign -resource:Strings_Core.resources,System.Reactive.Strings_Core.resources
ifeq (true, $(GENERATE_RESOURCES))
LIB_MCS_FLAGS += /define:GENERATING_RESOURCES
@@ -31,7 +31,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
+EXTRA_DISTFILES = $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Reactive.Core/more_build_args b/mcs/class/System.Reactive.Core/more_build_args
deleted file mode 100644
index f832406a175..00000000000
--- a/mcs/class/System.Reactive.Core/more_build_args
+++ /dev/null
@@ -1,4 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
--resource:Strings_Core.resources,System.Reactive.Strings_Core.resources
diff --git a/mcs/class/System.Reactive.Debugger/Makefile b/mcs/class/System.Reactive.Debugger/Makefile
index f616cad1f09..ef54db5c923 100644
--- a/mcs/class/System.Reactive.Debugger/Makefile
+++ b/mcs/class/System.Reactive.Debugger/Makefile
@@ -4,7 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Reactive.Debugger.dll
LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq
-LIB_MCS_FLAGS = @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign
ifeq (2.1, $(FRAMEWORK_VERSION))
LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT
@@ -17,7 +18,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args
+EXTRA_DISTFILES =
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Reactive.Debugger/more_build_args b/mcs/class/System.Reactive.Debugger/more_build_args
deleted file mode 100644
index a53ee7b7f9c..00000000000
--- a/mcs/class/System.Reactive.Debugger/more_build_args
+++ /dev/null
@@ -1,3 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
diff --git a/mcs/class/System.Reactive.Experimental/Makefile b/mcs/class/System.Reactive.Experimental/Makefile
index 9bc8b3e07ac..7a7a65c028c 100644
--- a/mcs/class/System.Reactive.Experimental/Makefile
+++ b/mcs/class/System.Reactive.Experimental/Makefile
@@ -4,7 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Reactive.Experimental.dll
LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq
-LIB_MCS_FLAGS = @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign
ifeq (2.1, $(FRAMEWORK_VERSION))
LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT
@@ -17,7 +18,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args
+EXTRA_DISTFILES =
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Reactive.Experimental/more_build_args b/mcs/class/System.Reactive.Experimental/more_build_args
deleted file mode 100644
index a53ee7b7f9c..00000000000
--- a/mcs/class/System.Reactive.Experimental/more_build_args
+++ /dev/null
@@ -1,3 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
diff --git a/mcs/class/System.Reactive.Interfaces/Makefile b/mcs/class/System.Reactive.Interfaces/Makefile
index 2752ff28127..9edbd350a13 100644
--- a/mcs/class/System.Reactive.Interfaces/Makefile
+++ b/mcs/class/System.Reactive.Interfaces/Makefile
@@ -4,7 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Reactive.Interfaces.dll
LIB_REFS = System System.Core
-LIB_MCS_FLAGS = @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign
ifeq (2.1, $(FRAMEWORK_VERSION))
LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT
@@ -17,7 +18,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args
+EXTRA_DISTFILES =
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Reactive.Interfaces/more_build_args b/mcs/class/System.Reactive.Interfaces/more_build_args
deleted file mode 100644
index a53ee7b7f9c..00000000000
--- a/mcs/class/System.Reactive.Interfaces/more_build_args
+++ /dev/null
@@ -1,3 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
diff --git a/mcs/class/System.Reactive.Linq/Makefile b/mcs/class/System.Reactive.Linq/Makefile
index f7f8f44e195..071bd7c2451 100644
--- a/mcs/class/System.Reactive.Linq/Makefile
+++ b/mcs/class/System.Reactive.Linq/Makefile
@@ -4,8 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Reactive.Linq.dll
LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core
-LIB_MCS_FLAGS = \
- @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign -resource:Strings_Linq.resources,System.Reactive.Strings_Linq.resources
ifeq (true, $(GENERATE_RESOURCES))
LIB_MCS_FLAGS += /define:GENERATING_RESOURCES
@@ -31,7 +31,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
+EXTRA_DISTFILES = $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Reactive.Linq/more_build_args b/mcs/class/System.Reactive.Linq/more_build_args
deleted file mode 100644
index d2c11c880ab..00000000000
--- a/mcs/class/System.Reactive.Linq/more_build_args
+++ /dev/null
@@ -1,4 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
--resource:Strings_Linq.resources,System.Reactive.Strings_Linq.resources
diff --git a/mcs/class/System.Reactive.Observable.Aliases/Makefile b/mcs/class/System.Reactive.Observable.Aliases/Makefile
index 0db9de14052..04c0101248d 100644
--- a/mcs/class/System.Reactive.Observable.Aliases/Makefile
+++ b/mcs/class/System.Reactive.Observable.Aliases/Makefile
@@ -4,8 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Reactive.Observable.Aliases.dll
LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq System.Reactive.Providers
-LIB_MCS_FLAGS = \
- @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign
ifeq (true, $(GENERATE_RESOURCES))
LIB_MCS_FLAGS += /define:GENERATING_RESOURCES
@@ -28,7 +28,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
+EXTRA_DISTFILES = $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Reactive.Observable.Aliases/more_build_args b/mcs/class/System.Reactive.Observable.Aliases/more_build_args
deleted file mode 100644
index a53ee7b7f9c..00000000000
--- a/mcs/class/System.Reactive.Observable.Aliases/more_build_args
+++ /dev/null
@@ -1,3 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
diff --git a/mcs/class/System.Reactive.PlatformServices/Makefile b/mcs/class/System.Reactive.PlatformServices/Makefile
index 0333c27f2e7..43addad7f8f 100644
--- a/mcs/class/System.Reactive.PlatformServices/Makefile
+++ b/mcs/class/System.Reactive.PlatformServices/Makefile
@@ -4,8 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Reactive.PlatformServices.dll
LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq
-LIB_MCS_FLAGS = \
- @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign -resource:Strings_PlatformServices.resources,System.Reactive.Strings_PlatformServices.resources
ifeq (true, $(GENERATE_RESOURCES))
LIB_MCS_FLAGS += /define:GENERATING_RESOURCES
@@ -37,7 +37,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
TEST_LIB_REFS = Mono.Reactive.Tests
-EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
+EXTRA_DISTFILES = $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Reactive.PlatformServices/more_build_args b/mcs/class/System.Reactive.PlatformServices/more_build_args
deleted file mode 100644
index 630b370624e..00000000000
--- a/mcs/class/System.Reactive.PlatformServices/more_build_args
+++ /dev/null
@@ -1,4 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
--resource:Strings_PlatformServices.resources,System.Reactive.Strings_PlatformServices.resources
diff --git a/mcs/class/System.Reactive.Providers/Makefile b/mcs/class/System.Reactive.Providers/Makefile
index ab1f274d150..019b9ed8e49 100644
--- a/mcs/class/System.Reactive.Providers/Makefile
+++ b/mcs/class/System.Reactive.Providers/Makefile
@@ -4,8 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Reactive.Providers.dll
LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq
-LIB_MCS_FLAGS = \
- @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign -resource:Strings_Providers.resources,System.Reactive.Strings_Providers.resources
ifeq (true, $(GENERATE_RESOURCES))
LIB_MCS_FLAGS += /define:GENERATING_RESOURCES
@@ -31,7 +31,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
+EXTRA_DISTFILES = $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Reactive.Providers/more_build_args b/mcs/class/System.Reactive.Providers/more_build_args
deleted file mode 100644
index 264c0c0aca6..00000000000
--- a/mcs/class/System.Reactive.Providers/more_build_args
+++ /dev/null
@@ -1,4 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
--resource:Strings_Providers.resources,System.Reactive.Strings_Providers.resources
diff --git a/mcs/class/System.Reactive.Runtime.Remoting/Makefile b/mcs/class/System.Reactive.Runtime.Remoting/Makefile
index 1834e7aaa25..d3178b70df5 100644
--- a/mcs/class/System.Reactive.Runtime.Remoting/Makefile
+++ b/mcs/class/System.Reactive.Runtime.Remoting/Makefile
@@ -4,8 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Reactive.Runtime.Remoting.dll
LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq
-LIB_MCS_FLAGS = \
- @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign
ifeq (2.1, $(FRAMEWORK_VERSION))
LIB_MCS_FLAGS += -d:NO_TASK_DELAY
@@ -18,7 +18,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args
+EXTRA_DISTFILES =
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Reactive.Runtime.Remoting/more_build_args b/mcs/class/System.Reactive.Runtime.Remoting/more_build_args
deleted file mode 100644
index a53ee7b7f9c..00000000000
--- a/mcs/class/System.Reactive.Runtime.Remoting/more_build_args
+++ /dev/null
@@ -1,3 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
diff --git a/mcs/class/System.Reactive.Windows.Forms/Makefile b/mcs/class/System.Reactive.Windows.Forms/Makefile
index ef3327d3e3e..9967af9ebca 100644
--- a/mcs/class/System.Reactive.Windows.Forms/Makefile
+++ b/mcs/class/System.Reactive.Windows.Forms/Makefile
@@ -4,8 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Reactive.Windows.Forms.dll
LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq System.Windows.Forms
-LIB_MCS_FLAGS = \
- @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign
ifeq (2.1, $(FRAMEWORK_VERSION))
LIB_MCS_FLAGS += -d:NO_TASK_DELAY -d:HAS_AWAIT
@@ -18,7 +18,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args
+EXTRA_DISTFILES =
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Reactive.Windows.Forms/more_build_args b/mcs/class/System.Reactive.Windows.Forms/more_build_args
deleted file mode 100644
index a53ee7b7f9c..00000000000
--- a/mcs/class/System.Reactive.Windows.Forms/more_build_args
+++ /dev/null
@@ -1,3 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
diff --git a/mcs/class/System.Reactive.Windows.Threading/Makefile b/mcs/class/System.Reactive.Windows.Threading/Makefile
index 66a3ff14f6c..e2ff9614e06 100644
--- a/mcs/class/System.Reactive.Windows.Threading/Makefile
+++ b/mcs/class/System.Reactive.Windows.Threading/Makefile
@@ -4,8 +4,8 @@ include ../../build/rules.make
LIBRARY = System.Reactive.Windows.Threading.dll
LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq WindowsBase
-LIB_MCS_FLAGS = \
- @more_build_args
+KEYFILE = ../reactive.pub
+LIB_MCS_FLAGS = -d:SIGNED -delaysign -resource:Strings_WindowsThreading.resources,System.Reactive.Strings_WindowsThreading.resources
ifeq (true, $(GENERATE_RESOURCES))
LIB_MCS_FLAGS += /define:GENERATING_RESOURCES
@@ -31,7 +31,7 @@ endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
-EXTRA_DISTFILES = more_build_args $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
+EXTRA_DISTFILES = $(RESX_RESOURCES:.resources=.resx) $(PREBUILT)
INSTALL_PROFILE := $(filter net_4_x, $(PROFILE))
ifndef INSTALL_PROFILE
diff --git a/mcs/class/System.Reactive.Windows.Threading/more_build_args b/mcs/class/System.Reactive.Windows.Threading/more_build_args
deleted file mode 100644
index aa3becfe111..00000000000
--- a/mcs/class/System.Reactive.Windows.Threading/more_build_args
+++ /dev/null
@@ -1,4 +0,0 @@
--d:SIGNED
--delaysign
--keyfile:../reactive.pub
--resource:Strings_WindowsThreading.resources,System.Reactive.Strings_WindowsThreading.resources
diff --git a/mcs/class/System.Reflection.Context/Assembly/AssemblyInfo.cs b/mcs/class/System.Reflection.Context/Assembly/AssemblyInfo.cs
index 67d49125ac9..ffb8818a1ae 100644
--- a/mcs/class/System.Reflection.Context/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Reflection.Context/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: SecurityCritical]
diff --git a/mcs/class/System.Reflection.Context/Makefile b/mcs/class/System.Reflection.Context/Makefile
index 73bee9e345e..1961066c523 100644
--- a/mcs/class/System.Reflection.Context/Makefile
+++ b/mcs/class/System.Reflection.Context/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Reflection.Context.dll
LIB_REFS = System
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
NO_TEST = yes
diff --git a/mcs/class/System.Runtime.Caching/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.Caching/Assembly/AssemblyInfo.cs
index 9583a2495b5..ad85823218d 100644
--- a/mcs/class/System.Runtime.Caching/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Runtime.Caching/Assembly/AssemblyInfo.cs
@@ -58,7 +58,6 @@ using System.Runtime.Versioning;
[assembly: ComVisible (false)]
-[assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: AllowPartiallyTrustedCallers]
[assembly: SecurityRules (SecurityRuleSet.Level2, SkipVerificationInFullTrust=true)]
diff --git a/mcs/class/System.Runtime.Caching/Makefile b/mcs/class/System.Runtime.Caching/Makefile
index 380b02e3e79..95742640616 100644
--- a/mcs/class/System.Runtime.Caching/Makefile
+++ b/mcs/class/System.Runtime.Caching/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Runtime.Caching.dll
LIB_REFS = System System.Data System.Configuration System.Core
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = -nowarn:414
RESX_RESOURCE_STRING = \
diff --git a/mcs/class/System.Runtime.DurableInstancing/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.DurableInstancing/Assembly/AssemblyInfo.cs
index 3b6de7e3067..04271f11748 100644
--- a/mcs/class/System.Runtime.DurableInstancing/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Runtime.DurableInstancing/Assembly/AssemblyInfo.cs
@@ -55,10 +55,7 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-#if MOBILE
-[assembly: AssemblyKeyFile ("../silverlight.pub")]
-#else
-[assembly: AssemblyKeyFile ("../winfx.pub")]
+#if !MOBILE
[assembly: AllowPartiallyTrustedCallers]
[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
#endif
diff --git a/mcs/class/System.Runtime.DurableInstancing/Makefile b/mcs/class/System.Runtime.DurableInstancing/Makefile
index 3db6eeb9c15..eb1233ff7c8 100644
--- a/mcs/class/System.Runtime.DurableInstancing/Makefile
+++ b/mcs/class/System.Runtime.DurableInstancing/Makefile
@@ -6,6 +6,12 @@ LIBRARY = System.Runtime.DurableInstancing.dll
LIB_REFS = System System.Xml System.Core System.Xml.Linq System.Transactions System.ServiceModel.Internals System.Runtime.Serialization
LIB_MCS_FLAGS =
+ifdef MOBILE_PROFILE
+KEYFILE = ../silverlight.pub
+else
+KEYFILE = ../winfx.pub
+endif
+
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = $(RESOURCE_FILES)
diff --git a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
index e87df264496..53638b23099 100644
--- a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile("../ecma.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CLSCompliant (false)]
diff --git a/mcs/class/System.Runtime.Remoting/Makefile b/mcs/class/System.Runtime.Remoting/Makefile
index 323d4241eb5..25d474679f9 100644
--- a/mcs/class/System.Runtime.Remoting/Makefile
+++ b/mcs/class/System.Runtime.Remoting/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.Runtime.Remoting.dll
LIB_REFS = System System.Xml System.Runtime.Serialization.Formatters.Soap
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS =
ifndef NO_SYSTEM_WEB_DEPENDENCY
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs
index 645e25adde1..caffdb5111e 100644
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: ComVisible (true)]
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Makefile b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Makefile
index 7a673f01fa3..930a7908aff 100644
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Makefile
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Makefile
@@ -6,6 +6,7 @@ include ../../build/rules.make
LIBRARY = System.Runtime.Serialization.Formatters.Soap.dll
LIB_REFS = System.Xml
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
TEST_LIB_REFS = System
diff --git a/mcs/class/System.Security/Assembly/AssemblyInfo.cs b/mcs/class/System.Security/Assembly/AssemblyInfo.cs
index 8e95096faaf..35601febd26 100644
--- a/mcs/class/System.Security/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Security/Assembly/AssemblyInfo.cs
@@ -47,7 +47,6 @@ using System.Security.Permissions;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: AssemblyDefaultAlias ("System.Security.dll")]
[assembly: AssemblyDescription ("System.Security.dll")]
diff --git a/mcs/class/System.Security/Makefile b/mcs/class/System.Security/Makefile
index a1b0b9fe5f0..ae2de1a6370 100644
--- a/mcs/class/System.Security/Makefile
+++ b/mcs/class/System.Security/Makefile
@@ -9,6 +9,7 @@ endif
LIBRARY = System.Security.dll
LIB_REFS = secxml/System bare/System.Xml $(MONO_SECURITY)
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = \
-nowarn:414,618 \
-d:SECURITY_DEP,SYSTEM_SECURITY_DLL
diff --git a/mcs/class/System.ServiceModel.Activation/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel.Activation/Assembly/AssemblyInfo.cs
index f47e8798819..23a8b15d367 100644
--- a/mcs/class/System.ServiceModel.Activation/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ServiceModel.Activation/Assembly/AssemblyInfo.cs
@@ -53,8 +53,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../winfx.pub")]
-
[assembly: ComVisible (false)]
[assembly: InternalsVisibleTo ("System.ServiceModel, PublicKey=00000000000000000400000000000000")]
diff --git a/mcs/class/System.ServiceModel.Activation/Makefile b/mcs/class/System.ServiceModel.Activation/Makefile
index 2be1563c1d7..e8c0e953fd2 100644
--- a/mcs/class/System.ServiceModel.Activation/Makefile
+++ b/mcs/class/System.ServiceModel.Activation/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.ServiceModel.Activation.dll
LIB_REFS = System.Core System plainservice/System.ServiceModel
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS =
diff --git a/mcs/class/System.ServiceModel.Discovery/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel.Discovery/Assembly/AssemblyInfo.cs
index 6a9d85f5c70..bceb2067199 100644
--- a/mcs/class/System.ServiceModel.Discovery/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ServiceModel.Discovery/Assembly/AssemblyInfo.cs
@@ -54,8 +54,3 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: AssemblyDelaySign (true)]
-#if MOBILE
-[assembly: AssemblyKeyFile ("../silverlight.pub")]
-#else
-[assembly: AssemblyKeyFile("../winfx.pub")]
-#endif
diff --git a/mcs/class/System.ServiceModel.Discovery/Makefile b/mcs/class/System.ServiceModel.Discovery/Makefile
index d46df268454..a56da1ee8af 100644
--- a/mcs/class/System.ServiceModel.Discovery/Makefile
+++ b/mcs/class/System.ServiceModel.Discovery/Makefile
@@ -11,6 +11,12 @@ LIB_REFS += System.Configuration
LIB_MCS_FLAGS += -d:NET_3_5 -d:NET_3_0
endif
+ifdef MOBILE_PROFILE
+KEYFILE = ../silverlight.pub
+else
+KEYFILE = ../winfx.pub
+endif
+
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = $(RESOURCE_FILES)
diff --git a/mcs/class/System.ServiceModel.Routing/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel.Routing/Assembly/AssemblyInfo.cs
index 0202afecb93..712a1c56021 100644
--- a/mcs/class/System.ServiceModel.Routing/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ServiceModel.Routing/Assembly/AssemblyInfo.cs
@@ -54,8 +54,3 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: AssemblyDelaySign (true)]
-#if MOBILE
-[assembly: AssemblyKeyFile ("../silverlight.pub")]
-#else
-[assembly: AssemblyKeyFile("../winfx.pub")]
-#endif
diff --git a/mcs/class/System.ServiceModel.Routing/Makefile b/mcs/class/System.ServiceModel.Routing/Makefile
index f8d30f60025..4c5b0a74817 100644
--- a/mcs/class/System.ServiceModel.Routing/Makefile
+++ b/mcs/class/System.ServiceModel.Routing/Makefile
@@ -11,6 +11,12 @@ LIB_REFS += System.Configuration
LIB_MCS_FLAGS += -d:NET_3_5 -d:NET_3_0
endif
+ifdef MOBILE_PROFILE
+KEYFILE = ../silverlight.pub
+else
+KEYFILE = ../winfx.pub
+endif
+
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = $(RESOURCE_FILES)
diff --git a/mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs
index 2e2baf595ce..fc7d2fe131d 100644
--- a/mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs
@@ -55,10 +55,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign (true)]
#if MOBILE
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-[assembly: AssemblyKeyFile ("../silverlight.pub")]
#else
[assembly: AssemblyInformationalVersion ("3.5.594.0")]
-[assembly: AssemblyKeyFile("../winfx.pub")]
#endif
#if MOBILE
diff --git a/mcs/class/System.ServiceModel.Web/Makefile b/mcs/class/System.ServiceModel.Web/Makefile
index 8a4a46c755f..cc4eaf3524f 100644
--- a/mcs/class/System.ServiceModel.Web/Makefile
+++ b/mcs/class/System.ServiceModel.Web/Makefile
@@ -22,6 +22,12 @@ LIB_REFS += System.ServiceModel.Activation
endif
endif
+ifdef MOBILE_PROFILE
+KEYFILE = ../silverlight.pub
+else
+KEYFILE = ../winfx.pub
+endif
+
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = $(RESOURCE_FILES) \
diff --git a/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs
index 2e5c2d833e8..ebdcb1a2206 100644
--- a/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ServiceProcess/Assembly/AssemblyInfo.cs
@@ -54,7 +54,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/System.ServiceProcess/Makefile b/mcs/class/System.ServiceProcess/Makefile
index 82de1c3ee28..8414fa099f5 100644
--- a/mcs/class/System.ServiceProcess/Makefile
+++ b/mcs/class/System.ServiceProcess/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.ServiceProcess.dll
LIB_REFS = System System.Configuration.Install System.Windows.Forms
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = /nowarn:0618
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
diff --git a/mcs/class/System.Threading.Tasks.Dataflow/Assembly/AssemblyInfo.cs b/mcs/class/System.Threading.Tasks.Dataflow/Assembly/AssemblyInfo.cs
index 8edb6b01a7e..e78386a2226 100644
--- a/mcs/class/System.Threading.Tasks.Dataflow/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Threading.Tasks.Dataflow/Assembly/AssemblyInfo.cs
@@ -49,6 +49,5 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
[assembly: ComVisible (false)]
diff --git a/mcs/class/System.Threading.Tasks.Dataflow/Makefile b/mcs/class/System.Threading.Tasks.Dataflow/Makefile
index 017f1a880c8..77e279ebb23 100644
--- a/mcs/class/System.Threading.Tasks.Dataflow/Makefile
+++ b/mcs/class/System.Threading.Tasks.Dataflow/Makefile
@@ -4,11 +4,12 @@ include ../../build/rules.make
LIBRARY = System.Threading.Tasks.Dataflow.dll
-include ../../build/library.make
-
LIB_REFS += System.Core System
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS += -d:CONCURRENT_COLLECTIONS
+include ../../build/library.make
+
TEST_MCS_FLAGS =
TEST_LIB_REFS = System.Core System
diff --git a/mcs/class/System.Transactions/Assembly/AssemblyInfo.cs b/mcs/class/System.Transactions/Assembly/AssemblyInfo.cs
index 4b130a9110a..a205b613243 100644
--- a/mcs/class/System.Transactions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Transactions/Assembly/AssemblyInfo.cs
@@ -56,7 +56,6 @@ using System.Security.Permissions;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile("../ecma.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: BestFitMapping (false)]
diff --git a/mcs/class/System.Transactions/Makefile b/mcs/class/System.Transactions/Makefile
index 07672c10b06..bc3825dbf95 100644
--- a/mcs/class/System.Transactions/Makefile
+++ b/mcs/class/System.Transactions/Makefile
@@ -3,6 +3,7 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = System.Transactions.dll
+KEYFILE = ../ecma.pub
ifdef MOBILE_PROFILE
LIB_REFS = System
LIB_MCS_FLAGS = /define:MOBILE
diff --git a/mcs/class/System.Web.Abstractions/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Abstractions/Assembly/AssemblyInfo.cs
index b0e5072ddf6..bad9f9434da 100644
--- a/mcs/class/System.Web.Abstractions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Abstractions/Assembly/AssemblyInfo.cs
@@ -57,7 +57,6 @@ using System.Web;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
[assembly: ComVisible (false)]
[assembly: AllowPartiallyTrustedCallers]
diff --git a/mcs/class/System.Web.Abstractions/Makefile b/mcs/class/System.Web.Abstractions/Makefile
index f896d06efaf..76896b0f42a 100644
--- a/mcs/class/System.Web.Abstractions/Makefile
+++ b/mcs/class/System.Web.Abstractions/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Web.Abstractions.dll
LIB_REFS = System System.Core System.Web
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
diff --git a/mcs/class/System.Web.ApplicationServices/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.ApplicationServices/Assembly/AssemblyInfo.cs
index c7313e561e0..7bd833647f3 100644
--- a/mcs/class/System.Web.ApplicationServices/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.ApplicationServices/Assembly/AssemblyInfo.cs
@@ -58,7 +58,6 @@ using System.Runtime.Versioning;
[assembly: ComVisible (false)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
[assembly: InternalsVisibleTo ("System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
[assembly: AllowPartiallyTrustedCallers]
diff --git a/mcs/class/System.Web.ApplicationServices/Makefile b/mcs/class/System.Web.ApplicationServices/Makefile
index d7389f43e0d..2a8fb964bf8 100644
--- a/mcs/class/System.Web.ApplicationServices/Makefile
+++ b/mcs/class/System.Web.ApplicationServices/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Web.ApplicationServices.dll
LIB_REFS = System System.Configuration
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS = -d:SYSTEM_WEB_APPLICATIONSERVICES
EXTRA_DISTFILES = $(RESOURCE_FILES)
diff --git a/mcs/class/System.Web.DynamicData/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.DynamicData/Assembly/AssemblyInfo.cs
index a3aefb7d774..3ff8aee3018 100644
--- a/mcs/class/System.Web.DynamicData/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.DynamicData/Assembly/AssemblyInfo.cs
@@ -55,7 +55,6 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
[assembly: ComVisible (false)]
[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
diff --git a/mcs/class/System.Web.DynamicData/Makefile b/mcs/class/System.Web.DynamicData/Makefile
index df81a3719ca..a256a4f4234 100644
--- a/mcs/class/System.Web.DynamicData/Makefile
+++ b/mcs/class/System.Web.DynamicData/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Web.DynamicData.dll
LIB_REFS = System System.Core System.ComponentModel.DataAnnotations System.Data System.Data.Linq System.Drawing System.Web System.Web.Extensions System.Web.Abstractions System.Web.Routing
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS =
ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
diff --git a/mcs/class/System.Web.DynamicData/Test/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.DynamicData/Test/Assembly/AssemblyInfo.cs
index 1157af998de..ce69632459d 100644
--- a/mcs/class/System.Web.DynamicData/Test/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.DynamicData/Test/Assembly/AssemblyInfo.cs
@@ -40,5 +40,4 @@ using MonoTests.Common;
//[assembly: AssemblyFileVersion ("1.0.0.0")]
#if !TARGET_DOTNET
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
#endif
diff --git a/mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs
index 50340619e30..75ca721f837 100644
--- a/mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs
@@ -56,7 +56,6 @@ using System.Security;
#if !(TARGET_DOTNET)
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile ("../winfx.pub")]
#endif
[assembly: ComVisible (false)]
diff --git a/mcs/class/System.Web.Extensions.Design/Makefile b/mcs/class/System.Web.Extensions.Design/Makefile
index 6ea70f5bf6c..38b7c6647ba 100644
--- a/mcs/class/System.Web.Extensions.Design/Makefile
+++ b/mcs/class/System.Web.Extensions.Design/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.Web.Extensions.Design.dll
LIB_REFS = System System.Design System.Drawing System.Windows.Forms
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS = -define:NET_3_5
include ../../build/library.make
diff --git a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
index 87b059215a3..f3f56f0e325 100644
--- a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
@@ -57,7 +57,6 @@ using System.Security.Permissions;
#if !(TARGET_DOTNET)
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile ("../winfx.pub")]
#endif
diff --git a/mcs/class/System.Web.Extensions/Makefile b/mcs/class/System.Web.Extensions/Makefile
index 9660692d0db..b2ab6dd8a75 100644
--- a/mcs/class/System.Web.Extensions/Makefile
+++ b/mcs/class/System.Web.Extensions/Makefile
@@ -50,6 +50,7 @@ RUN_STANDALONE += --test=$(TESTNAME)
endif
LIB_REFS = System System.Core System.Drawing System.Data System.Data.Linq System.Xml System.Web System.Web.Services System.Configuration System.EnterpriseServices System.ServiceModel
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS = \
-unsafe \
-define:NET_3_5 -nowarn:436 \
diff --git a/mcs/class/System.Web.Http/Makefile b/mcs/class/System.Web.Http/Makefile
index 72afa046d2a..22be8256d94 100644
--- a/mcs/class/System.Web.Http/Makefile
+++ b/mcs/class/System.Web.Http/Makefile
@@ -8,9 +8,8 @@ RESOURCE_DEFS = \
System.Web.Http.Properties.CommonWebApiResources,../../../external/aspnetwebstack/src/Common/CommonWebApiResources.resx \
System.Web.Http.Properties.SRResources,../../../external/aspnetwebstack/src/System.Web.Http/Properties/SRResources.resx
-
-
LIB_REFS = System.Core System System.Xml System.Net.Http System.ComponentModel.DataAnnotations System.Net.Http.Formatting System.Runtime.Caching System.Runtime.Serialization System.Data.Linq
-LIB_MCS_FLAGS = -d:ASPNETMVC -keyfile:../winfx.pub -delaysign
+KEYFILE = ../winfx.pub
+LIB_MCS_FLAGS = -d:ASPNETMVC -delaysign
include ../../build/library.make
diff --git a/mcs/class/System.Web.Mvc3/Makefile b/mcs/class/System.Web.Mvc3/Makefile
index e5418545d96..20b0edc2325 100644
--- a/mcs/class/System.Web.Mvc3/Makefile
+++ b/mcs/class/System.Web.Mvc3/Makefile
@@ -9,9 +9,9 @@ RESOURCE_DEFS = System.Web.Mvc.Resources.MvcResources,Mvc/Resources/MvcResources
RESX_DIST = Mvc/Resources/MvcResources.resx
LIB_REFS = Microsoft.Web.Infrastructure System System.Core System.Configuration System.Data System.Xml System.Web System.Web.Abstractions System.Web.Routing System.Web.Extensions System.ComponentModel.DataAnnotations System.Data.Linq System.Runtime.Caching System.Web.Razor System.Web.WebPages.Razor System.Web.WebPages
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS = \
/warn:1 \
- /keyfile:../winfx.pub \
/d:MONO \
/delaysign
diff --git a/mcs/class/System.Web.Razor/Makefile b/mcs/class/System.Web.Razor/Makefile
index e4472a96a0c..c329613bdf4 100644
--- a/mcs/class/System.Web.Razor/Makefile
+++ b/mcs/class/System.Web.Razor/Makefile
@@ -10,10 +10,10 @@ RESOURCE_DEFS = \
System.Web.Razor.Resources.RazorResources,../../../external/aspnetwebstack/src/System.Web.Razor/Resources/RazorResources.resx
LIB_REFS = System System.Core
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS = \
/warn:1 \
- /keyfile:../winfx.pub -delaysign \
- /d:ASPNETWEBPAGES
+ -delaysign \
+ /d:ASPNETWEBPAGES
include ../../build/library.make
-
diff --git a/mcs/class/System.Web.Routing/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Routing/Assembly/AssemblyInfo.cs
index 5487f687a3e..4ec637c05d0 100644
--- a/mcs/class/System.Web.Routing/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Routing/Assembly/AssemblyInfo.cs
@@ -57,7 +57,6 @@ using System.Web.Routing;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
[assembly: ComVisible (false)]
[assembly: AllowPartiallyTrustedCallers]
diff --git a/mcs/class/System.Web.Routing/Makefile b/mcs/class/System.Web.Routing/Makefile
index 09df4e8819a..7fc38d155aa 100644
--- a/mcs/class/System.Web.Routing/Makefile
+++ b/mcs/class/System.Web.Routing/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Web.Routing.dll
LIB_REFS = System System.Core System.Web System.Web.Abstractions
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
diff --git a/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs
index a4057864063..ded3594711d 100644
--- a/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Services/Assembly/AssemblyInfo.cs
@@ -56,7 +56,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/System.Web.Services/Makefile b/mcs/class/System.Web.Services/Makefile
index 6120b04b75a..566da23778b 100644
--- a/mcs/class/System.Web.Services/Makefile
+++ b/mcs/class/System.Web.Services/Makefile
@@ -3,6 +3,7 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = System.Web.Services.dll
+KEYFILE = ../msfinal.pub
ifdef MOBILE_PROFILE
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = \
diff --git a/mcs/class/System.Web.WebPages.Deployment/Makefile b/mcs/class/System.Web.WebPages.Deployment/Makefile
index 2e704de8734..bb1cd40bfd4 100644
--- a/mcs/class/System.Web.WebPages.Deployment/Makefile
+++ b/mcs/class/System.Web.WebPages.Deployment/Makefile
@@ -11,9 +11,10 @@ RESOURCE_DEFS = \
LIB_REFS = System System.Core System.Configuration System.Web Microsoft.Web.Infrastructure
+KEYFILE=../winfx.pub
LIB_MCS_FLAGS = \
- /warn:1 \
- /keyfile:../winfx.pub -delaysign \
- /d:ASPNETWEBPAGES
+ /warn:1 \
+ -delaysign \
+ /d:ASPNETWEBPAGES
include ../../build/library.make
diff --git a/mcs/class/System.Web.WebPages.Razor/Makefile b/mcs/class/System.Web.WebPages.Razor/Makefile
index 28b0f3f45c1..b9f7f8f5cc4 100644
--- a/mcs/class/System.Web.WebPages.Razor/Makefile
+++ b/mcs/class/System.Web.WebPages.Razor/Makefile
@@ -10,10 +10,10 @@ RESOURCE_DEFS = \
System.Web.WebPages.Razor.Resources.RazorWebResources,../../../external/aspnetwebstack/src/System.Web.WebPages.Razor/Resources/RazorWebResources.resx
LIB_REFS = System System.Core System.Configuration System.Web System.Web.WebPages System.Web.Razor
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS = \
- /warn:1 \
- /keyfile:../winfx.pub \
- /delaysign \
+ /warn:1 \
+ /delaysign \
/d:ASPNETWEBPAGES
include ../../build/library.make
diff --git a/mcs/class/System.Web.WebPages/Makefile b/mcs/class/System.Web.WebPages/Makefile
index 3e9641f079c..91e15810c7d 100644
--- a/mcs/class/System.Web.WebPages/Makefile
+++ b/mcs/class/System.Web.WebPages/Makefile
@@ -11,10 +11,10 @@ RESOURCE_DEFS = \
LIB_REFS = Microsoft.CSharp Microsoft.Web.Infrastructure System System.ComponentModel.DataAnnotations System.Configuration System.Core System.Data.Linq System.Web System.Web.WebPages.Deployment System.Web.Razor System.Xml System.Xml.Linq
+KEYFILE=../winfx.pub
LIB_MCS_FLAGS = \
- /warn:1 \
- /keyfile:../winfx.pub \
- /delaysign \
+ /warn:1 \
+ /delaysign \
/d:ASPNETWEBPAGES
EXTRA_DISTFILES = $(RESX_DIST)
diff --git a/mcs/class/System.Web/Assembly/AssemblyInfo.cs b/mcs/class/System.Web/Assembly/AssemblyInfo.cs
index 72eb774c611..3b581a77e38 100644
--- a/mcs/class/System.Web/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web/Assembly/AssemblyInfo.cs
@@ -59,7 +59,6 @@ using System.Web.UI;
[assembly: TagPrefix("System.Web.UI.WebControls", "asp")]
#if !(TARGET_DOTNET)
[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("../msfinal.pub")]
[assembly: AssemblyFileVersion (Consts.FxVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 21508dad37b..a7e12930f15 100644
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -243,6 +243,7 @@ TXT_RESOURCE_STRINGS = ../referencesource/System.Web/System.Web.txt
LIB_REFS = System System.Core System.Drawing System.Data System.Xml System.EnterpriseServices System.Runtime.Serialization.Formatters.Soap \
System.ComponentModel.DataAnnotations System.Web.ApplicationServices System.Configuration Mono.Data.Sqlite
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = \
-unsafe \
-nowarn:612,618 \
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Assembly/AssemblyInfo.cs b/mcs/class/System.Windows.Forms.DataVisualization/Assembly/AssemblyInfo.cs
index da73c9fd9c8..512122d8e1b 100644
--- a/mcs/class/System.Windows.Forms.DataVisualization/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Windows.Forms.DataVisualization/Assembly/AssemblyInfo.cs
@@ -50,7 +50,6 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
[assembly: SecurityRules (SecurityRuleSet.Level1)]
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Makefile b/mcs/class/System.Windows.Forms.DataVisualization/Makefile
index e0284d75bf1..ec81308ae52 100644
--- a/mcs/class/System.Windows.Forms.DataVisualization/Makefile
+++ b/mcs/class/System.Windows.Forms.DataVisualization/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Windows.Forms.DataVisualization.dll
LIB_REFS = System System.Drawing System.Windows.Forms System.Core System.Data System.Xml
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS = -nowarn:67
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
diff --git a/mcs/class/System.Windows.Forms/Assembly/AssemblyInfo.cs b/mcs/class/System.Windows.Forms/Assembly/AssemblyInfo.cs
index 39fc0acfe0a..9f94433c9b9 100644
--- a/mcs/class/System.Windows.Forms/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Windows.Forms/Assembly/AssemblyInfo.cs
@@ -35,7 +35,6 @@ using System.Diagnostics;
[assembly: AllowPartiallyTrustedCallers]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../ecma.pub")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
diff --git a/mcs/class/System.Windows.Forms/Makefile b/mcs/class/System.Windows.Forms/Makefile
index e9802b18590..6480c58009b 100644
--- a/mcs/class/System.Windows.Forms/Makefile
+++ b/mcs/class/System.Windows.Forms/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Windows.Forms.dll
LIB_REFS = System System.Xml System.Drawing Accessibility System.Data Mono.Posix Mono.WebBrowser System.Configuration System.Runtime.Serialization.Formatters.Soap
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS = /unsafe \
@System.Windows.Forms.dll.resources \
-nowarn:618,612,809
diff --git a/mcs/class/System.Windows/AssemblyInfo.cs b/mcs/class/System.Windows/AssemblyInfo.cs
index e7b124905a3..24e90bb8d5c 100644
--- a/mcs/class/System.Windows/AssemblyInfo.cs
+++ b/mcs/class/System.Windows/AssemblyInfo.cs
@@ -39,4 +39,3 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../msfinal.pub")]
diff --git a/mcs/class/System.Windows/Makefile b/mcs/class/System.Windows/Makefile
index c24e79129a6..de1c0bf5c7f 100644
--- a/mcs/class/System.Windows/Makefile
+++ b/mcs/class/System.Windows/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Windows.dll
LIB_REFS = System
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS =
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/System.Xml.Serialization/AssemblyInfo.cs b/mcs/class/System.Xml.Serialization/AssemblyInfo.cs
index 67be7c03bdb..2e0aa9a3eaf 100644
--- a/mcs/class/System.Xml.Serialization/AssemblyInfo.cs
+++ b/mcs/class/System.Xml.Serialization/AssemblyInfo.cs
@@ -39,4 +39,3 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
diff --git a/mcs/class/System.Xml.Serialization/Makefile b/mcs/class/System.Xml.Serialization/Makefile
index f67cf54e8cc..230c5cd25fb 100644
--- a/mcs/class/System.Xml.Serialization/Makefile
+++ b/mcs/class/System.Xml.Serialization/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = System.Xml.Serialization.dll
LIB_REFS = System.Xml System.ServiceModel
+KEYFILE = ../ecma.pub
LIB_MCS_FLAGS =
PLATFORM_DEBUG_FLAGS =
diff --git a/mcs/class/SystemWebTestShim/Assembly/AssemblyInfo.cs b/mcs/class/SystemWebTestShim/Assembly/AssemblyInfo.cs
index 51a924c8275..83d0a36c2b6 100644
--- a/mcs/class/SystemWebTestShim/Assembly/AssemblyInfo.cs
+++ b/mcs/class/SystemWebTestShim/Assembly/AssemblyInfo.cs
@@ -48,4 +48,3 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("(c) 2003 Various Authors")]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
diff --git a/mcs/class/SystemWebTestShim/Makefile b/mcs/class/SystemWebTestShim/Makefile
index 6bf2ea3c9d2..3cfede1ab10 100644
--- a/mcs/class/SystemWebTestShim/Makefile
+++ b/mcs/class/SystemWebTestShim/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = SystemWebTestShim.dll
LIB_REFS = System.Web System
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS =
NO_INSTALL = yes
diff --git a/mcs/class/WebMatrix.Data/Assembly/AssemblyInfo.cs b/mcs/class/WebMatrix.Data/Assembly/AssemblyInfo.cs
index 83267087b61..c67214a8346 100644
--- a/mcs/class/WebMatrix.Data/Assembly/AssemblyInfo.cs
+++ b/mcs/class/WebMatrix.Data/Assembly/AssemblyInfo.cs
@@ -15,4 +15,3 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../mono.pub")]
diff --git a/mcs/class/WebMatrix.Data/Makefile b/mcs/class/WebMatrix.Data/Makefile
index 2ee3b170c48..781ebe75f42 100644
--- a/mcs/class/WebMatrix.Data/Makefile
+++ b/mcs/class/WebMatrix.Data/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = WebMatrix.Data.dll
LIB_REFS = System System.Data System.Core System.Configuration
+KEYFILE = ../mono.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS =
TEST_LIB_REFS = System System.Core System.Data Mono.Data.Sqlite Microsoft.CSharp
diff --git a/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs b/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs
index 02780da33bf..0e831d2dd88 100644
--- a/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs
+++ b/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs
@@ -47,7 +47,6 @@ using System.Windows.Markup;
[assembly: NeutralResourcesLanguage ("en")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx3.pub")]
[assembly: ComVisible (false)]
[assembly: AllowPartiallyTrustedCallers]
diff --git a/mcs/class/WindowsBase/Makefile b/mcs/class/WindowsBase/Makefile
index 89ff47516df..a6b99082151 100644
--- a/mcs/class/WindowsBase/Makefile
+++ b/mcs/class/WindowsBase/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = WindowsBase.dll
LIB_REFS = System System.Xml
+KEYFILE = ../winfx3.pub
LIB_MCS_FLAGS = -unsafe -nowarn:67,618
TEST_MCS_FLAGS = -unsafe
TEST_LIB_REFS = WindowsBase System System.Xml System.Core System.IO.Compression
diff --git a/mcs/class/monodoc/Assembly/AssemblyInfo.cs b/mcs/class/monodoc/Assembly/AssemblyInfo.cs
index 4b39ca9bc28..a6253e9eabc 100644
--- a/mcs/class/monodoc/Assembly/AssemblyInfo.cs
+++ b/mcs/class/monodoc/Assembly/AssemblyInfo.cs
@@ -3,4 +3,3 @@ using System.Runtime.CompilerServices;
[assembly:AssemblyVersion("1.0.0.0")]
[assembly:AssemblyDelaySign(true)]
-[assembly:AssemblyKeyFile("../../class/mono.snk")]
diff --git a/mcs/class/monodoc/Makefile b/mcs/class/monodoc/Makefile
index d84f7a1ac3e..90ce49077ec 100644
--- a/mcs/class/monodoc/Makefile
+++ b/mcs/class/monodoc/Makefile
@@ -4,6 +4,7 @@ include ../../build/rules.make
LIBRARY = monodoc.dll
LIBRARY_PACKAGE = monodoc
+KEYFILE = ../../class/mono.snk
# Remove a bunch of "obsolete"-type warning for Lucene.NET
# also activate legacy mode to compile old monodoc.dll api
LOCAL_MCS_FLAGS = /nowarn:618,612,672,809,414,649 /define:LEGACY_MODE