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