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.ServiceModel.Routing | |
| 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.ServiceModel.Routing')
| -rw-r--r-- | mcs/class/System.ServiceModel.Routing/Assembly/AssemblyInfo.cs | 5 | ||||
| -rw-r--r-- | mcs/class/System.ServiceModel.Routing/Makefile | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mcs/class/System.ServiceModel.Routing/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel.Routing/Assembly/AssemblyInfo.cs index 0202afecb93..712a1c56021 100644 --- a/mcs/class/System.ServiceModel.Routing/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.ServiceModel.Routing/Assembly/AssemblyInfo.cs @@ -54,8 +54,3 @@ using System.Runtime.InteropServices; [assembly: ComVisible (false)] [assembly: AssemblyDelaySign (true)] -#if MOBILE -[assembly: AssemblyKeyFile ("../silverlight.pub")] -#else -[assembly: AssemblyKeyFile("../winfx.pub")] -#endif diff --git a/mcs/class/System.ServiceModel.Routing/Makefile b/mcs/class/System.ServiceModel.Routing/Makefile index f8d30f60025..4c5b0a74817 100644 --- a/mcs/class/System.ServiceModel.Routing/Makefile +++ b/mcs/class/System.ServiceModel.Routing/Makefile @@ -11,6 +11,12 @@ LIB_REFS += System.Configuration LIB_MCS_FLAGS += -d:NET_3_5 -d:NET_3_0 endif +ifdef MOBILE_PROFILE +KEYFILE = ../silverlight.pub +else +KEYFILE = ../winfx.pub +endif + TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = $(RESOURCE_FILES) |