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