Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -538,29 +538,11 @@ namespace Mono.AssemblyLinker
private void SetKeyPair (AssemblyName aname)
{
#if ONLY_1_1
switch (delaysign) {
case DelaySign.Yes:
AddCattr (typeof (AssemblyDelaySignAttribute),
typeof (bool), true);
break;
case DelaySign.No:
AddCattr (typeof (AssemblyDelaySignAttribute),
typeof (bool), false);
break;
}
#endif
if (keyfile != null) {
if (!File.Exists (keyfile)) {
Report (1044, String.Format ("Couldn't open '{0}' key file.", keyfile));
}
#if ONLY_1_1
AddCattr (typeof (AssemblyKeyFileAttribute),
keyfile);
#endif
using (FileStream fs = File.OpenRead (keyfile)) {
byte[] data = new byte [fs.Length];
try {
@@ -590,10 +572,6 @@ namespace Mono.AssemblyLinker
fs.Close ();
}
} else if (keyname != null) {
#if ONLY_1_1
AddCattr (typeof (AssemblyKeyNameAttribute),
keyname);
#endif
// delay-sign doesn't apply to key containers
aname.KeyPair = new StrongNameKeyPair (keyname);
}