Merge branch 'merge/release/2.2-to-master'

2018-08-08 15:42:36 -07:00 · 2018-08-08 15:42:36 -07:00 · c33044c555
--- a/build/dependencies.props
+++ b/build/dependencies.props
@ -38,13 +38,14 @@
    <MicrosoftVisualStudioWebBrowserLinkPackageVersion>3.0.0-alpha1-10123</MicrosoftVisualStudioWebBrowserLinkPackageVersion>
    <MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>3.0.0-alpha1-10123</MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>
    <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
-    <SeleniumSupportPackageVersion>3.12.0</SeleniumSupportPackageVersion>
+    <SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion>
    <SeleniumWebDriverMicrosoftDriverPackageVersion>17.17134.0</SeleniumWebDriverMicrosoftDriverPackageVersion>
    <SeleniumWebDriverPackageVersion>3.12.1</SeleniumWebDriverPackageVersion>
    <SystemSecurityPermissionsPackageVersion>4.6.0-preview1-26708-04</SystemSecurityPermissionsPackageVersion>
    <XunitAnalyzersPackageVersion>0.9.0</XunitAnalyzersPackageVersion>
    <XunitPackageVersion>2.3.1</XunitPackageVersion>
-    <XunitRunnerVisualStudioPackageVersion>2.4.0-rc.1.build4038</XunitRunnerVisualStudioPackageVersion>
+    <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
  </PropertyGroup>
+  <PropertyGroup Label="Package Versions: Pinned" />
  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
 </Project>
--- a/scripts/Custom-Hive.ps1
+++ b/scripts/Custom-Hive.ps1
@ -33,7 +33,7 @@ function Test-Template($templateName, $templateNupkg, $isSPA)

 function Create-Hive {
    Write-Host "Creating custom hive"
-    Remove-Item -Path $customHive -Force -Recurse
+    Remove-Item -Path $customHive -Force -Recurse -ErrorAction Ignore
    New-Item -Path $customHive -ItemType Directory | out-null
    Clean-Hive
 }
--- a/scripts/Custom_Hive.ps1
+++ b/scripts/Custom_Hive.ps1
@ -1,32 +0,0 @@
-$customHive = "$PSScriptRoot/CustomHive"
-
-function Create-CustomHive
-{
-    Param()
-    Remove-Item -Path $customHive -Recurse -ErrorAction Ignore
-    New-Item -ErrorAction Ignore -Path $customHive -ItemType Directory
-
-    Clean-CustomHive
-}
-
-function Clean-CustomHive
-{
-    Param()
-    $uninstallResults = Call-DotnetNew "--uninstall"
-    Write-Host "uninstallresults: $uninstallResults"
-    $currently = "Currently installed items:"
-    $templatePackString = ($uninstallResults -split $currently)
-    Write-Host "tempPack: $templatePackString"
-    $templatePackages = $templatePackString.Split([Environment]::NewLine)
-
-    foreach($package in $templatePackages)
-    {
-        Write-Host $package
-        #Call-DotnetNew "--uninstall $package"
-    }
-}
-function Call-DotnetNew($arguments) {
-    & "dotnet" new $arguments --debug:custom-hive $customHive
-}
-
-Create-CustomHive
--- a/scripts/Minify-Scripts.ps1
+++ b/scripts/Minify-Scripts.ps1
@ -7,7 +7,13 @@ param()
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'

-npm install
+Push-Location $PSScriptRoot
+try {    
+    npm install
+}
+finally {
+    Pop-Location
+}

 $projectContentDir = "$PSScriptRoot/../src/Microsoft.DotNet.Web.ProjectTemplates/content"

--- a/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
@ -23,7 +23,7 @@
  </ItemGroup>

  <ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
-    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.App"/>
    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
@ -19,23 +19,31 @@
 <body>
    <header>
        <nav class="mb-3 navbar navbar-expand navbar-light flex-column flex-md-row bg-white border-bottom box-shadow">
-            <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Company.WebApplication1</a>
-            <ul class="navbar-nav ml-md-auto">
-                <li class="nav-item">
-                    <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page2</a>
-                </li>
-            </ul>
-@*#if (IndividualAuth || OrganizationalAuth)
-            <partial name="_LoginPartial" />
-#elseif (WindowsAuth)
-            <p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
-#endif*@
+            <div class="container">
+                <a class="navbar-brand" asp-area="" asp-page="/">Company.WebApplication1</a>
+                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
+                        aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
+    @*#if (IndividualAuth || OrganizationalAuth)
+                    <partial name="_LoginPartial" />
+    #elseif (WindowsAuth)
+                    <p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
+    #endif*@
+                    <ul class="navbar-nav ml-md-auto">
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page2</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
        </nav>
    </header>
-    <div class="container-fluid">
+    <div class="container">
        <partial name="_CookieConsentPartial" />
        <main role="main" class="pb-1">
            @RenderBody()
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml
@ -9,10 +9,10 @@
            crossorigin="anonymous"
            integrity="sha256-F6h55Qw6sweK+t7SiOJX+2bpSAa3b/fnlrVCJvmEj1A=">
    </script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.9/jquery.validate.unobtrusive.min.js"
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.10/jquery.validate.unobtrusive.min.js"
            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
            asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
            crossorigin="anonymous"
-            integrity="sha256-paoxpct33kY9fpQlvgC8IokjGq8iqYaVFawgFPg8oz0=">
+            integrity="sha256-zkVFxDCBA0K+Fl6QZDRpD0G+GQ+TfuGv7xXkIAM69h8=">
    </script>
 </environment>
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs
@ -61,13 +61,13 @@ namespace Company.WebApplication1

 #if (IndividualLocalAuth)
            services.AddDbContext<ApplicationDbContext>(options =>
-    #if (UseLocalDB)
+#if (UseLocalDB)
                options.UseSqlServer(
                    Configuration.GetConnectionString("DefaultConnection")));
-    #else
+#else
                options.UseSqlite(
                    Configuration.GetConnectionString("DefaultConnection")));
-    #endif
+#endif
            services.AddDefaultIdentity<IdentityUser>()
                .AddEntityFrameworkStores<ApplicationDbContext>();

@ -124,9 +124,9 @@ namespace Company.WebApplication1
                    .Build();
                options.Filters.Add(new AuthorizeFilter(policy));
            })
-            .SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            .SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
 #else
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
 #endif
        }

--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.css
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.css
@ -1,4 +1,4 @@
-/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification\
+/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
 for details on configuring this project to bundle and minify static web assets. */

 a.navbar-brand {
@ -18,14 +18,6 @@ html {
  }
 }

-.container {
-  max-width: 960px;
-}
-
-.pricing-header {
-  max-width: 700px;
-}
-
 .border-top {
  border-top: 1px solid #e5e5e5;
 }
@ -57,7 +49,6 @@ body {
  position: absolute;
  bottom: 0;
  width: 100%;
-  overflow: scroll;
  white-space: nowrap;
  /* Set the fixed height of the footer here */
  height: 60px;
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.min.css
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.min.css
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
@ -1,15 +0,0 @@
-{
-  "name": "jquery-validation-unobtrusive",
-  "homepage": "https://github.com/aspnet/jquery-validation-unobtrusive",
-  "version": "3.2.9",
-  "_release": "3.2.9",
-  "_resolution": {
-    "type": "version",
-    "tag": "v3.2.9",
-    "commit": "a91f5401898e125f10771c5f5f0909d8c4c82396"
-  },
-  "_source": "https://github.com/aspnet/jquery-validation-unobtrusive.git",
-  "_target": "^3.2.9",
-  "_originalSource": "jquery-validation-unobtrusive",
-  "_direct": true
-}
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
@ -1,6 +1,6 @@
 // Unobtrusive validation support library for jQuery and jQuery Validate
 // Copyright (C) Microsoft Corporation. All rights reserved.
-// @version v3.2.9
+// @version v3.2.10

 /*jslint white: true, browser: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: false */
 /*global document: false, jQuery: false */
@ -8,7 +8,7 @@
 (function (factory) {
    if (typeof define === 'function' && define.amd) {
        // AMD. Register as an anonymous module.
-        define("jquery.validate.unobtrusive", ['jquery.validation'], factory);
+        define("jquery.validate.unobtrusive", ['jquery-validation'], factory);
    } else if (typeof module === 'object' && module.exports) {
        // CommonJS-like environments that support module.exports     
        module.exports = factory(require('jquery-validation'));
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs
@ -61,13 +61,13 @@ namespace Company.WebApplication1

 #if (IndividualLocalAuth)
            services.AddDbContext<ApplicationDbContext>(options =>
-    #if (UseLocalDB)
+#if (UseLocalDB)
                options.UseSqlServer(
                    Configuration.GetConnectionString("DefaultConnection")));
-    #else
+#else
                options.UseSqlite(
                    Configuration.GetConnectionString("DefaultConnection")));
-    #endif
+#endif
            services.AddDefaultIdentity<IdentityUser>()
                .AddEntityFrameworkStores<ApplicationDbContext>();
 #elif (OrganizationalAuth)
@ -115,7 +115,7 @@ namespace Company.WebApplication1
                .AddAzureADB2C(options => Configuration.Bind("AzureAdB2C", options));
 #endif

-            #if (OrganizationalAuth)
+#if (OrganizationalAuth)
            services.AddMvc(options =>
            {
                var policy = new AuthorizationPolicyBuilder()
@ -123,9 +123,9 @@ namespace Company.WebApplication1
                    .Build();
                options.Filters.Add(new AuthorizeFilter(policy));
            })
-            .SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            .SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
 #else
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
 #endif
        }

--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
@ -19,29 +19,31 @@
 <body>
    <header>
        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
-            <a class="navbar-brand" href="~/">Company.WebApplication1</a>
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
-                    aria-expanded="false" aria-label="Toggle navigation">
-                <span class="navbar-toggler-icon"></span>
-            </button>
-            <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
-@*#if (IndividualAuth || OrganizationalAuth)
-                <partial name="_LoginPartial" />
-#elseif (WindowsAuth)
-                <p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
-#endif*@
-                <ul class="navbar-nav flex-grow-1">
-                    <li class="nav-item">
-                        <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page2</a>
-                    </li>
-                </ul>
+            <div class="container">
+                <a class="navbar-brand" href="~/">Company.WebApplication1</a>
+                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
+                        aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
+    @*#if (IndividualAuth || OrganizationalAuth)
+                    <partial name="_LoginPartial" />
+    #elseif (WindowsAuth)
+                    <p class="nav navbar-text navbar-right">Hello, @User.Identity.Name!</p>
+    #endif*@
+                    <ul class="navbar-nav flex-grow-1">
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page1</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Page2</a>
+                        </li>
+                    </ul>
+                </div>
            </div>
        </nav>
    </header>
-    <div class="container-fluid">
+    <div class="container">
        <partial name="_CookieConsentPartial" />
        <main role="main" class="pb-1">
            @RenderBody()
@ -49,7 +51,9 @@
    </div>

    <footer class="border-top footer pl-3 text-muted">
-        &copy; Year - Company.WebApplication1 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+        <div class="container">
+            &copy; copyrightYear - Company.WebApplication1 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
+        </div>
    </footer>

    <environment include="Development">
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_ValidationScriptsPartial.cshtml
@ -9,10 +9,10 @@
            crossorigin="anonymous"
            integrity="sha256-F6h55Qw6sweK+t7SiOJX+2bpSAa3b/fnlrVCJvmEj1A=">
    </script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.9/jquery.validate.unobtrusive.min.js"
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.10/jquery.validate.unobtrusive.min.js"
            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
            asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
            crossorigin="anonymous"
-            integrity="sha256-paoxpct33kY9fpQlvgC8IokjGq8iqYaVFawgFPg8oz0=">
+            integrity="sha256-zkVFxDCBA0K+Fl6QZDRpD0G+GQ+TfuGv7xXkIAM69h8=">
    </script>
 </environment>
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.css
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.css
@ -1,4 +1,4 @@
-/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification\
+/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
 for details on configuring this project to bundle and minify static web assets. */

 a.navbar-brand {
@ -18,14 +18,6 @@ html {
  }
 }

-.container {
-  max-width: 960px;
-}
-
-.pricing-header {
-  max-width: 700px;
-}
-
 .border-top {
  border-top: 1px solid #e5e5e5;
 }
@ -57,7 +49,6 @@ body {
  position: absolute;
  bottom: 0;
  width: 100%;
-  overflow: scroll;
  white-space: nowrap;
  /* Set the fixed height of the footer here */
  height: 60px;
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.min.css
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.min.css
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
@ -1,15 +0,0 @@
-{
-  "name": "jquery-validation-unobtrusive",
-  "homepage": "https://github.com/aspnet/jquery-validation-unobtrusive",
-  "version": "3.2.9",
-  "_release": "3.2.9",
-  "_resolution": {
-    "type": "version",
-    "tag": "v3.2.9",
-    "commit": "a91f5401898e125f10771c5f5f0909d8c4c82396"
-  },
-  "_source": "https://github.com/aspnet/jquery-validation-unobtrusive.git",
-  "_target": "^3.2.9",
-  "_originalSource": "jquery-validation-unobtrusive",
-  "_direct": true
-}
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
@ -1,6 +1,6 @@
 // Unobtrusive validation support library for jQuery and jQuery Validate
 // Copyright (C) Microsoft Corporation. All rights reserved.
-// @version v3.2.9
+// @version v3.2.10

 /*jslint white: true, browser: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: false */
 /*global document: false, jQuery: false */
@ -8,7 +8,7 @@
 (function (factory) {
    if (typeof define === 'function' && define.amd) {
        // AMD. Register as an anonymous module.
-        define("jquery.validate.unobtrusive", ['jquery.validation'], factory);
+        define("jquery.validate.unobtrusive", ['jquery-validation'], factory);
    } else if (typeof module === 'object' && module.exports) {
        // CommonJS-like environments that support module.exports     
        module.exports = factory(require('jquery-validation'));
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Startup.fs
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Startup.fs
@ -21,7 +21,7 @@ type Startup private () =
    // This method gets called by the runtime. Use this method to add services to the container.
    member this.ConfigureServices(services: IServiceCollection) =
        // Add framework services.
-        services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1) |> ignore
+        services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2) |> ignore

    // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
    member this.Configure(app: IApplicationBuilder, env: IHostingEnvironment) =
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_ValidationScriptsPartial.cshtml
@ -9,10 +9,10 @@
            crossorigin="anonymous"
            integrity="sha256-F6h55Qw6sweK+t7SiOJX+2bpSAa3b/fnlrVCJvmEj1A=">
    </script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.9/jquery.validate.unobtrusive.min.js"
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.10/jquery.validate.unobtrusive.min.js"
            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
            asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
            crossorigin="anonymous"
-            integrity="sha256-paoxpct33kY9fpQlvgC8IokjGq8iqYaVFawgFPg8oz0=">
+            integrity="sha256-zkVFxDCBA0K+Fl6QZDRpD0G+GQ+TfuGv7xXkIAM69h8=">
    </script>
 </environment>
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.css
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.css
@ -1,4 +1,4 @@
-/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification 
+/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
 for details on configuring this project to bundle and minify static web assets. */
 body {
    padding-top: 50px;
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
@ -1,15 +0,0 @@
-{
-  "name": "jquery-validation-unobtrusive",
-  "homepage": "https://github.com/aspnet/jquery-validation-unobtrusive",
-  "version": "3.2.9",
-  "_release": "3.2.9",
-  "_resolution": {
-    "type": "version",
-    "tag": "v3.2.9",
-    "commit": "a91f5401898e125f10771c5f5f0909d8c4c82396"
-  },
-  "_source": "https://github.com/aspnet/jquery-validation-unobtrusive.git",
-  "_target": "^3.2.9",
-  "_originalSource": "jquery-validation-unobtrusive",
-  "_direct": true
-}
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
@ -1,6 +1,6 @@
 // Unobtrusive validation support library for jQuery and jQuery Validate
 // Copyright (C) Microsoft Corporation. All rights reserved.
-// @version v3.2.9
+// @version v3.2.10

 /*jslint white: true, browser: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: false */
 /*global document: false, jQuery: false */
@ -8,7 +8,7 @@
 (function (factory) {
    if (typeof define === 'function' && define.amd) {
        // AMD. Register as an anonymous module.
-        define("jquery.validate.unobtrusive", ['jquery.validation'], factory);
+        define("jquery.validate.unobtrusive", ['jquery-validation'], factory);
    } else if (typeof module === 'object' && module.exports) {
        // CommonJS-like environments that support module.exports     
        module.exports = factory(require('jquery-validation'));
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/Startup.cs
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-CSharp/Startup.cs
@ -43,7 +43,7 @@ namespace Company.WebApplication1
            services.AddAuthentication(AzureADB2CDefaults.BearerAuthenticationScheme)
                .AddAzureADB2CBearer(options => Configuration.Bind("AzureAdB2C", options));
 #endif
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
        }

        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
--- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/Startup.fs
+++ b/src/Microsoft.DotNet.Web.ProjectTemplates/content/WebApi-FSharp/Startup.fs
@ -21,7 +21,7 @@ type Startup private () =
    // This method gets called by the runtime. Use this method to add services to the container.
    member this.ConfigureServices(services: IServiceCollection) =
        // Add framework services.
-        services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1) |> ignore
+        services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2) |> ignore

    // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
    member this.Configure(app: IApplicationBuilder, env: IHostingEnvironment) =
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/app.component.html
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/app.component.html
@ -1,6 +1,6 @@
 <body>
  <app-nav-menu></app-nav-menu>
-  <div class="container-fluid">
+  <div class="container">
    <router-outlet></router-outlet>
  </div>
 </body>
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html
@ -1,21 +1,22 @@
 <header>
-    <nav class='navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3'>
-        <a class="navbar-brand" href="~/">Company.WebApplication1</a>
-        <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-label="Toggle navigation" [attr.aria-expanded]="isExpanded" (click)="toggle()">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse" [ngClass]='{"show": isExpanded}'>
-            <ul class="navbar-nav flex-grow-1">
-                <li class="nav-item" [routerLinkActive]='["link-active"]' [routerLinkActiveOptions]='{ exact: true }'>
-                    <a class="nav-link text-dark" [routerLink]='["/"]'>Home</a>
-                </li>
-                <li class="nav-item" [routerLinkActive]='["link-active"]'>
-                    <a class="nav-link text-dark" [routerLink]='["/counter"]'>Counter</a>
-                </li>
-                <li class="nav-item" [routerLinkActive]='["link-active"]'>
-                    <a class="nav-link text-dark" [routerLink]='["/fetch-data"]'>Fetch data</a>
-                </li>
-            </ul>
-        </div>
-    </nav>
+  <nav class='navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3'>
+    <a class="navbar-brand" href="~/">Company.WebApplication1</a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-label="Toggle navigation"
+      [attr.aria-expanded]="isExpanded" (click)="toggle()">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse" [ngClass]='{"show": isExpanded}'>
+      <ul class="navbar-nav flex-grow-1">
+        <li class="nav-item" [routerLinkActive]='["link-active"]' [routerLinkActiveOptions]='{ exact: true }'>
+          <a class="nav-link text-dark" [routerLink]='["/"]'>Home</a>
+        </li>
+        <li class="nav-item" [routerLinkActive]='["link-active"]'>
+          <a class="nav-link text-dark" [routerLink]='["/counter"]'>Counter</a>
+        </li>
+        <li class="nav-item" [routerLinkActive]='["link-active"]'>
+          <a class="nav-link text-dark" [routerLink]='["/fetch-data"]'>Fetch data</a>
+        </li>
+      </ul>
+    </div>
+  </nav>
 </header>
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs
@ -22,7 +22,7 @@ namespace Company.WebApplication1
        // This method gets called by the runtime. Use this method to add services to the container.
        public void ConfigureServices(IServiceCollection services)
        {
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);

            // In production, the Angular files will be served from this directory
            services.AddSpaStaticFiles(configuration =>
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/Startup.cs
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/React-CSharp/Startup.cs
@ -22,7 +22,7 @@ namespace Company.WebApplication1
        // This method gets called by the runtime. Use this method to add services to the container.
        public void ConfigureServices(IServiceCollection services)
        {
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);

            // In production, the React files will be served from this directory
            services.AddSpaStaticFiles(configuration =>
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Startup.cs
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Startup.cs
@ -22,7 +22,7 @@ namespace Company.WebApplication1
        // This method gets called by the runtime. Use this method to add services to the container.
        public void ConfigureServices(IServiceCollection services)
        {
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);

            // In production, the React files will be served from this directory
            services.AddSpaStaticFiles(configuration =>
--- a/test/Templates.Test/template-baselines.json
+++ b/test/Templates.Test/template-baselines.json
@ -67,7 +67,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
@ -134,7 +133,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
@ -202,7 +200,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
@ -270,7 +267,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
@ -337,7 +333,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
@ -409,7 +404,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
@ -538,7 +532,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
@ -604,7 +597,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
@ -671,7 +663,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
@ -738,7 +729,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
@ -804,7 +794,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
@ -871,7 +860,6 @@
        "wwwroot/lib/jquery-validation/dist/additional-methods.min.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.js",
        "wwwroot/lib/jquery-validation/dist/jquery.validate.min.js",
-        "wwwroot/lib/jquery-validation-unobtrusive/.bower.json",
        "wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
        "wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"