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