From 8e8b8bdea10c2ea7d28d60fa3ae91c564f3d8ee4 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 4 Apr 2016 09:20:59 +0200
Subject: [PATCH] Revert "Removes old obsoleted ping.aspx"

This reverts commit 453efc02a5370b477a36bd4aadb7a8084d348438.

Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

U4-8274 '/umbraco/ping.aspx' is missing
---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  3 ++
 src/Umbraco.Web.UI/umbraco/ping.aspx          |  2 +
 src/Umbraco.Web/Umbraco.Web.csproj            |  3 ++
 .../umbraco.presentation/umbraco/ping.aspx.cs | 38 +++++++++++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 src/Umbraco.Web.UI/umbraco/ping.aspx
 create mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/ping.aspx.cs

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 8f1f01f137..2f48f4a2e3 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -2241,6 +2241,9 @@
     <Content Include="Umbraco\Members\EditMemberGroup.aspx">
       <SubType>Form</SubType>
     </Content>
+    <Content Include="Umbraco\ping.aspx">
+      <SubType>Form</SubType>
+    </Content>	
     <Content Include="Umbraco\publishStatus.aspx" />
     <Content Include="Umbraco\Settings\EditDictionaryItem.aspx" />
     <Content Include="Umbraco\Settings\editLanguage.aspx" />
diff --git a/src/Umbraco.Web.UI/umbraco/ping.aspx b/src/Umbraco.Web.UI/umbraco/ping.aspx
new file mode 100644
index 0000000000..d79e25b2a1
--- /dev/null
+++ b/src/Umbraco.Web.UI/umbraco/ping.aspx
@@ -0,0 +1,2 @@
+<%@ Page language="c#" AutoEventWireup="True"  %>
+I'm alive!
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 7aec0b676f..35dc036fd3 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1088,6 +1088,9 @@
     <Compile Include="umbraco.presentation\umbraco\tree.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="umbraco.presentation\umbraco\ping.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="umbraco.presentation\umbraco\create\PartialViewMacrosTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\create\PartialViewTasks.cs" />
     <Compile Include="umbraco.presentation\umbraco\developer\Macros\editMacro.aspx.cs">
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/ping.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/ping.aspx.cs
new file mode 100644
index 0000000000..410ada9f4d
--- /dev/null
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/ping.aspx.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Web;
+using System.Web.SessionState;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.HtmlControls;
+
+namespace umbraco.presentation
+{
+
+    [Obsolete("This class will be removed in future versions.")]
+	[EditorBrowsable(EditorBrowsableState.Never)]
+    public partial class ping : System.Web.UI.Page
+    {
+        #region Web Form Designer generated code
+        override protected void OnInit(EventArgs e)
+        {
+            //
+            // CODEGEN: This call is required by the ASP.NET Web Form Designer.
+            //
+            InitializeComponent();
+            base.OnInit(e);
+        }
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+        }
+        #endregion
+    }
+}