From 3df829274376bbf1585dcea9489811348d289529 Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Sun, 1 Mar 2020 13:29:25 -0800
Subject: [PATCH] Update build scripts to enable Microsoft.Extensions projects
 incrementally - BinPlacing for Extensions projects - Ignore building
 Microsoft.Extensions. projects - Use correct StringNameKeyId for Extensions
 projects - Separate packaging path for extensions projects - Add
 PreReleaseVersionIteration

---
 eng/Versions.props                    |  1 +
 src/libraries/Directory.Build.props   | 14 ++++++++++++++
 src/libraries/Directory.Build.targets |  4 ++++
 3 files changed, 19 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index d4c26a5cbe63c9..0af9ea49bfbf0f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,6 +8,7 @@
     <PatchVersion>0</PatchVersion>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))">$(PreReleaseVersionIteration)-runtime</PreReleaseVersionIteration>
     <!-- Set assembly version to align with major and minor version,
          as for the patches and revisions should be manually updated per assembly if it is serviced. -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 80c88beb4f6a2c..7e83270bcc1392 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -4,6 +4,17 @@
   </PropertyGroup>
   <Import Project="..\..\Directory.Build.props" />
 
+  <ItemGroup>
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\ref\**\Microsoft.Extensions.*proj" Exclude="@(PortedExtensionsProject)" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\src\**\Microsoft.Extensions.*proj" Exclude="@(PortedExtensionsProject)" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\Microsoft.Extensions.*.Tests.csproj" Exclude="@(PortedExtensionsProject)" />
+  </ItemGroup>
+
+  <PropertyGroup Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.')) and !$(MSBuildProjectName.EndsWith('.Tests'))">
+    <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
+    <IsAspNetCoreApp>true</IsAspNetCoreApp>
+  </PropertyGroup>
+
   <PropertyGroup>
     <ToolSetCommonDirectory>$(RepoRoot)artifacts\toolset\Common\</ToolSetCommonDirectory>
     <IsSourceProject>$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))</IsSourceProject>
@@ -311,6 +322,9 @@
     <!-- Paths to binplace package content -->
     <NETCoreAppPackageRefPath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\ref</NETCoreAppPackageRefPath>
     <NETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\lib</NETCoreAppPackageRuntimePath>
+    
+    <ASPNETCoreAppPackageRefPath>$(ArtifactsBinDir)pkg\aspnetcoreapp\ref</ASPNETCoreAppPackageRefPath>
+    <ASPNETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\aspnetcoreapp\lib</ASPNETCoreAppPackageRuntimePath>
 
     <TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildSettings)'))</TestHostRootPath>
 
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 08c6d77720f6b3..2d5b32f022e8ca 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -66,6 +66,10 @@
       <!-- enable trimming for any runtime project that's part of the shared framework and hasn't already set ILLinkTrimAssembly -->
       <SetProperties Condition="'$(BinPlaceRuntime)' == 'true' and '$(ILLinkTrimAssembly)' == ''">ILLinkTrimAssembly=true</SetProperties>
     </BinPlaceTargetFrameworks>
+    <BinPlaceTargetFrameworks Condition="'$(IsAspNetCoreApp)' == 'true'" Include="$(NetCoreAppCurrent)">
+      <RuntimePath>$(ASPNETCoreAppPackageRuntimePath)</RuntimePath>
+      <RefPath>$(ASPNETCoreAppPackageRefPath)</RefPath>
+    </BinPlaceTargetFrameworks>
 
     <!-- Setup the shared framework directory for testing -->
     <BinPlaceTargetFrameworks Condition="'$(BinPlaceTestSharedFramework)' == 'true'" Include="$(NetCoreAppCurrent)-$(OSGroup)">