From 1aa16282a7cac97f50765bd3421a001c4d238349 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Tue, 18 Dec 2018 11:40:13 -0800
Subject: [PATCH] Update the artifacts directory organization and simplify
 publishing targets (dotnet/aspnetcore#5701)

This simplifies the way that we publish files to our network drop share.

Changes:
* Instead of explicitly listing every file that needs to publish, use directories to classify packages and artifacts into different categories.
* Add documentation for the expected layout of artifacts/
* Remove the need for static analysis to determine which packages go to which project
* Add the MSBuild property "IsProductPackage" to .csproj files which ship as a package to NuGet.org.

Commit migrated from dotnet/aspnetcore@335c9be7b4a7
---
 src/Directory.Build.props   |  9 +++++++++
 src/Directory.Build.targets | 15 ++++++++++++---
 src/build/repo.props        |  4 ++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index fc7aabfa0..2e24e9518 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -23,4 +23,13 @@
     <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
   </ItemGroup>
 
+  <!-- Artifacts layout -->
+  <PropertyGroup>
+    <ArtifactsDir>$(MSBuildThisFileDirectory)..\..\artifacts\</ArtifactsDir>
+    <ArtifactsConfigurationDir>$(ArtifactsDir)$(Configuration)\</ArtifactsConfigurationDir>
+    <BasePackageOutputPath>$(ArtifactsConfigurationDir)packages\</BasePackageOutputPath>
+    <ProductPackageOutputPath>$(BasePackageOutputPath)product\</ProductPackageOutputPath>
+    <InternalPackageOutputPath>$(BasePackageOutputPath)internal\</InternalPackageOutputPath>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 4bcc9df92..c73225cc3 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,8 +1,17 @@
 <Project>
   <PropertyGroup>
     <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
-    <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
-    <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
-    <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <!--
+      By default, all projects which produce packages are not intended to ship to NuGet.org as a product package.
+      Packages which are intended to ship to NuGet.org must opt-in by setting this to true in the project file.
+    -->
+    <IsProductPackage Condition=" '$(IsProductPackage)' == '' ">false</IsProductPackage>
+
+    <PackageOutputPath Condition=" '$(IsProductPackage)' == 'true' ">$(ProductPackageOutputPath)</PackageOutputPath>
+    <PackageOutputPath Condition=" '$(IsProductPackage)' != 'true' ">$(InternalPackageOutputPath)</PackageOutputPath>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/build/repo.props b/src/build/repo.props
index 58a02ecf2..99b418cc3 100644
--- a/src/build/repo.props
+++ b/src/build/repo.props
@@ -1,6 +1,10 @@
 <Project>
   <Import Project="dependencies.props" />
 
+  <PropertyGroup>
+    <OverridePackageOutputPath>false</OverridePackageOutputPath>
+  </PropertyGroup>
+
   <ItemGroup>
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp30PackageVersion)" />
   </ItemGroup>