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.ServiceModel.Activation
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.ServiceModel.Activation')
-rw-r--r--mcs/class/System.ServiceModel.Activation/Assembly/AssemblyInfo.cs2
-rw-r--r--mcs/class/System.ServiceModel.Activation/Makefile1
2 files changed, 1 insertions, 2 deletions
diff --git a/mcs/class/System.ServiceModel.Activation/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel.Activation/Assembly/AssemblyInfo.cs
index f47e8798819..23a8b15d367 100644
--- a/mcs/class/System.ServiceModel.Activation/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ServiceModel.Activation/Assembly/AssemblyInfo.cs
@@ -53,8 +53,6 @@ using System.Runtime.InteropServices;
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../winfx.pub")]
-
[assembly: ComVisible (false)]
[assembly: InternalsVisibleTo ("System.ServiceModel, PublicKey=00000000000000000400000000000000")]
diff --git a/mcs/class/System.ServiceModel.Activation/Makefile b/mcs/class/System.ServiceModel.Activation/Makefile
index 2be1563c1d7..e8c0e953fd2 100644
--- a/mcs/class/System.ServiceModel.Activation/Makefile
+++ b/mcs/class/System.ServiceModel.Activation/Makefile
@@ -5,6 +5,7 @@ include ../../build/rules.make
LIBRARY = System.ServiceModel.Activation.dll
LIB_REFS = System.Core System plainservice/System.ServiceModel
+KEYFILE = ../winfx.pub
LIB_MCS_FLAGS =
TEST_MCS_FLAGS =