Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes

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

diff --git a/mcs/class/System.Json/Assembly/AssemblyInfo.cs b/mcs/class/System.Json/Assembly/AssemblyInfo.cs
index 101feeefa615394b4774b4ac430f0d5e0a7c0c1f..b8c49cd952bd53eac4e7967132dddbb9b7d678c5 100755 (executable)
--- a/mcs/class/System.Json/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Json/Assembly/AssemblyInfo.cs
@@ -36,7 +36,6 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about the System.Json assembly
-// v3.5 Assembly
 
 [assembly: AssemblyTitle ("System.Json.dll")]
 [assembly: AssemblyDescription ("System.Json.dll")]
@@ -51,29 +50,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 
 [assembly: NeutralResourcesLanguage ("en-US")]
-#if !NET_2_1
-[assembly: CLSCompliant (true)]
-#endif
 [assembly: AssemblyDelaySign (true)]
-#if NET_2_1
-       [assembly: AssemblyKeyFile ("../silverlight.pub")]
-#else
-       [assembly: AssemblyKeyFile ("../silverlight.pub")] // easing InternalVisibleTo use.
-#endif
+[assembly: AssemblyKeyFile ("../winfx.pub")]
 
 [assembly: ComVisible (false)]
-#if !NET_2_1
-[assembly: AllowPartiallyTrustedCallers]
-#endif
 
-[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-// Extension attribute should be added by compiler
-
-/*
-[assembly: StringFreezing]
-[assembly: DefaultDependency (LoadHint.Always)]
-*/
 [assembly: SecurityCritical]
-[assembly: SecurityPermission (SecurityAction.RequestMinimum, SkipVerification = true)]