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.ComponentModel.DataAnnotations | |
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.ComponentModel.DataAnnotations')
-rw-r--r-- | mcs/class/System.ComponentModel.DataAnnotations/Assembly/AssemblyInfo.cs | 1 | ||||
-rw-r--r-- | mcs/class/System.ComponentModel.DataAnnotations/Makefile | 1 |
2 files changed, 1 insertions, 1 deletions
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) |