From 599365626ac5264bc7c0a3dff588848ad1f186fb Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Wed, 21 Aug 2019 14:37:12 -0500
Subject: [PATCH] Categorize shipping/nonshipping NuGet packages

(cherry picked from commit 645aa3a62d3f94a3bd0698cec1cc18709ba1d818)
---
 publish/Directory.Build.targets               | 48 ++++++++++++-------
 publish/prepare-artifacts.proj                | 12 ++++-
 .../packaging-tools/framework.sharedfx.props  |  2 +-
 .../pkg/legacy/Directory.Build.props          |  2 +
 .../workaround/Microsoft.NETCore.App.pkgproj  |  2 +
 .../pkg/Microsoft.WindowsDesktop.App.pkgproj  |  2 +
 .../Assets/TestProjects/Directory.Build.props |  1 +
 .../PrepareTestAssets/PrepareTestAssets.proj  |  1 +
 8 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/publish/Directory.Build.targets b/publish/Directory.Build.targets
index 3121cbc3fd..bb39273131 100644
--- a/publish/Directory.Build.targets
+++ b/publish/Directory.Build.targets
@@ -23,7 +23,16 @@
         Include="$(DownloadDirectory)**\*.nupkg"
         Exclude="@(DownloadedSymbolNupkgFile)" />
 
-      <!-- RID-specific nupkg. These are published from every job. -->
+      <!-- Add files that are not affected by filtering. -->
+      <UploadToBlobStorageFile
+        Include="@(DownloadedArtifactFile)"
+        Exclude="@(DownloadedSymbolNupkgFile);@(DownloadedNupkgFile)" />
+
+      <!--
+        Filter out the RID-specific (Runtime) nupkgs and RID-agnostic nupkgs. RID-specific packages
+        are published from every job. RID-agnostic nupkgs are built with the same ID/version by
+        every job, so one specific job's outputs must be picked to sign and publish.
+      -->
       <RuntimeNupkgFile
         Include="
           $(DownloadDirectory)**\runtime.*.nupkg;
@@ -32,29 +41,34 @@
           $(DownloadDirectory)**\VS.Redist.Common.*.nupkg"
         Exclude="@(DownloadedSymbolNupkgFile)" />
 
-      <!--
-        RID-agnostic nupkg. These are built with the same ID/version by every job, so only one job's
-        results are picked for signing and publishing.
-      -->
       <RidAgnosticNupkgToPublishFile
         Include="$(DownloadDirectory)*\$(PublishRidAgnosticPackagesFromJobName)\**\*.nupkg"
         Exclude="@(RuntimeNupkgFile);@(DownloadedSymbolNupkgFile)" />
-      
-      <RidAgnosticNupkgToIgnoreFile
-        Include="@(DownloadedNupkgFile)"
-        Exclude="@(RidAgnosticNupkgToPublishFile);@(RuntimeNupkgFile)" />
-
-      <RidAgnosticSymbolNupkgToIgnoreFile
-        Include="@(RidAgnosticNupkgToIgnoreFile -> '%(RootDir)%(Directory)%(Filename).symbols.nupkg')" />
 
       <NupkgToPublishFile Include="@(RuntimeNupkgFile);@(RidAgnosticNupkgToPublishFile)" />
-      <SymbolNupkgToPublishFile Include="@(DownloadedSymbolNupkgFile)" Exclude="@(RidAgnosticSymbolNupkgToIgnoreFile)" />
 
-      <!-- Filter out duplicate nupkgs/symbols.nupkgs, but other artifacts are fine. -->
-      <UploadToBlobStorageFile
-        Include="@(DownloadedArtifactFile)"
-        Exclude="@(RidAgnosticNupkgToIgnoreFile);@(RidAgnosticSymbolNupkgToIgnoreFile)" />
+      <UploadToBlobStorageFile Include="@(NupkgToPublishFile)" />
+
+      <!--
+        Assuming all symbol packages ship and can be found by turning .nupkg => .symbols.nupkg, find
+        them. Don't check for missing symbol packages here: some nupkgs don't have them for valid
+        reasons, such as the VS insertion packages that transport MSIs. Symbol package validation
+        will check for symbol completeness with file-by-file granularity rather than looking for
+        missing symbols.nupkg files: https://github.com/dotnet/arcade/issues/2499.
+      -->
+      <PotentialSymbolNupkgToPublishFile
+        Include="@(NupkgToPublishFile->Replace('\NonShipping\', '\Shipping\')->Replace('.nupkg', '.symbols.nupkg'))" />
+
+      <SymbolNupkgToPublishFile
+        Include="@(PotentialSymbolNupkgToPublishFile)"
+        Condition="Exists('%(Identity)')" />
+
+      <UploadToBlobStorageFile Include="@(SymbolNupkgToPublishFile)" />
     </ItemGroup>
+
+    <Error
+      Condition="'@(SymbolNupkgToPublishFile)' == ''"
+      Text="No symbol packages found." />
   </Target>
 
   <Import Project="..\Directory.Build.targets" />
diff --git a/publish/prepare-artifacts.proj b/publish/prepare-artifacts.proj
index 7f7bdee661..10429538b9 100644
--- a/publish/prepare-artifacts.proj
+++ b/publish/prepare-artifacts.proj
@@ -41,9 +41,19 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <!-- Split nupkgs into shipping/nonshipping for BAR categorization. -->
+      <ShippingNupkgToPublishFile
+        Include="@(NupkgToPublishFile)"
+        Condition="$([System.String]::new('%(Identity)').Contains('\Shipping\'))" />
+
+      <NonShippingNupkgToPublishFile
+        Include="@(NupkgToPublishFile)"
+        Exclude="@(ShippingNupkgToPublishFile)" />
+
       <ItemsToPush Remove="@(ItemsToPush)" />
 
-      <ItemsToPush Include="@(NupkgToPublishFile)" />
+      <ItemsToPush Include="@(ShippingNupkgToPublishFile)" />
+      <ItemsToPush Include="@(NonShippingNupkgToPublishFile)" ManifestArtifactData="NonShipping=true" />
       <ItemsToPush Include="@(SymbolNupkgToPublishFile)" />
     </ItemGroup>
 
diff --git a/src/pkg/packaging-tools/framework.sharedfx.props b/src/pkg/packaging-tools/framework.sharedfx.props
index 26fa4a4e6b..02e0aa2bb7 100644
--- a/src/pkg/packaging-tools/framework.sharedfx.props
+++ b/src/pkg/packaging-tools/framework.sharedfx.props
@@ -21,7 +21,7 @@
     <MicrosoftNETPlatformLibrary>do-not-consider-existing-platform</MicrosoftNETPlatformLibrary>
 
     <!-- Only Restore from our built packages -->
-    <RestoreSources>$(ArtifactsShippingPackagesDir)</RestoreSources>
+    <RestoreSources>$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)</RestoreSources>
     <AddDotnetfeedProjectSource>false</AddDotnetfeedProjectSource>
     <RestoreAllBuildRids>false</RestoreAllBuildRids>
     <!-- Ensure only this repo's NuGet.config file is used. -->
diff --git a/src/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props b/src/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props
index f4b18f4cf7..2bc2d8dbbd 100644
--- a/src/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props
+++ b/src/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props
@@ -4,6 +4,8 @@
   <PropertyGroup>
     <PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference>
     <BuildTargetPath>build/$(NETCoreAppFramework)/</BuildTargetPath>
+
+    <IsShippingPackage>false</IsShippingPackage>
   </PropertyGroup>
 
   <!-- Identity / Reference package content -->
diff --git a/src/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj b/src/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj
index f3a57e7551..279c09517b 100644
--- a/src/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj
+++ b/src/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj
@@ -15,6 +15,8 @@
     <ExcludeLineupReference>true</ExcludeLineupReference>
 
     <BuildRuntimePackages>false</BuildRuntimePackages>
+
+    <IsShippingPackage>false</IsShippingPackage>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/pkg/projects/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj b/src/pkg/projects/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj
index e448c5824d..048af42016 100644
--- a/src/pkg/projects/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj
+++ b/src/pkg/projects/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.pkgproj
@@ -17,6 +17,8 @@
       it in correctly. Being wrong means dependency failures at runtime.
     -->
     <SkipValidatePackage>false</SkipValidatePackage>
+
+    <IsShippingPackage>false</IsShippingPackage>
   </PropertyGroup>
 
   <!-- Temporarily ignore duplicate types until WPF updates. https://github.com/dotnet/core-setup/issues/6838 -->
diff --git a/src/test/Assets/TestProjects/Directory.Build.props b/src/test/Assets/TestProjects/Directory.Build.props
index d370c58a76..db2178e295 100644
--- a/src/test/Assets/TestProjects/Directory.Build.props
+++ b/src/test/Assets/TestProjects/Directory.Build.props
@@ -3,6 +3,7 @@
 
   <ItemGroup>
     <RestoreTestFallbackSource Include="$(ArtifactsShippingPackagesDir)" />
+    <RestoreTestFallbackSource Include="$(ArtifactsNonShippingPackagesDir)" />
     <RestoreTestSource Include="$(RestoreSources)" />
     <RestoreTestSource Include="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <RestoreTestSource Include="https://api.nuget.org/v3/index.json" />
diff --git a/src/test/PrepareTestAssets/PrepareTestAssets.proj b/src/test/PrepareTestAssets/PrepareTestAssets.proj
index bb5542c850..e3906ddeb0 100644
--- a/src/test/PrepareTestAssets/PrepareTestAssets.proj
+++ b/src/test/PrepareTestAssets/PrepareTestAssets.proj
@@ -41,6 +41,7 @@
       Targets="Restore"
       Properties="
         ArtifactsShippingPackagesDir=$(ArtifactsShippingPackagesDir);
+        ArtifactsNonShippingPackagesDir=$(ArtifactsNonShippingPackagesDir);
         TestRestorePackagesPath=$(TestRestorePackagesPath);
         TestTargetRid=$(TestTargetRid);
         MNAVersion=$(ProductVersion)" />