From 3f55bf3cfb42d5e576cc0d64dfffd02c1a3c5026 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 8 Aug 2018 16:35:32 +0000
Subject: [PATCH] Make System.IO.Pipelines a direct dependency of
 Microsoft.AspNetCore.App

This is required for servicing this shared framework assembly independently of the aspnet packages which use it.
---
 build/external-dependencies.props            |  2 +-
 build/tasks/AddMetapackageReferences.cs      |  5 ++++-
 build/tools/templates/Archive/Archive.csproj | 14 --------------
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 build/tools/templates/Archive/Archive.csproj

diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index f0261d2212..8f8858d98c 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -129,7 +129,7 @@
     <ExternalDependency Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" />
     <ExternalDependency Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelTokensJwtPackageVersion)" />
     <ExternalDependency Include="System.Interactive.Async" Version="$(SystemInteractiveAsyncPackageVersion)" />
-    <ExternalDependency Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
+    <ExternalDependency Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" AppMetapackage="true" AllMetapackage="true" MetapackageVersionRangeType="Minimum" />
     <ExternalDependency Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
     <ExternalDependency Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
     <ExternalDependency Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
diff --git a/build/tasks/AddMetapackageReferences.cs b/build/tasks/AddMetapackageReferences.cs
index 57a9675061..3cb11666ab 100644
--- a/build/tasks/AddMetapackageReferences.cs
+++ b/build/tasks/AddMetapackageReferences.cs
@@ -89,7 +89,10 @@ namespace RepoTasks
                     continue;
                 }
 
-                var packageVersionValue = GetDependencyVersion(dependencyVersionType, packageName, packageVersion);
+                var packageVersionValue =
+                    Enum.TryParse<VersionRangeType>(package.GetMetadata("MetapackageVersionRangeType"), out var packageVersionType)
+                    ? GetDependencyVersion(packageVersionType, packageName, packageVersion)
+                    : GetDependencyVersion(dependencyVersionType, packageName, packageVersion);
 
                 Log.LogMessage(MessageImportance.High, $" - Package: {packageName} Version: {packageVersionValue}");
 
diff --git a/build/tools/templates/Archive/Archive.csproj b/build/tools/templates/Archive/Archive.csproj
deleted file mode 100644
index e2843be0e0..0000000000
--- a/build/tools/templates/Archive/Archive.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <EnableApiCheck>false</EnableApiCheck>
-    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" Version="$(RuntimeFrameworkVersion)" />
-  </ItemGroup>
-
-</Project>