Fix test failures

Author: dsplaisted

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.CrossGen.targets

@@ -258,15 +258,22 @@ Restores netcoreapp and publishes it to a temp directory
 
   <Target Name="_RestoreCrossgen"
           DependsOnTargets="PrepforRestoreForComposeStore;
-                           _SetupStageForCrossgen;"
+                           _SetupStageForCrossgen;
+                           ApplyImplicitVersions"
           Condition="$(SkipOptimization) != 'true' ">
+
+    <ItemGroup>
+      <!-- Filter package references to the one for the platform library, in order to find the right version -->
+      <PackageReferenceForCrossGen Include="@(PackageReference)" Condition="'%(Identity)' == '$(MicrosoftNETPlatformLibrary)'" />
+    </ItemGroup>
+
     <MSBuild Projects="$(MSBuildProjectFullPath)"
                  Targets="Restore"
                  Properties="RestoreGraphProjectInput=$(MSBuildProjectFullPath);
                              DisableImplicitFrameworkReferences=true;
                              RestoreOutputPath=$(_CrossProjFileDir);
                              StorePackageName=$(MicrosoftNETPlatformLibrary);
-                             StorePackageVersion=$(RuntimeFrameworkVersion);"/>
+                             StorePackageVersion=%(PackageReferenceForCrossGen.Version);"/>
 
     <ResolvePublishAssemblies ProjectPath="$(MSBuildProjectFullPath)"
                               AssetsFilePath="$(_CrossProjAssetsFile)"

src/Tests/Microsoft.NET.Publish.Tests/GivenThatAPublishedDepsJsonShouldContainVersionInformation.cs

@@ -15,6 +15,9 @@
 using Microsoft.NET.TestFramework.Commands;
 using Microsoft.NET.TestFramework.ProjectConstruction;
 using Newtonsoft.Json.Linq;
+using NuGet.Common;
+using NuGet.Frameworks;
+using NuGet.ProjectModel;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -254,15 +257,14 @@ string GetRollForwardNetCoreAppVersion()
 
             var testAsset = _testAssetsManager.CreateTestProject(testProject)
                 .Restore(Log, testProject.Name);
-            var getValuesCommand = new GetValuesCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name),
-                        testProject.TargetFrameworks, "RuntimeFrameworkVersion")
-            {
-                ShouldCompile = false
-            };
 
-            getValuesCommand.Execute().Should().Pass();
+            LockFile lockFile = LockFileUtilities.GetLockFile(Path.Combine(testAsset.TestRoot, testProject.Name,
+                                            "obj", "project.assets.json"), NullLogger.Instance);
+
+            var target = lockFile.GetTarget(NuGetFramework.Parse(testProject.TargetFrameworks), null);
+            var netCoreAppLibrary = target.Libraries.Single(l => l.Name == "Microsoft.NETCore.App");
 
-            return getValuesCommand.GetValues().Single();
+            return netCoreAppLibrary.Version.ToString();
         }
     }
 }