From 7efec87a141fe3a8a0e6039a08534478b3b74371 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 11 Aug 2020 10:10:24 -0700
Subject: [PATCH] Fix fetch of package version in eng/Publishing.props (#24777)

- target project is a test project; need to undo `$(SkipTestBuild)` impact in these jobs

nit: remove a comment from DeveloperCertificates project that's irrelevant now
---
 eng/Publishing.props                                           | 2 +-
 .../Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj    | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 6525220505..96ff7034d2 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -38,7 +38,7 @@
       C# or F# project. For now at least, C# and F# projects should not be referenced when using desktop msbuild.
     -->
     <MSBuild Projects="$(RepoRoot)src\SignalR\clients\ts\FunctionalTests\SignalR.Npm.FunctionalTests.npmproj"
-        Properties="DisableYarnCheck=true"
+        Properties="DisableYarnCheck=true;ExcludeFromBuild=false"
         Targets="_GetPackageVersionInfo"
         SkipNonexistentProjects="false">
       <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />
diff --git a/src/Tools/FirstRunCertGenerator/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj b/src/Tools/FirstRunCertGenerator/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj
index 25053effa6..0f373fe927 100644
--- a/src/Tools/FirstRunCertGenerator/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj
+++ b/src/Tools/FirstRunCertGenerator/src/Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj
@@ -8,9 +8,6 @@
 
     <!-- This package contains API for the .NET CLI to generate the aspnet HTTPs dev cert during CLI first-run initialization. -->
 
-    <!-- Our publishing logic depends on this particular package being NonShipping - if this ever becomes a Shipping project, we will incorrectly calculate the repo's version string,
-         which will cause us to publish installers & checksums to the wrong place. If this ever becomes a Shipping project, we also need to update the following line to reference a different NonShipping project:
-         https://github.com/dotnet/aspnetcore/blob/6301eefbc346b9ef00ede83ce223d8240b71942a/eng/Publishing.props#L39 -->
     <IsShippingPackage>false</IsShippingPackage>
     <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
   </PropertyGroup>