Merge pull request #2705 from kumpera/loader-error-cleanup7

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

diff --git a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
index 53bce36c63ad18133e3a045b04d852ae4f2461ad..87b059215a3e1fb55e364dfe6971b42b950b9894 100644 (file)
--- a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
@@ -47,19 +47,14 @@ using System.Security.Permissions;
 [assembly: AssemblyCompany (Consts.MonoCompany)]
 [assembly: AssemblyProduct (Consts.MonoProduct)]
 [assembly: AssemblyCopyright (Consts.MonoCopyright)]
-#if NET_3_5
        [assembly: AssemblyVersion (Consts.FxVersion)]
        [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-#else
-       [assembly: AssemblyVersion ("1.0.61025.0")]
-       [assembly: AssemblyInformationalVersion ("1.0.61025.0")]
-#endif
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 
 [assembly: NeutralResourcesLanguage ("en-US")]
 
-#if !(TARGET_JVM || TARGET_DOTNET)
+#if !(TARGET_DOTNET)
        [assembly: CLSCompliant (true)]
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile ("../winfx.pub")]
@@ -79,10 +74,6 @@ using System.Security.Permissions;
 [assembly: WebResource ("MicrosoftAjaxWebForms.debug.js", "application/x-javascript")]
 [assembly: WebResource ("MicrosoftAjaxTimer.js", "application/x-javascript")]
 [assembly: WebResource ("MicrosoftAjaxTimer.debug.js", "application/x-javascript")]
-#if TARGET_J2EE
-       [assembly: WebResource ("MicrosoftAjaxExtension.js", "application/x-javascript")]
-       [assembly: WebResource ("MicrosoftAjaxWebFormsExtension.js", "application/x-javascript")]
-#endif
 
 // Those entries must not be enabled until the appropriate .resx files with translations for the client scripts are
 // created.