Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Varga <vargaz@gmail.com>2017-08-07 15:03:48 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2017-08-07 15:03:48 +0300
commit33d2d526448c17dd50e171804c614ef16d66e6aa (patch)
tree17193f3e8b6704bf43cf518430562606365ab9d6 /mcs/class/System.Web.Extensions.Design
parentc65f48052a483ab8a06ff5839d5e346ac9e39c97 (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.Web.Extensions.Design')
-rw-r--r--mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Web.Extensions.Design/Makefile1
2 files changed, 1 insertions, 1 deletions
diff --git a/mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs
index 50340619e30..75ca721f837 100644
--- a/mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Extensions.Design/Assembly/AssemblyInfo.cs
@@ -56,7 +56,6 @@ using System.Security;
#if !(TARGET_DOTNET)
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile ("../winfx.pub")]
#endif
[assembly: ComVisible (false)]
diff --git a/mcs/class/System.Web.Extensions.Design/Makefile b/mcs/class/System.Web.Extensions.Design/Makefile
index 6ea70f5bf6c..38b7c6647ba 100644
--- a/mcs/class/System.Web.Extensions.Design/Makefile
+++ b/mcs/class/System.Web.Extensions.Design/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.Web.Extensions.Design.dll
LIB_REFS = System System.Design System.Drawing System.Windows.Forms
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS = -define:NET_3_5
include ../../build/library.make