diff options
author | Zoltan Varga <vargaz@gmail.com> | 2017-08-07 15:03:48 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-08-07 15:03:48 +0300 |
commit | 33d2d526448c17dd50e171804c614ef16d66e6aa (patch) | |
tree | 17193f3e8b6704bf43cf518430562606365ab9d6 /mcs/class/System.Windows.Forms | |
parent | c65f48052a483ab8a06ff5839d5e346ac9e39c97 (diff) |
[bcl] Specify the name of the key file on the command line instead of using the AssemblyKeyFile attribute for consistency and to make it easier to do path name manipulation on the file name. (#5316)
Diffstat (limited to 'mcs/class/System.Windows.Forms')
-rw-r--r-- | mcs/class/System.Windows.Forms/Assembly/AssemblyInfo.cs | 1 | ||||
-rw-r--r-- | mcs/class/System.Windows.Forms/Makefile | 1 |
2 files changed, 1 insertions, 1 deletions
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 |