prototype

tbolon · Apr 9, 2019 · 1e360a5 · 1e360a5
1 parent face61a
commit 1e360a5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.targets b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.targets
@@ -318,8 +318,9 @@ Copyright (c) .NET Foundation. All rights reserved.
  Returns="@(_ProjectPathWithVersion)">
  <ItemGroup>
  <_ProjectPathWithVersion Include="$(MSBuildProjectFullPath)">
- <ProjectVersion Condition="'$(PackageVersion)' != ''">$(PackageVersion)</ProjectVersion>
- <ProjectVersion Condition="'$(PackageVersion)' == ''">1.0.0</ProjectVersion>
+ <ProjectVersion Condition="'$(ProjectVersion)' == ''">$(PackageDependencyVersion)</ProjectVersion>
+ <ProjectVersion Condition="'$(ProjectVersion)' == ''">$(PackageVersion)</ProjectVersion>
+ <ProjectVersion Condition="'$(ProjectVersion)' == ''">1.0.0</ProjectVersion>
  </_ProjectPathWithVersion>
  </ItemGroup>
  </Target>

diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskLogic.cs b/src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskLogic.cs
@@ -803,13 +803,20 @@ private static void InitializeProjectDependencies(
  continue;
  }
 
- var versionToUse = targetLibrary.Version;
+ var rangeToUse = new VersionRange(targetLibrary.Version);
 
  // Use the project reference version obtained at build time if it exists, otherwise fallback to the one in assets file. 
  if (projectRefToVersionMap.TryGetValue(projectReference.ProjectPath, out var projectRefVersion))
  {
- versionToUse = NuGetVersion.Parse(projectRefVersion);
+ // First we try to use the projectRefVersion as a Version Range, to allow the referenced project to define the entire range
+ if (!VersionRange.TryParse(projectRefVersion, out rangeToUse))
+ {
+ // Else, we fallback to parsing the range as a simplier version the creating a default range "[x,)"
+ var versionToUse = NuGetVersion.Parse(projectRefVersion);
+ rangeToUse = new VersionRange(versionToUse);
+ }
  }
+
  // TODO: Implement <TreatAsPackageReference>false</TreatAsPackageReference>
  // https:/NuGet/Home/issues/3891
  //
@@ -818,7 +825,7 @@ private static void InitializeProjectDependencies(
  {
  LibraryRange = new LibraryRange(
  targetLibrary.Name,
- new VersionRange(versionToUse),
+ rangeToUse,
  LibraryDependencyTarget.All),
  IncludeType = projectReference.IncludeAssets & ~projectReference.ExcludeAssets,
  SuppressParent = projectReference.PrivateAssets