From 33d2d526448c17dd50e171804c614ef16d66e6aa Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Mon, 7 Aug 2017 08:03:48 -0400 Subject: [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) --- mcs/class/System.Data.Services/Assembly/AssemblyInfo.cs | 1 - mcs/class/System.Data.Services/Makefile | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'mcs/class/System.Data.Services') diff --git a/mcs/class/System.Data.Services/Assembly/AssemblyInfo.cs b/mcs/class/System.Data.Services/Assembly/AssemblyInfo.cs index 64ce7b2bb47..fcec6633d3e 100644 --- a/mcs/class/System.Data.Services/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Data.Services/Assembly/AssemblyInfo.cs @@ -21,7 +21,6 @@ using System.Security; [assembly: NeutralResourcesLanguage ("en-US")] [assembly: AssemblyDelaySign (true)] -[assembly: AssemblyKeyFile ("../ecma.pub")] [assembly: ComVisible (false)] [assembly: CLSCompliant (true)] diff --git a/mcs/class/System.Data.Services/Makefile b/mcs/class/System.Data.Services/Makefile index b5fb3cb6fdd..c1cb788e648 100644 --- a/mcs/class/System.Data.Services/Makefile +++ b/mcs/class/System.Data.Services/Makefile @@ -5,6 +5,7 @@ include ../../build/rules.make LIBRARY = System.Data.Services.dll LIB_REFS = System System.Core System.ServiceModel System.ServiceModel.Web System.Data.Services.Client +KEYFILE = ../ecma.pub LIB_MCS_FLAGS = -d:NET_3_5 ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) -- cgit v1.2.3