Make System.IO.Pipelines a direct dependency of Microsoft.AspNetCore.App

Nate McMaster · Nate McMaster · commit 3f55bf3cfb42 · 2018-08-08T16:35:32.000Z
This is required for servicing this shared framework assembly independently of the aspnet packages which use it.
diff --git 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
@@ -89,7 +89,10 @@ public override bool Execute()
                     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

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,10 @@ public override bool Execute()`
`89`	`89`	`continue;`
`90`	`90`	`}`
`91`	`91`
`92`		`- var packageVersionValue = GetDependencyVersion(dependencyVersionType, packageName, packageVersion);`
	`92`	`+ var packageVersionValue =`
	`93`	`+ Enum.TryParse<VersionRangeType>(package.GetMetadata("MetapackageVersionRangeType"), out var packageVersionType)`
	`94`	`+ ? GetDependencyVersion(packageVersionType, packageName, packageVersion)`
	`95`	`+ : GetDependencyVersion(dependencyVersionType, packageName, packageVersion);`
`93`	`96`
`94`	`97`	`Log.LogMessage(MessageImportance.High, $" - Package: {packageName} Version: {packageVersionValue}");`
`95`	`98`