Feedback and cleanup

Author: John Luo

.azure/pipelines/ci.yml

@@ -31,12 +31,12 @@ variables:
     value: ''
 
 jobs:
-# Build Web.JS Linux x64
+# Build Web.JS
 - template: jobs/default-build.yml
   parameters:
     codeSign: true
-    jobName: WebJS_Linux_x64_build
-    jobDisplayName: "Build: Web.JS Linux x64"
+    jobName: WebJS_build
+    jobDisplayName: "Build: Web.JS"
     agentOs: Linux
     steps:
     - script: ./build.sh
@@ -49,7 +49,7 @@ jobs:
       artifact: WebJS_Javascript
     installJdk: false
     artifacts:
-    - name: WebJS_Linux_x64_Logs
+    - name: WebJS_Logs
       path: artifacts/log/
       publishOnError: true
 

eng/targets/Npm.Common.targets

@@ -16,11 +16,13 @@
       ResolveProjectReferences;
       _Build;
     </BuildDependsOn>
+    <NpmBuildArgs Condition="'$(NpmBuildArgs)' == ''">run build</NpmBuildArgs>
   </PropertyGroup>
 
   <ItemGroup>
     <TSFiles Include="$(MSBuildProjectDirectory)\*\*.ts" />
     <TSFiles Include="$(MSBuildProjectDirectory)\package.json" />
+    <TSFiles Include="$(MSBuildProjectDirectory)\*.npmproj" />
   </ItemGroup>
 
   <Target Name="_CheckForInvalidConfiguration">
@@ -53,7 +55,7 @@
     Condition="'$(IsBuildable)' != 'false'"
     Inputs="@(TSFiles)"
     Outputs="$(BaseIntermediateOutputPath)\build-sentinel" >
-    <Yarn Command="run build" StandardOutputImportance="High" StandardErrorImportance="High" />
+    <Yarn Command="$(NpmBuildArgs)" StandardOutputImportance="High" StandardErrorImportance="High" />
     <WriteLinesToFile Overwrite="true" File="$(BaseIntermediateOutputPath)\build-sentinel" />
   </Target>
 

src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj

@@ -8,6 +8,7 @@
     <_TestSauceArgs>--verbose --no-color --configuration $(Configuration) --sauce-user "$(SauceUser)" --sauce-key "$(SauceKey)"</_TestSauceArgs>
     <_TestSauceArgs Condition="'$(BrowserTestHostName)' != ''">$(_TestSauceArgs) --use-hostname "$(BrowserTestHostName)"</_TestSauceArgs>
     <NpmTestArgs Condition="'$(DailyTests)' != 'true'">run test:inner --no-color --configuration $(Configuration)</NpmTestArgs>
+    <NpmBuildArgs>run build:inner</NpmBuildArgs>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,13 +18,6 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 
-  <Target Name="Build" DependsOnTargets="$(BuildDependsOn)">
-    <Yarn Command="install --mutex network"
-      WorkingDirectory="$(RepoRoot)src/SignalR/clients/ts/FunctionalTests" />
-    <Yarn Command="run build:inner"
-      WorkingDirectory="$(RepoRoot)src/SignalR/clients/ts/FunctionalTests" />
-  </Target>
-
   <Target Name="Test" Condition="'$(IsTestProject)' == 'true'">
     <Message Importance="High" Text="Running tests for $(MSBuildProjectName)" />
     <Yarn Condition="'$(DailyTests)' != 'true'" Command="$(NpmTestArgs)" />