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.Configuration
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.Configuration')
-rw-r--r--mcs/class/System.Configuration/Assembly/AssemblyInfo.cs1
-rw-r--r--mcs/class/System.Configuration/Makefile1
2 files changed, 1 insertions, 1 deletions
diff --git a/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs b/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs
index 49025b78c09..a850786fa21 100644
--- a/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Configuration/Assembly/AssemblyInfo.cs
@@ -57,7 +57,6 @@ using System.Runtime.InteropServices;
[assembly: AllowPartiallyTrustedCallers]
[assembly: AssemblyDelaySign (true)]
- [assembly: AssemblyKeyFile ("../msfinal.pub")]
[assembly: InternalsVisibleTo ("System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
diff --git a/mcs/class/System.Configuration/Makefile b/mcs/class/System.Configuration/Makefile
index e6f48050a99..918a4e9325e 100644
--- a/mcs/class/System.Configuration/Makefile
+++ b/mcs/class/System.Configuration/Makefile
@@ -7,6 +7,7 @@ LIBRARY = System.Configuration.dll
LOCAL_MCS_FLAGS =
LIB_REFS = secxml/System bare/System.Xml System.Security
+KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = -nowarn:618
TEST_MCS_FLAGS =
TEST_LIB_REFS = System.Xml System