Improve components infrastructure

.azure/pipelines/ci.yml

@@ -143,7 +143,6 @@ jobs:
       /p:OnlyPackPlatformSpecificPackages=true
       /bl:artifacts/log/build.win-arm.binlog
       $(_BuildArgs)
-    installNodeJs: false
     installJdk: false
     artifacts:
     - name: Windows_arm_Packages
@@ -170,7 +169,6 @@ jobs:
       -p:OnlyPackPlatformSpecificPackages=true
       -bl:artifacts/log/build.macos.binlog
       $(_BuildArgs)
-    installNodeJs: false
     artifacts:
     - name: MacOS_x64_Packages
       path: artifacts/packages/
@@ -191,7 +189,6 @@ jobs:
     jobName: Linux_x64_build
     jobDisplayName: "Build: Linux x64"
     agentOs: Linux
-    installNodeJs: false
     steps:
     - script: ./build.sh
           --ci
@@ -259,7 +256,6 @@ jobs:
       -p:OnlyPackPlatformSpecificPackages=true
       -bl:artifacts/log/build.linux-arm.binlog
       $(_BuildArgs)
-    installNodeJs: false
     artifacts:
     - name: Linux_arm_Packages
       path: artifacts/packages/
@@ -289,7 +285,6 @@ jobs:
       -p:OnlyPackPlatformSpecificPackages=true
       -bl:artifacts/log/build.arm64.binlog
       $(_BuildArgs)
-    installNodeJs: false
     artifacts:
     - name: Linux_arm64_Packages
       path: artifacts/packages/
@@ -322,7 +317,6 @@ jobs:
       -p:OnlyPackPlatformSpecificPackages=true
       -bl:artifacts/log/build.musl.binlog
       $(_BuildArgs)
-    installNodeJs: false
     artifacts:
     - name: Linux_musl_x64_Packages
       path: artifacts/packages/
@@ -355,7 +349,6 @@ jobs:
       -p:OnlyPackPlatformSpecificPackages=true
       -bl:artifacts/log/build.musl.binlog
       $(_BuildArgs)
-    installNodeJs: false
     artifacts:
     - name: Linux_musl_arm64_Packages
       path: artifacts/packages/
@@ -489,6 +482,10 @@ jobs:
       chmod +x $HOME/bin/jq
       echo "##vso[task.prependpath]$HOME/bin"
     displayName: Install jq
+  - task: NodeTool@0
+    displayName: Install Node 10.x
+    inputs:
+      versionSpec: 10.x
   - task: UseDotNet@2
     displayName: 'Use .NET Core sdk'
     inputs:

build.ps1

@@ -183,7 +183,7 @@ elseif ($Projects) {
 }
 # When adding new sub-group build flags, add them to this check.
 elseif((-not $BuildNative) -and (-not $BuildManaged) -and (-not $BuildNodeJS) -and (-not $BuildInstallers) -and (-not $BuildJava)) {
-    Write-Warning "No default group of projects was specified, so building the 'managed' subsets of projects. Run ``build.cmd -help`` for more details."
+    Write-Warning "No default group of projects was specified, so building the 'managed' and its dependent subsets of projects. Run ``build.cmd -help`` for more details."
 
     # This goal of this is to pick a sensible default for `build.cmd` with zero arguments.
     # Now that we support subfolder invokations of build.cmd, we will be pushing to have build.cmd build everything (-all) by default

docs/BuildFromSource.md

@@ -27,6 +27,7 @@ Building ASP.NET Core on Windows requires:
         ```ps1
         PS> ./eng/scripts/InstallJdk.ps1
         ```
+* Yarn <https://yarnpkg.com> is required if you are building JS components. For example, this may be required for building Components and SignalR.
 
 ### macOS/Linux
 
@@ -40,6 +41,7 @@ Building ASP.NET Core on macOS or Linux requires:
 * Java Development Kit 11 or newer. Either:
     * OpenJDK <https://jdk.java.net/>
     * Oracle's JDK <https://www.oracle.com/technetwork/java/javase/downloads/index.html>
+* Yarn <https://yarnpkg.com> is required if you are building JS components. For example, this may be required for building Components and SignalR.
 
 ## Clone the source code
 
@@ -129,6 +131,8 @@ On macOS/Linux:
 ./build.sh
 ```
 
+By default, only the C# projects are built. Some sub-areas have additional requirements, such as needing Yarn to be installed, before being able to build successfully.
+
 ### Using `dotnet` on command line in this repo
 
 Because we are using pre-release versions of .NET Core, you have to set a handful of environment variables

eng/Build.props

@@ -31,6 +31,7 @@
                       $(RepoRoot)src\submodules\**\*.*proj;
                       $(RepoRoot)src\Installers\**\*.*proj;
                       $(RepoRoot)src\SignalR\clients\ts\**\node_modules\**\*.*proj;
+                      $(RepoRoot)src\Components\Web.JS\node_modules\**\*.*proj;
                       $(RepoRoot)src\Components\Blazor\Templates\src\content\**\*.*proj;
                       $(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.csproj;
                       $(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.fsproj;
@@ -101,14 +102,15 @@
         <ProjectToBuild Condition=" '$(BuildNative)' == 'true'" Include="@(NativeProjects)" Exclude="@(ProjectToExclude)" />
         <ProjectToExclude Condition=" '$(BuildNative)' != 'true'" Include="@(NativeProjects)" />
 
+        <NodeJsProjectsForManagedProjects Include="$(RepoRoot)src\Components\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj" RestoreInParallel="false"/>
         <NodeJsProjects Include="
                           $(RepoRoot)src\SignalR\**\*.npmproj;
                           $(RepoRoot)src\Middleware\**\*.npmproj;
                           "
                         RestoreInParallel="false"
                         Exclude="@(ProjectToExclude)" />
 
-        <ProjectToBuild Condition=" '$(BuildNodeJS)' == 'true'" Include="@(NodeJsProjects)" Exclude="@(ProjectToExclude)" />
+        <ProjectToBuild Condition=" '$(BuildNodeJS)' == 'true'" Include="@(NodeJsProjects);@(NodeJsProjectsForManagedProjects)" Exclude="@(ProjectToExclude)" />
         <ProjectToExclude Condition=" '$(BuildNodeJS)' != 'true'" Include="@(NodeJsProjects)" />
 
         <JavaProjects Include="$(RepoRoot)src\SignalR\**\*.javaproj"
@@ -156,8 +158,10 @@
                           $(RepoRoot)**\bin\**\*;
                           $(RepoRoot)**\obj\**\*;" />
 
-        <ProjectToBuild Condition=" '$(BuildManaged)' == 'true'" Include="@(DotNetProjects)" Exclude="@(ProjectToExclude)" />
+        <ProjectToBuild Condition=" '$(BuildManaged)' == 'true'" Include="@(NodeJsProjectsForManagedProjects);@(DotNetProjects)" Exclude="@(ProjectToExclude)" />
         <ProjectToExclude Condition=" '$(BuildManaged)' != 'true'" Include="@(DotNetProjects)" />
+
+        <ProjectToExclude Condition=" '$(BuildManaged)' != 'true' and '$(BuildNodeJS)' != 'true'" Include="@(NodeJsProjectsForManagedProjects)" />
       </ItemGroup>
     </Otherwise>
   </Choose>

src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj

@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Blazor" />
+    <ProjectReference Include="$(RepoRoot)src\Components\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj" ReferenceOutputAssemblies="false" />
   </ItemGroup>
 
   <PropertyGroup>

src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj

@@ -8,5 +8,6 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Blazor" />
+    <ProjectReference Include="$(RepoRoot)src\Components\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj" ReferenceOutputAssemblies="false" />
   </ItemGroup>
 </Project>

src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj

@@ -13,5 +13,6 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)src\Components\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj" ReferenceOutputAssemblies="false" />
   </ItemGroup>
 </Project>

src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj

@@ -9,5 +9,6 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Blazor" />
     <Reference Include="Microsoft.AspNetCore.Blazor.HttpClient" />
+    <ProjectReference Include="$(RepoRoot)src\Components\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj" ReferenceOutputAssemblies="false" />
   </ItemGroup>
 </Project>

src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj

@@ -20,6 +20,8 @@
     <Reference Include="Microsoft.Extensions.Caching.Memory" />
     <Reference Include="Microsoft.Extensions.FileProviders.Composite" />
     <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
+
+    <ProjectReference Include="..\..\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -51,12 +53,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <!--
-      We check in the Release / Production build of blazor.*.js, but not the Debug builds. Consequently the former is always available to embed, the latter is only available
-      if Web.JS was built locally. Use the Debug build when available and building in Debug configuration.
-    -->
-    <BlazorServerJSFile>..\..\Web.JS\dist\Release\blazor.server.js</BlazorServerJSFile>
-    <BlazorServerJSFile Condition="'$(Configuration)' == 'Debug' AND Exists('..\..\Web.JS\dist\Debug\blazor.server.js')">..\..\Web.JS\dist\Debug\blazor.server.js</BlazorServerJSFile>
+    <BlazorServerJSFile>..\..\Web.JS\dist\$(Configuration)\blazor.server.js</BlazorServerJSFile>
   </PropertyGroup>
 
   <ItemGroup>

src/Components/Web.JS/.gitignore

@@ -1,2 +1,2 @@
 node_modules/
-dist/Debug/
+dist/

src/Components/build.cmd

@@ -1,3 +1,19 @@
 @ECHO OFF
 SET RepoRoot=%~dp0..\..
-%RepoRoot%\build.cmd -projects %~dp0**\*.*proj "/p:EnforceE2ETestPrerequisites=true" %*
+
+REM Building Web.JS first explicitly to workaround ordering issues between csproj and npmproj.
+ECHO Building Web.JS
+CALL %RepoRoot%\build.cmd -projects %~dp0Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj "/p:EnforceE2ETestPrerequisites=true" %*
+
+IF %ERRORLEVEL% NEQ 0 (
+   EXIT /b %ErrorLevel%
+)
+
+ECHO Building Components
+CALL %RepoRoot%\build.cmd -projects %~dp0**\*.*proj "/p:EnforceE2ETestPrerequisites=true" %*
+
+IF %ERRORLEVEL% NEQ 0 (
+   EXIT /b %ErrorLevel%
+)
+
+ECHO Components successfully built!

src/Shared/E2ETesting/E2ETesting.targets

@@ -11,7 +11,7 @@
       Importance="High"
       Text="Prerequisites were not enforced at build time. Running Yarn or the E2E tests might fail as a result. Check /src/Shared/E2ETesting/Readme.md for instructions." />
 
-    <Yarn Command="install --mutex network" />
+    <Yarn Command="install --mutex network" Condition="'$(EnforceE2ETestPrerequisites)' == 'true'"/>
   </Target>
 
   <Target