Enforce E2E test prerequisites when building individual solutions only

src/Components/Blazor/Build/src/ReferenceFromSource.props

@@ -28,7 +28,7 @@
   <PropertyGroup>
     <RunCommand>dotnet</RunCommand>
     <_BlazorCliLocation>$(MSBuildThisFileDirectory)../../DevServer/src/bin/$(Configuration)/netcoreapp3.0/blazor-devserver.dll</_BlazorCliLocation>
-    <RunArguments>exec &quot;$(_BlazorCliLocation)&quot; serve &quot;$(MSBuildProjectDirectory)/$(OutputPath)$(TargetFileName)&quot; $(AdditionalRunArguments)</RunArguments>
+    <RunArguments>exec &quot;$(_BlazorCliLocation)&quot; serve --applicationpath &quot;$(MSBuildProjectDirectory)/$(OutputPath)$(TargetFileName)&quot; $(AdditionalRunArguments)</RunArguments>
   </PropertyGroup>
 
   <ItemGroup>

src/Components/Blazor/DevServer/src/Commands/ServeCommand.cs

@@ -1,11 +1,9 @@
 // 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 System.IO;
-using System.Runtime.Versioning;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Hosting;
 
 namespace Microsoft.AspNetCore.Blazor.DevServer.Commands
 {
@@ -23,28 +21,11 @@ public ServeCommand(CommandLineApplication parent)
 
             HelpOption("-?|-h|--help");
 
-            ApplicationPath = new CommandArgument()
-            {
-                Description = "Path to the client application dll",
-                MultipleValues = false,
-                Name = "<PATH>",
-                ShowInHelpText = true
-            };
-            Arguments.Add(ApplicationPath);
-
             OnExecute(Execute);
         }
 
-        public CommandArgument ApplicationPath { get; private set; }
-
         private int Execute()
         {
-            if (string.IsNullOrWhiteSpace(ApplicationPath.Value))
-            {
-                throw new InvalidOperationException($"Invalid value for parameter '{nameof(ApplicationPath)}'. Value supplied: '{ApplicationPath.Value}'");
-            }
-
-            Server.Startup.ApplicationAssembly = ApplicationPath.Value;
             Server.Program.BuildWebHost(RemainingArguments.ToArray()).Run();
             return 0;
         }

src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj

@@ -19,6 +19,7 @@
     <Reference Include="Microsoft.AspNetCore.ResponseCompression" />
     <Reference Include="Microsoft.AspNetCore" />
     <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
+    <Reference Include="Microsoft.Extensions.Hosting" />
   </ItemGroup>
 
   <!-- Pack settings -->

src/Components/Blazor/DevServer/src/Server/Program.cs

@@ -1,8 +1,15 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 
 namespace Microsoft.AspNetCore.Blazor.DevServer.Server
 {
@@ -18,12 +25,24 @@ public class Program
         /// <summary>
         /// Intended for framework test use only.
         /// </summary>
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseConfiguration(new ConfigurationBuilder()
-                    .AddCommandLine(args)
-                    .Build())
-                .UseStartup<Startup>()
-                .Build();
+        public static IHost BuildWebHost(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureHostConfiguration(cb => {
+                    var applicationPath = args.SkipWhile(a => a != "--applicationpath").Skip(1).FirstOrDefault();
+                    var name = Path.ChangeExtension(applicationPath,".StaticWebAssets.xml");
+
+                    if (name != null)
+                    {
+                        cb.AddInMemoryCollection(new Dictionary<string, string>
+                        {
+                            [WebHostDefaults.StaticWebAssetsKey] = name
+                        });
+                    }
+                })
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseStaticWebAssets();
+                    webBuilder.UseStartup<Startup>();
+                }).Build();
     }
 }

src/Components/Blazor/DevServer/src/Server/Startup.cs

@@ -17,7 +17,12 @@ namespace Microsoft.AspNetCore.Blazor.DevServer.Server
 {
     internal class Startup
     {
-        public static string ApplicationAssembly { get; set; }
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
 
         public void ConfigureServices(IServiceCollection services)
         {
@@ -35,7 +40,7 @@ public void ConfigureServices(IServiceCollection services)
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment environment, IConfiguration configuration)
         {
-            var applicationAssemblyFullPath = ResolveApplicationAssemblyFullPath(environment);
+            var applicationAssemblyFullPath = ResolveApplicationAssemblyFullPath();
 
             app.UseDeveloperExceptionPage();
             app.UseResponseCompression();
@@ -54,15 +59,22 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment environment,
             });
         }
 
-        private static string ResolveApplicationAssemblyFullPath(IWebHostEnvironment environment)
+        private string ResolveApplicationAssemblyFullPath()
         {
-            var applicationAssemblyFullPath = Path.Combine(environment.ContentRootPath, ApplicationAssembly);
-            if (!File.Exists(applicationAssemblyFullPath))
+            const string applicationPathKey = "applicationpath";
+            var configuredApplicationPath = Configuration.GetValue<string>(applicationPathKey);
+            if (string.IsNullOrEmpty(configuredApplicationPath))
+            {
+                throw new InvalidOperationException($"No value was supplied for the required option '{applicationPathKey}'.");
+            }
+
+            var resolvedApplicationPath = Path.GetFullPath(configuredApplicationPath);
+            if (!File.Exists(resolvedApplicationPath))
             {
-                throw new InvalidOperationException($"Application assembly not found at {applicationAssemblyFullPath}.");
+                throw new InvalidOperationException($"Application assembly not found at {resolvedApplicationPath}.");
             }
 
-            return applicationAssemblyFullPath;
+            return resolvedApplicationPath;
         }
 
         private static void EnableConfiguredPathbase(IApplicationBuilder app, IConfiguration configuration)

src/Components/Blazor/DevServer/src/build/Microsoft.AspNetCore.Blazor.DevServer.targets

@@ -2,6 +2,6 @@
   <PropertyGroup>
     <_BlazorDevServerDll>$(MSBuildThisFileDirectory)../tools/blazor-devserver.dll</_BlazorDevServerDll>
     <RunCommand>dotnet</RunCommand>
-    <RunArguments>&quot;$(_BlazorDevServerDll)&quot; serve &quot;$(MSBuildProjectDirectory)/$(OutputPath)$(TargetFileName)&quot;</RunArguments>
+    <RunArguments>&quot;$(_BlazorDevServerDll)&quot; serve --applicationpath &quot;$(MSBuildProjectDirectory)/$(OutputPath)$(TargetFileName)&quot;</RunArguments>
   </PropertyGroup>
 </Project>

src/Components/build.cmd

@@ -1,3 +1,3 @@
 @ECHO OFF
 SET RepoRoot=%~dp0..\..
-%RepoRoot%\build.cmd -projects %~dp0**\*.*proj %*
+%RepoRoot%\build.cmd -projects %~dp0**\*.*proj "/p:EnforceE2ETestPrerequisites=true" %*

src/Components/build.sh

@@ -4,4 +4,4 @@ set -euo pipefail
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 repo_root="$DIR/../.."
-"$repo_root/build.sh" --projects "$DIR/**/*.*proj" "$@"
+"$repo_root/build.sh" --projects "$DIR/**/*.*proj" "/p:EnforceE2ETestPrerequisites=true" "$@"

src/Components/test/E2ETest/Infrastructure/ServerFixtures/DevHostServerFixture.cs

@@ -2,7 +2,13 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.Extensions.Hosting;
+using System;
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 using DevHostServerProgram = Microsoft.AspNetCore.Blazor.DevServer.Server.Program;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures
@@ -22,7 +28,8 @@ protected override IWebHost CreateWebHost()
             {
                 "--urls", "http://127.0.0.1:0",
                 "--contentroot", ContentRoot,
-                "--pathbase", PathBase
+                "--pathbase", PathBase,
+                "--applicationpath", typeof(TProgram).Assembly.Location,
             };
 
             if (!string.IsNullOrEmpty(Environment))
@@ -31,7 +38,29 @@ protected override IWebHost CreateWebHost()
                 args.Add(Environment);
             }
 
-            return DevHostServerProgram.BuildWebHost(args.ToArray());
+            return new FakeWebHost(DevHostServerProgram.BuildWebHost(args.ToArray()));
+        }
+
+        private class FakeWebHost : IWebHost
+        {
+            private readonly IHost _realHost;
+
+            public FakeWebHost(IHost realHost)
+            {
+                _realHost = realHost;
+            }
+
+            public IFeatureCollection ServerFeatures => ((IServer)_realHost.Services.GetService(typeof(IServer))).Features;
+
+            public IServiceProvider Services => _realHost.Services;
+
+            public void Dispose() => _realHost.Dispose();
+
+            public void Start() => _realHost.Start();
+
+            public Task StartAsync(CancellationToken cancellationToken = default) => _realHost.StartAsync();
+
+            public Task StopAsync(CancellationToken cancellationToken = default) => _realHost.StopAsync();
         }
     }
 }

src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj

@@ -7,10 +7,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <TestGroupName>Components.E2ETests</TestGroupName>
 
-    <!--
-      Temporarily disabled until this runs on macOS
-    -->
-    <SkipTests Condition="'$(SeleniumE2ETestsSupported)' != 'true'">true</SkipTests>
+    <SkipTests>true</SkipTests>
     <!-- https://github.com/aspnet/AspNetCore/issues/6857 -->
     <BuildHelixPayload>false</BuildHelixPayload>
 

src/Components/test/testassets/BasicTestApp/wwwroot/index.html

@@ -5,33 +5,39 @@
     <title>Basic test app</title>
     <base href="/subdir/" />
     <link href="style.css" rel="stylesheet" />
+
+    <!-- Used by ExternalContentPackage -->
+    <link href="_content/TestContentPackage/styles.css" rel="stylesheet" />
 </head>
 <body>
-  <root>Loading...</root>
+    <root>Loading...</root>
+
+    <!-- Used for testing interop scenarios between JS and .NET -->
+    <script src="js/jsinteroptests.js"></script>
 
-  <!-- Used for testing interop scenarios between JS and .NET -->
-  <script src="js/jsinteroptests.js"></script>
+    <script>
+        // Used by ElementRefComponent
+        function setElementValue(element, newValue) {
+            element.value = newValue;
+            return element.value;
+        }
 
-  <script>
-    // Used by ElementRefComponent
-    function setElementValue(element, newValue) {
-      element.value = newValue;
-      return element.value;
-    }
+        function uriHelperNavigate() {
+            Blazor.navigateTo('/subdir/some-path');
+        }
 
-    function uriHelperNavigate() {
-      Blazor.navigateTo('/subdir/some-path');
-    }
+        (function () {
+            // Load either blazor.webassembly.js or blazor.server.js depending
+            // on the hash part of the URL. This is just to give a way for the
+            // test runner to make the selection.
+            var src = location.hash === '#server'
+                ? 'blazor.server.js'
+                : 'blazor.webassembly.js';
+            document.write('<script src="_framework/' + src + '"><' + '/script>');
+        })();
+    </script>
 
-    (function () {
-      // Load either blazor.webassembly.js or blazor.server.js depending
-      // on the hash part of the URL. This is just to give a way for the
-      // test runner to make the selection.
-      var src = location.hash === '#server'
-        ? 'blazor.server.js'
-        : 'blazor.webassembly.js';
-      document.write('<script src="_framework/' + src + '"><' + '/script>');
-    })();
-  </script>
+    <!-- Used by ExternalContentPackage -->
+    <script src="_content/TestContentPackage/prompt.js"></script>
 </body>
 </html>

src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj

@@ -4,19 +4,9 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>library</OutputType>
     <RazorLangVersion>3.0</RazorLangVersion>
+    <StaticWebAssetBasePath>_content/TestContentPackage</StaticWebAssetBasePath>
   </PropertyGroup>
 
-  <ItemGroup>
-    <!-- .js files will be referenced via <script> tags -->
-    <EmbeddedResource Include="content\**\*.js" LogicalName="blazor:js:%(RecursiveDir)%(Filename)%(Extension)" />
-
-    <!-- .css files will be referenced via <link rel='Stylesheet'> tags -->
-    <EmbeddedResource Include="content\**\*.css" LogicalName="blazor:css:%(RecursiveDir)%(Filename)%(Extension)" />
-
-    <!-- Any other files will be included in the 'dist' output but without any tags referencing them -->
-    <EmbeddedResource Include="content\**" Exclude="**\*.js;**\*.css" LogicalName="blazor:file:%(RecursiveDir)%(Filename)%(Extension)" />
-  </ItemGroup>
-
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components" />
   </ItemGroup>

src/Components/test/testassets/TestServer/Program.cs

@@ -19,6 +19,7 @@ public static IWebHost BuildWebHost<TStartup>(string[] args) where TStartup : cl
                         .AddCommandLine(args)
                         .Build())
                 .UseStartup<TStartup>()
+                .UseStaticWebAssets()
                 .Build();
     }
 }

src/Components/test/testassets/TestServer/Startup.cs

@@ -1,10 +1,7 @@
 using BasicTestApp;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Components.Server;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -63,6 +60,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             // Mount the server-side Blazor app on /subdir
             app.Map("/subdir", subdirApp =>
             {
+                subdirApp.UseStaticFiles();
                 subdirApp.UseClientSideBlazorFiles<BasicTestApp.Startup>();
 
                 subdirApp.UseRouting();

src/DefaultBuilder/src/WebHost.cs

@@ -211,7 +211,7 @@ internal static void ConfigureWebDefaults(IWebHostBuilder builder)
             {
                 if (ctx.HostingEnvironment.IsDevelopment())
                 {
-                    StaticWebAssetsLoader.UseStaticWebAssets(ctx.HostingEnvironment);
+                    StaticWebAssetsLoader.UseStaticWebAssets(ctx.HostingEnvironment, ctx.Configuration);
                 }
             });
             builder.UseKestrel((builderContext, options) =>

src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.netcoreapp3.0.cs

@@ -121,6 +121,7 @@ public static partial class WebHostDefaults
         public static readonly string ServerUrlsKey;
         public static readonly string ShutdownTimeoutKey;
         public static readonly string StartupAssemblyKey;
+        public static readonly string StaticWebAssetsKey;
         public static readonly string SuppressStatusMessagesKey;
         public static readonly string WebRootKey;
     }

src/Hosting/Abstractions/src/WebHostDefaults.cs

@@ -21,5 +21,6 @@ public static class WebHostDefaults
         public static readonly string SuppressStatusMessagesKey = "suppressStatusMessages";
 
         public static readonly string ShutdownTimeoutKey = "shutdownTimeoutSeconds";
+        public static readonly string StaticWebAssetsKey = "staticWebAssets";
     }
 }

src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.netcoreapp3.0.cs

@@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Hosting.StaticWebAssets
     public partial class StaticWebAssetsLoader
     {
         public StaticWebAssetsLoader() { }
-        public static void UseStaticWebAssets(Microsoft.AspNetCore.Hosting.IWebHostEnvironment environment) { }
+        public static void UseStaticWebAssets(Microsoft.AspNetCore.Hosting.IWebHostEnvironment environment, Microsoft.Extensions.Configuration.IConfiguration configuration) { }
     }
 }
 namespace Microsoft.Extensions.Hosting