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.Linq | |
| 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.Linq')
3 files changed, 2 insertions, 1 deletions
diff --git a/mcs/class/System.Data.Linq/Makefile b/mcs/class/System.Data.Linq/Makefile index 15a84430222..b55cdb9e3c5 100644 --- a/mcs/class/System.Data.Linq/Makefile +++ b/mcs/class/System.Data.Linq/Makefile @@ -4,6 +4,7 @@ include ../../build/rules.make LIBRARY = System.Data.Linq.dll LIB_REFS = System System.Core System.Xml System.Data System.Runtime.Serialization +KEYFILE = ../ecma.pub LIB_MCS_FLAGS = \ /resource:./src/DbLinq/Schema/Dbml/DbmlSchema.xsd,DbLinq.Schema.Dbml.DbmlSchema.xsd \ /d:MONO_STRICT /d:MONO_DEPLOY -warn:1 diff --git a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Assembly/AssemblyInfo.cs index 04a391d4dfc..16668d8ba85 100644 --- a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Assembly/AssemblyInfo.cs @@ -57,7 +57,6 @@ using DbLinq.Factory; [assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
#endif
[assembly: ComVisible (false)]
diff --git a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile index befed69def8..20cc4b10bca 100644 --- a/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile +++ b/mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile @@ -4,6 +4,7 @@ include ../../build/rules.make LIBRARY = System.Data.Linq.dll LIB_REFS = System System.Core System.Data System.Transactions System.Xml +KEYFILE = ../ecma.pub LIB_MCS_FLAGS = NO_TEST = yes |