Skip to content
This repository has been archived by the owner on Oct 18, 2018. It is now read-only.

Commit

Permalink
Make System.IO.Pipelines a direct dependency of Microsoft.AspNetCore.App
Browse files Browse the repository at this point in the history
This is required for servicing this shared framework assembly independently of the aspnet packages which use it.
  • Loading branch information
Nate McMaster committed Aug 8, 2018
1 parent 2f85e4a commit 3f55bf3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build/external-dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down
5 changes: 4 additions & 1 deletion build/tasks/AddMetapackageReferences.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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}");

Expand Down
14 changes: 0 additions & 14 deletions build/tools/templates/Archive/Archive.csproj

This file was deleted.

0 comments on commit 3f55bf3

Please sign in to comment.