Merge pull request #4542 from lateralusX/jlorenss/win-fix-unwind-tramp-reg-aot

[mono.git] / mcs / class / System.Web.Extensions / System.Web.Handlers / ScriptResourceHandler.cs

diff --git a/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs b/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs
index 3961c95284595038ea6d7a73a3167c59bd949046..d9f7d9d14f231d8d4ee744f0622adfd64f2d1793 100644 (file)
--- a/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.Handlers/ScriptResourceHandler.cs
@@ -62,7 +62,6 @@ namespace System.Web.Handlers
                }\r
 \r
                #endregion\r
-#if NET_3_5\r
                void AppendResourceScriptContents (StringWriter sw, CompositeEntry entry)\r
                {\r
                        if (entry.Assembly == null || entry.Attribute == null || String.IsNullOrEmpty (entry.NameOrPath))\r
@@ -134,7 +133,6 @@ namespace System.Web.Handlers
                        if (entries.Count == 0)\r
                                throw new HttpException (404, "Resource not found");\r
 \r
-                       long atime;\r
                        DateTime modifiedSince;\r
                        bool hasIfModifiedSince = HasIfModifiedSince (context.Request, out modifiedSince);\r
                        \r
@@ -179,7 +177,6 @@ namespace System.Web.Handlers
                        if (notifyScriptLoaded)\r
                                OutputScriptLoadedNotification (response.Output);\r
                }\r
-#endif\r
                void OutputScriptLoadedNotification (TextWriter writer)\r
                {\r
                        writer.WriteLine ();\r
@@ -190,13 +187,11 @@ namespace System.Web.Handlers
                {\r
                        HttpRequest request = context.Request;\r
                        bool notifyScriptLoaded = request.QueryString ["n"] == "t";\r
-#if NET_3_5\r
                        List <CompositeEntry> compositeEntries = CompositeScriptReference.GetCompositeScriptEntries (request.RawUrl);\r
                        if (compositeEntries != null) {\r
                                SendCompositeScript (context, request, notifyScriptLoaded, compositeEntries);\r
                                return;\r
                        }\r
-#endif\r
                        EmbeddedResource res;\r
                        Assembly assembly;                      \r
                        SendEmbeddedResource (context, out res, out assembly);\r
@@ -247,7 +242,6 @@ namespace System.Web.Handlers
                        if (notifyScriptLoaded)\r
                                OutputScriptLoadedNotification (writer);\r
                }\r
-#if NET_3_5\r
                static void CheckIfResourceIsCompositeScript (string resourceName, ref bool includeTimeStamp)\r
                {\r
                        bool isCompositeScript = resourceName.StartsWith (CompositeScriptReference.COMPOSITE_SCRIPT_REFERENCE_PREFIX, StringComparison.Ordinal);\r
@@ -261,7 +255,6 @@ namespace System.Web.Handlers
                {\r
                        return false;\r
                }\r
-#endif\r
                // TODO: add value cache?\r
                static string GetScriptStringLiteral (string value)\r
                {\r