From 1f63f25508dfb8f46715d1842cf3dd49bd21a300 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 26 Mar 2019 10:27:55 -0700 Subject: [PATCH] [Helix] Enable Identity.FunctionalTests (#8564) --- ...AspNetCore.Identity.FunctionalTests.csproj | 27 +++++++++++++++++-- .../FileVersionProvider.cs | 17 ++++++++++++ .../Pages/_Layout.cshtml | 2 +- .../Identity.DefaultUI.WebSite/StartupBase.cs | 6 +++++ 4 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 src/Identity/testassets/Identity.DefaultUI.WebSite/FileVersionProvider.cs diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index eef6ae2c6c..0b83c7d39c 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -2,8 +2,6 @@ netcoreapp3.0 - - false @@ -26,4 +24,29 @@ + + + <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\UI\src\bin\$(Configuration)\netcoreapp3.0\Microsoft.AspNetCore.Identity.UI.Views.*.dll" /> + <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\testassets\Identity.DefaultUI.WebSite\bin\$(Configuration)\netcoreapp3.0\Identity.DefaultUI.WebSite.deps.json" /> + <_PublishFiles Include="$(MSBuildThisFileDirectory)..\..\testassets\Identity.DefaultUI.WebSite\bin\$(Configuration)\netcoreapp3.0\Identity.DefaultUI.WebSite.deps.json" /> + <_wwwrootFiles Include="$(MSBuildThisFileDirectory)..\..\testassets\Identity.DefaultUI.WebSite\wwwroot\**\*.*" /> + <_PagesFiles Include="$(MSBuildThisFileDirectory)..\..\testassets\Identity.DefaultUI.WebSite\Pages\**\*.*" /> + + + + + + + + diff --git a/src/Identity/testassets/Identity.DefaultUI.WebSite/FileVersionProvider.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/FileVersionProvider.cs new file mode 100644 index 0000000000..1632840fbd --- /dev/null +++ b/src/Identity/testassets/Identity.DefaultUI.WebSite/FileVersionProvider.cs @@ -0,0 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using Microsoft.AspNetCore.Mvc.ViewFeatures; +using Microsoft.AspNetCore.Http; + +namespace Identity.DefaultUI.WebSite +{ + /// + /// Provides version hash for a specified file. + /// + internal class FileVersionProvider : IFileVersionProvider + { + public string AddFileVersionToPath(PathString requestPathBase, string path) => path; + } +} diff --git a/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml index 0419736f50..e2e6acb520 100644 --- a/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml +++ b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_Layout.cshtml @@ -69,7 +69,7 @@ integrity="sha384-xrRywqdh3PHs8keKZN+8zzc5TX0GRTLCcmivcbNJWm2rs5C8PRhcEn3czEjhAO9o"> - + @RenderSection("Scripts", required: false) diff --git a/src/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs b/src/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs index e7138842db..fde7473faf 100644 --- a/src/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs +++ b/src/Identity/testassets/Identity.DefaultUI.WebSite/StartupBase.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.UI; +using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.Extensions.Configuration; @@ -51,11 +52,16 @@ namespace Identity.DefaultUI.WebSite services.AddMvc() .AddNewtonsoftJson(); + + services.AddSingleton(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { + // This prevents running out of file watchers on some linux machines + ((PhysicalFileProvider)env.WebRootFileProvider).UseActivePolling = false; + if (env.IsDevelopment()) { app.UseDeveloperExceptionPage();