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.Runtime.DurableInstancing | |
| 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.Runtime.DurableInstancing')
| -rw-r--r-- | mcs/class/System.Runtime.DurableInstancing/Assembly/AssemblyInfo.cs | 5 | ||||
| -rw-r--r-- | mcs/class/System.Runtime.DurableInstancing/Makefile | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/mcs/class/System.Runtime.DurableInstancing/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.DurableInstancing/Assembly/AssemblyInfo.cs index 3b6de7e3067..04271f11748 100644 --- a/mcs/class/System.Runtime.DurableInstancing/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Runtime.DurableInstancing/Assembly/AssemblyInfo.cs @@ -55,10 +55,7 @@ using System.Runtime.InteropServices; [assembly: NeutralResourcesLanguage ("en-US")] [assembly: CLSCompliant (true)] [assembly: AssemblyDelaySign (true)] -#if MOBILE -[assembly: AssemblyKeyFile ("../silverlight.pub")] -#else -[assembly: AssemblyKeyFile ("../winfx.pub")] +#if !MOBILE [assembly: AllowPartiallyTrustedCallers] [assembly: ComCompatibleVersion (1, 0, 3300, 0)] #endif diff --git a/mcs/class/System.Runtime.DurableInstancing/Makefile b/mcs/class/System.Runtime.DurableInstancing/Makefile index 3db6eeb9c15..eb1233ff7c8 100644 --- a/mcs/class/System.Runtime.DurableInstancing/Makefile +++ b/mcs/class/System.Runtime.DurableInstancing/Makefile @@ -6,6 +6,12 @@ LIBRARY = System.Runtime.DurableInstancing.dll LIB_REFS = System System.Xml System.Core System.Xml.Linq System.Transactions System.ServiceModel.Internals System.Runtime.Serialization LIB_MCS_FLAGS = +ifdef MOBILE_PROFILE +KEYFILE = ../silverlight.pub +else +KEYFILE = ../winfx.pub +endif + TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = $(RESOURCE_FILES) |