Use assets file cache for PackageFolders

dotnet · Jan 3, 2019 · a522481 · a522481
1 parent 33d5690
commit a522481
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 6 deletions.
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GetPackageDirectory.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GetPackageDirectory.cs
@@ -14,10 +14,15 @@ public class GetPackageDirectory : TaskBase
     {
         public ITaskItem[] Items { get; set; }
 
+        [Required]
         public string ProjectAssetsFile { get; set; }
 
+        [Required]
         public string ProjectPath { get; set; }
 
+        [Required]
+        public string [] PackageFolders { get; set; }
+
         [Output]
         public ITaskItem[] Output { get; set; }
 

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/NuGetPackageResolver.cs b/src/Tasks/Microsoft.NET.Build.Tasks/NuGetPackageResolver.cs
@@ -59,13 +59,17 @@ public static string NormalizeRelativePath(string relativePath)
                 => relativePath.Replace('/', Path.DirectorySeparatorChar);
 
         public static NuGetPackageResolver CreateResolver(LockFile lockFile, string projectPath)
+        {
+            return CreateResolver(lockFile.PackageFolders.Select(f => f.Path), projectPath);
+        }
+        public static NuGetPackageResolver CreateResolver(IEnumerable<string> packageFolders, string projectPath)
         {
             NuGetPackageResolver packageResolver;
 
-            string userPackageFolder = lockFile.PackageFolders.FirstOrDefault()?.Path;
+            string userPackageFolder = packageFolders.FirstOrDefault();
             if (userPackageFolder != null)
             {
-                var fallBackFolders = lockFile.PackageFolders.Skip(1).Select(f => f.Path);
+                var fallBackFolders = packageFolders.Skip(1);
                 packageResolver = new NuGetPackageResolver(userPackageFolder, fallBackFolders);
             }
             else

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs
@@ -172,6 +172,12 @@ public sealed class ResolvePackageAssets : TaskBase
         [Output]
         public ITaskItem[] NativeLibraries { get; private set; }
 
+        /// <summary>
+        /// The package folders from the assets file (ie the paths under which package assets may be found)
+        /// </summary>
+        [Output]
+        public ITaskItem[] PackageFolders { get; set; }
+
         /// <summary>
         /// Full paths to satellite assemblies from packages.
         /// </summary>
@@ -255,7 +261,7 @@ public sealed class ResolvePackageAssets : TaskBase
         ////////////////////////////////////////////////////////////////////////////////////////////////////
 
         private const int CacheFormatSignature = ('P' << 0) | ('K' << 8) | ('G' << 16) | ('A' << 24);
-        private const int CacheFormatVersion = 3;
+        private const int CacheFormatVersion = 4;
         private static readonly Encoding TextEncoding = Encoding.UTF8;
         private const int SettingsHashLength = 256 / 8;
         private HashAlgorithm CreateSettingsHash() => SHA256.Create();
@@ -284,6 +290,7 @@ private void ReadItemGroups()
                 ContentFilesToPreprocess = reader.ReadItemGroup();
                 FrameworkAssemblies = reader.ReadItemGroup();
                 NativeLibraries = reader.ReadItemGroup();
+                PackageFolders = reader.ReadItemGroup();
                 ResourceAssemblies = reader.ReadItemGroup();
                 RuntimeAssemblies = reader.ReadItemGroup();
                 RuntimeTargets = reader.ReadItemGroup();
@@ -677,6 +684,7 @@ private void WriteItemGroups()
                 WriteItemGroup(WriteContentFilesToPreprocess);
                 WriteItemGroup(WriteFrameworkAssemblies);
                 WriteItemGroup(WriteNativeLibraries);
+                WriteItemGroup(WritePackageFolders);
                 WriteItemGroup(WriteResourceAssemblies);
                 WriteItemGroup(WriteRuntimeAssemblies);
                 WriteItemGroup(WriteRuntimeTargets);
@@ -985,6 +993,14 @@ private void WriteApphostsForShimRuntimeIdentifiers()
                 }
             }
 
+            private void WritePackageFolders()
+            {
+                foreach (var packageFolder in _lockFile.PackageFolders)
+                {
+                    WriteItem(packageFolder.Path);
+                }
+            }
+
             private void WriteResourceAssemblies()
             {
                 WriteItems(

diff --git a/...Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.TargetingPackResolution.targets b/...Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.TargetingPackResolution.targets
@@ -20,12 +20,13 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <UsingTask TaskName="GetPackageDirectory" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
 
-  <Target Name="ResolveTargetingPacks">
+  <Target Name="ResolveTargetingPacks" DependsOnTargets="ResolvePackageAssets">
 
     <GetPackageDirectory
       Items="@(TargetingPack)"
       ProjectAssetsFile="$(ProjectAssetsFile)"
-      ProjectPath="$(MSBuildProjectFullPath)">
+      ProjectPath="$(MSBuildProjectFullPath)"
+      PackageFolders="@(AssetFilePackageFolder)">
 
       <Output TaskParameter="Output" ItemName="ResolvedTargetingPack" />
 
@@ -53,7 +54,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     <GetPackageDirectory
       Items="@(AppHostPack)"
       ProjectAssetsFile="$(ProjectAssetsFile)"
-      ProjectPath="$(MSBuildProjectFullPath)">
+      ProjectPath="$(MSBuildProjectFullPath)"
+      PackageFolders="@(AssetFilePackageFolder)">
 
       <Output TaskParameter="Output" ItemName="ResolvedAppHostPack" />
 

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets
@@ -264,6 +264,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="RuntimeTargets" ItemName="RuntimeTargetsCopyLocalItems" />
       <Output TaskParameter="CompileTimeAssemblies" ItemName="ResolvedCompileFileDefinitions" />
       <Output TaskParameter="TransitiveProjectReferences" ItemName="_TransitiveProjectReferences" />
+      <Output TaskParameter="PackageFolders" ItemName="AssetFilePackageFolder" />
     </ResolvePackageAssets>
 
     <ItemGroup Condition="'$(UseAppHostFromAssetsFile)' == 'true'">