Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mcs / class / System.Security / Assembly / AssemblyInfo.cs

diff --git a/mcs/class/System.Security/Assembly/AssemblyInfo.cs b/mcs/class/System.Security/Assembly/AssemblyInfo.cs
old mode 100755 (executable)
new mode 100644 (file)
index 0f99b15..35601fe
--- a/mcs/class/System.Security/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Security/Assembly/AssemblyInfo.cs
@@ -6,7 +6,7 @@
 //     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2003 Ximian, Inc.  http://www.ximian.com
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -29,42 +29,34 @@
 //
 
 using System;
+using System.Diagnostics;
 using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Security;
+using System.Security.Permissions;
 
-// General Information about the system assembly
+// General Information about the System.Security assembly
 
-#if (NET_1_0)
-       [assembly: AssemblyVersion ("1.0.3300.0")]
-       [assembly: SatelliteContractVersion ("1.0.3300.0")]
-#elif (NET_2_0)
-        [assembly: AssemblyVersion ("2.0.3600.0")]
-       [assembly: SatelliteContractVersion ("2.0.3600.0")]
-#elif (NET_1_1)
-       [assembly: AssemblyVersion ("1.0.5000.0")]
-       [assembly: SatelliteContractVersion ("1.0.5000.0")]
-#endif
+[assembly: AssemblyVersion (Consts.FxVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
 
 [assembly: CLSCompliant (true)]
 [assembly: ComVisible (false)]
 [assembly: NeutralResourcesLanguage ("en-US")]
 
 [assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../msfinal.pub")]
 
-#if NET_2_0
-[assembly: AssemblyCompany ("MONO development team")]
-[assembly: AssemblyCopyright ("Copyright (C) 2002-2004 Various Authors")]
-[assembly: AssemblyDefaultAlias ("")]
+[assembly: AssemblyDefaultAlias ("System.Security.dll")]
 [assembly: AssemblyDescription ("System.Security.dll")]
-[assembly: AssemblyFileVersion ("")]
-[assembly: AssemblyInformationalVersion ("")]
-[assembly: AssemblyProduct ("MONO CLI")]
 [assembly: AssemblyTitle ("System.Security.dll")]
-[assembly: AllowPartiallyTrustedCallers ()]
 
-[module: CompilationRelaxations (0)]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+
+[assembly: AssemblyCompany (Consts.MonoCompany)]
+[assembly: AssemblyProduct (Consts.MonoProduct)]
+[assembly: AssemblyCopyright (Consts.MonoCopyright)]
+
+[assembly: AllowPartiallyTrustedCallers]