From 3ee7058ef01bf5cb70c783d869773006be0ae3b5 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Thu, 6 Aug 2020 13:11:38 -0700
Subject: [PATCH] Remove requirements for VS 16.7 - use
 SignalR.Npm.FunctionalTests.npmproj to get non-stable version   - not
 Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj (avoid C# and F#
 projects)   - add `_GetPackageVersionInfo` target to all `*.npmproj` projects
     - make `_GetPackageVersionInfo` target work when `yarn` is not installed
 - switch codesign-xplat.yml to use `dotnet msbuild`   - above change also
 fixes Code-sign jobs but they're slightly faster using `dotnet msbuild`

---
 .azure/pipelines/jobs/codesign-xplat.yml |  1 +
 eng/Publishing.props                     | 12 +++++++-----
 eng/targets/Npm.Common.targets           | 15 ++++++++++++++-
 eng/targets/Packaging.targets            |  2 +-
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.azure/pipelines/jobs/codesign-xplat.yml b/.azure/pipelines/jobs/codesign-xplat.yml
index d65c9a5982..8d372ce2e4 100644
--- a/.azure/pipelines/jobs/codesign-xplat.yml
+++ b/.azure/pipelines/jobs/codesign-xplat.yml
@@ -31,6 +31,7 @@ jobs:
     - powershell: .\eng\common\build.ps1
         -ci
         -nobl
+        -msbuildEngine dotnet
         -restore
         -sign
         -publish
diff --git a/eng/Publishing.props b/eng/Publishing.props
index 2c13cb29bf..6525220505 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -31,12 +31,14 @@
   </ItemGroup>
 
   <Target Name="_PublishInstallersAndChecksums">
-    <!-- 
-      This target is defined in eng/targets/Packaging.targets and included in every C# and F# project.
-      We use Microsoft.AspNetCore.DeveloperCertificates.XPlat because it is a nonshipping package, and we need a non-stable version string to use as our publish location.
-      If Microsoft.AspNetCore.DeveloperCertificates.XPlat ever becomes a shipping package, this logic will break, so be careful
+    <!--
+      This target is defined in eng/targets/Packaging.targets and Npm.Common.targets and included in every C#, F#,
+      and npm project. We use SignalR.Npm.FunctionalTests.npmproj because it is non-shipping (we need a non-stable
+      version string to use as our publish location), non-packed (won't be shipped in the future), and it is _not_ a
+      C# or F# project. For now at least, C# and F# projects should not be referenced when using desktop msbuild.
     -->
-    <MSBuild Projects="$(RepoRoot)src\Tools\FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj"
+    <MSBuild Projects="$(RepoRoot)src\SignalR\clients\ts\FunctionalTests\SignalR.Npm.FunctionalTests.npmproj"
+        Properties="DisableYarnCheck=true"
         Targets="_GetPackageVersionInfo"
         SkipNonexistentProjects="false">
       <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />
diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets
index 10ff37ab61..696d23402b 100644
--- a/eng/targets/Npm.Common.targets
+++ b/eng/targets/Npm.Common.targets
@@ -29,7 +29,7 @@
     <BuildOutputFiles Include="dist\**\*.js" />
   </ItemGroup>
 
-  <Target Name="_CheckForInvalidConfiguration">
+  <Target Name="_CheckForInvalidConfiguration" Condition=" '$(DisableYarnCheck)' != 'true' ">
     <Error Text="Missing expected property: PackageId" Condition="'$(IsPackable)' != 'false' and '$(PackageId)' == ''" />
 
     <Exec ContinueOnError="true" Command="node -v" StandardOutputImportance="Low">
@@ -115,6 +115,19 @@
 
   <Target Name="Pack" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="$(PackDependsOn)" />
 
+  <!-- This target is used to get the package versions of projects. A variant also exists in Packaging.targets. -->
+  <Target Name="_GetPackageVersionInfo" Returns="@(_ProjectPathWithVersion)">
+    <ItemGroup>
+      <_ProjectPathWithVersion Include="$(MSBuildProjectFullPath)">
+        <PackageId>$(PackageId)</PackageId>
+        <PackageVersion>$(PackageVersionForPackageVersionInfo)</PackageVersion>
+        <VersionSuffix>$(VersionSuffix)</VersionSuffix>
+        <!-- Fill in the item though variable names like "@microsoft/signalrPackageVersion" are likely invalid. -->
+        <VersionVariableName>$(PackageId.Replace('.',''))PackageVersion</VersionVariableName>
+      </_ProjectPathWithVersion>
+    </ItemGroup>
+  </Target>
+
   <Target Name="_RestoreBackupPackageJsonFile">
     <Move SourceFiles="$(_BackupPackageJson)" DestinationFiles="$(PackageJson)" />
   </Target>
diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets
index ea8dabdb46..d50e9b3064 100644
--- a/eng/targets/Packaging.targets
+++ b/eng/targets/Packaging.targets
@@ -7,7 +7,7 @@
                  See $(RepoRoot)eng\tools\BaselineGenerator\README.md for instructions on updating this baseline." />
   </Target>
 
-  <!-- This target is used to get the package versions of projects -->
+  <!-- This target is used to get the package versions of projects. A variant also exists in Npm.Common.targets. -->
   <Target Name="_GetPackageVersionInfo" DependsOnTargets="$(GetPackageVersionDependsOn)"
           Returns="@(_ProjectPathWithVersion)">
     <ItemGroup>