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.Composition.4.5 | |
| 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.Composition.4.5')
| -rw-r--r-- | mcs/class/System.ComponentModel.Composition.4.5/Makefile | 1 | ||||
| -rw-r--r-- | mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/mcs/class/System.ComponentModel.Composition.4.5/Makefile b/mcs/class/System.ComponentModel.Composition.4.5/Makefile index b5c914f72b1..2ced9882dae 100644 --- a/mcs/class/System.ComponentModel.Composition.4.5/Makefile +++ b/mcs/class/System.ComponentModel.Composition.4.5/Makefile @@ -10,6 +10,7 @@ ifndef NO_RESGEN RESOURCE_DEFS = Microsoft.Internal.Strings,src/ComponentModel/Strings.resx endif +KEYFILE = ../ecma.pub LIB_MCS_FLAGS = -d:CLR40 -d:USE_ECMA_KEY,FEATURE_REFLECTIONCONTEXT,FEATURE_REFLECTIONFILEIO,FEATURE_SERIALIZATION,FEATURE_SLIMLOCK -nowarn:219,414 -nowarn:436 diff --git a/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs b/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs index a1cceccbcd3..85e91c4f565 100644 --- a/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.ComponentModel.Composition.4.5/src/Assembly/AssemblyInfo.cs @@ -53,7 +53,6 @@ using System.Runtime.InteropServices; [assembly: CLSCompliant (true)] [assembly: AssemblyDelaySign (true)] -[assembly: AssemblyKeyFile ("../ecma.pub")] [assembly: SecurityCritical] [assembly: AllowPartiallyTrustedCallers] |