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.Data.OracleClient | |
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.Data.OracleClient')
-rw-r--r-- | mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs | 1 | ||||
-rw-r--r-- | mcs/class/System.Data.OracleClient/Makefile | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs index ae6d540857f..ee792bac6f3 100644 --- a/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Data.OracleClient/Assembly/AssemblyInfo.cs @@ -34,7 +34,6 @@ using System.Runtime.InteropServices; [assembly: CLSCompliant (true)] [assembly: AssemblyDelaySign (true)] - [assembly: AssemblyKeyFile ("../ecma.pub")] [assembly: AssemblyFileVersion (Consts.FxFileVersion)] [assembly: AllowPartiallyTrustedCallers] diff --git a/mcs/class/System.Data.OracleClient/Makefile b/mcs/class/System.Data.OracleClient/Makefile index 2a70299375e..66fbba34971 100644 --- a/mcs/class/System.Data.OracleClient/Makefile +++ b/mcs/class/System.Data.OracleClient/Makefile @@ -4,6 +4,7 @@ include ../../build/rules.make LIBRARY = System.Data.OracleClient.dll LIB_REFS = System System.Xml System.Data System.EnterpriseServices System.Drawing +KEYFILE = ../ecma.pub LIB_MCS_FLAGS = TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618 |