Update ASP.NET samples with latest templates

samples/aspnetapp/aspnetapp.sln

@@ -1,34 +1,22 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.2043
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35521.163 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aspnetapp", "aspnetapp\aspnetapp.csproj", "{8C2399E7-5551-49FD-8C0C-CCAA2FA8C528}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E8569ED5-912E-43BB-AD73-3B9DBB56EC52}"
-	ProjectSection(SolutionItems) = preProject
-		.dockerignore = .dockerignore
-		deploy-container-to-aci.md = deploy-container-to-aci.md
-		Dockerfile = Dockerfile
-		Dockerfile.windowsservercore-ltsc2016 = Dockerfile.windowsservercore-ltsc2016
-		README.md = README.md
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aspnetapp", "aspnetapp\aspnetapp.csproj", "{0EBC2182-864F-47B6-B3D2-219EB6C92DEE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8C2399E7-5551-49FD-8C0C-CCAA2FA8C528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C2399E7-5551-49FD-8C0C-CCAA2FA8C528}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C2399E7-5551-49FD-8C0C-CCAA2FA8C528}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C2399E7-5551-49FD-8C0C-CCAA2FA8C528}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EBC2182-864F-47B6-B3D2-219EB6C92DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EBC2182-864F-47B6-B3D2-219EB6C92DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EBC2182-864F-47B6-B3D2-219EB6C92DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EBC2182-864F-47B6-B3D2-219EB6C92DEE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {594D2B7F-0B98-470D-978A-0214E48CF075}
-	EndGlobalSection
 EndGlobal

samples/aspnetapp/aspnetapp/About.aspx

@@ -1,30 +1,33 @@
 <%@ Import Namespace="System.Runtime.InteropServices" %>
+
 <%@ Page Title="About" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="aspnetapp.About" %>
 
 <asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
-    <h2><%: Title %>.</h2>
-    <div align="center">
-        <table class="table table-striped table-hover">
-            <tr>
-                <td>.NET version</td>
-                <td><%= RuntimeInformation.FrameworkDescription %></td>
-            </tr>
-            <tr>
-                <td>Operating system</td>
-                <td><%= RuntimeInformation.OSDescription %></td>
-            </tr>
-            <tr>
-                <td>Processor architecture</td>
-                <td><%= RuntimeInformation.OSArchitecture %></td>
-            </tr>
-            <tr>
-                <td>CPU cores</td>
-                <td><%= Environment.ProcessorCount %></td>
-            </tr>
-            <tr>
-                <td>DOTNET_RUNNING_IN_CONTAINER</td>
-                <td><%= (Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") is null ? "false" : "true") %></td>
-            </tr>
-        </table>
-    </div>
+    <main aria-labelledby="title">
+        <h2 id="title"><%: Title %>.</h2>
+        <div align="center">
+            <table class="table table-striped table-hover">
+                <tr>
+                    <td>.NET version</td>
+                    <td><%= RuntimeInformation.FrameworkDescription %></td>
+                </tr>
+                <tr>
+                    <td>Operating system</td>
+                    <td><%= RuntimeInformation.OSDescription %></td>
+                </tr>
+                <tr>
+                    <td>Processor architecture</td>
+                    <td><%= RuntimeInformation.OSArchitecture %></td>
+                </tr>
+                <tr>
+                    <td>CPU cores</td>
+                    <td><%= Environment.ProcessorCount %></td>
+                </tr>
+                <tr>
+                    <td>DOTNET_RUNNING_IN_CONTAINER</td>
+                    <td><%= (Environment.GetEnvironmentVariable("DOTNET_RUNNING_IN_CONTAINER") is null ? "false" : "true") %></td>
+                </tr>
+            </table>
+        </div>
+    </main>
 </asp:Content>

samples/aspnetapp/aspnetapp/App_Start/BundleConfig.cs

@@ -12,6 +12,8 @@ public class BundleConfig
         // For more information on Bundling, visit https://go.microsoft.com/fwlink/?LinkID=303951
         public static void RegisterBundles(BundleCollection bundles)
         {
+            RegisterJQueryScriptManager();
+
             bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include(
                             "~/Scripts/WebForms/WebForms.js",
                             "~/Scripts/WebForms/WebUIValidation.js",
@@ -34,5 +36,17 @@ public static void RegisterBundles(BundleCollection bundles)
             bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
                             "~/Scripts/modernizr-*"));
         }
+
+        public static void RegisterJQueryScriptManager()
+        {
+            ScriptManager.ScriptResourceMapping.AddDefinition("jquery",
+                new ScriptResourceDefinition
+                {
+                    Path = "~/scripts/jquery-3.7.0.min.js",
+                    DebugPath = "~/scripts/jquery-3.7.0.js",
+                    CdnPath = "http://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.7.0.min.js",
+                    CdnDebugPath = "http://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.7.0.js"
+                });
+        }
     }
 }

samples/aspnetapp/aspnetapp/Contact.aspx

@@ -1,17 +1,19 @@
 <%@ Page Title="Contact" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Contact.aspx.cs" Inherits="aspnetapp.Contact" %>
 
 <asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
-    <h2><%: Title %>.</h2>
-    <h3>Your contact page.</h3>
-    <address>
-        One Microsoft Way<br />
-        Redmond, WA 98052-6399<br />
-        <abbr title="Phone">P:</abbr>
-        425.555.0100
-    </address>
+    <main aria-labelledby="title">
+        <h2 id="title"><%: Title %>.</h2>
+        <h3>Your contact page.</h3>
+        <address>
+            One Microsoft Way<br />
+            Redmond, WA 98052-6399<br />
+            <abbr title="Phone">P:</abbr>
+            425.555.0100
+        </address>
 
-    <address>
-        <strong>Support:</strong>   <a href="mailto:[email protected]">[email protected]</a><br />
-        <strong>Marketing:</strong> <a href="mailto:[email protected]">[email protected]</a>
-    </address>
+        <address>
+            <strong>Support:</strong>   <a href="mailto:[email protected]">[email protected]</a><br />
+            <strong>Marketing:</strong> <a href="mailto:[email protected]">[email protected]</a>
+        </address>
+    </main>
 </asp:Content>

samples/aspnetapp/aspnetapp/Content/Site.css

@@ -1,12 +1,7 @@
-/* Move down content because we have a fixed navbar that is 50px tall */
-body {
-    padding-top: 50px;
-    padding-bottom: 20px;
-}
-
-/* Wrapping element */
+/* Wrapping element */
 /* Set some basic padding to keep content from hitting the edges */
 .body-content {
+    margin-top: 15px;
     padding-left: 15px;
     padding-right: 15px;
 }
@@ -18,20 +13,9 @@ textarea {
     max-width: 280px;
 }
 
-
 /* Responsive: Portrait tablets and up */
 @media screen and (min-width: 768px) {
-    .jumbotron {
-        margin-top: 20px;
-    }
-
     .body-content {
         padding: 0;
     }
 }
-
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
-    background-color: #777;
-    border-color: #fff
-}