Dotnet publish with filter profile

TestAssets/TestProjects/NewtonsoftFilterProfile/NewtonsoftFilterProfile.csproj

@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>9.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
+</Project>

src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs

@@ -27,6 +27,9 @@ public class GenerateRuntimeConfigurationFiles : TaskBase
         [Required]
         public string TargetFramework { get; set; }
 
+        [Required]
+        public string TargetFrameworkMoniker { get; set; }
+
         [Required]
         public string RuntimeConfigPath { get; set; }
 
@@ -56,7 +59,7 @@ protected override void ExecuteCore()
         {
             LockFile lockFile = new LockFileCache(BuildEngine4).GetLockFile(AssetsFilePath);
             ProjectContext projectContext = lockFile.CreateProjectContext(
-                NuGetUtils.ParseFrameworkName(TargetFramework),
+                NuGetUtils.ParseFrameworkName(TargetFrameworkMoniker),
                 RuntimeIdentifier,
                 PlatformLibraryName);
 
@@ -99,6 +102,7 @@ private void AddFramework(RuntimeOptions runtimeOptions, ProjectContext projectC
                     }
 
                     runtimeOptions.Framework = framework;
+                    runtimeOptions.tfm = TargetFramework;
                 }
             }
         }

src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs

@@ -16,7 +16,8 @@ public static ProjectContext CreateProjectContext(
             this LockFile lockFile,
             NuGetFramework framework,
             string runtime,
-            string platformLibraryName)
+            string platformLibraryName,
+            LockFile filterlockFile = null)
         {
             if (lockFile == null)
             {
@@ -28,6 +29,12 @@ public static ProjectContext CreateProjectContext(
             }
 
             LockFileTarget lockFileTarget = lockFile.GetTarget(framework, runtime);
+            LockFileTarget filterlockFileTarget = null;
+
+            if (filterlockFile != null)
+            {
+                filterlockFileTarget = filterlockFile.GetTarget(framework, runtime);
+            }
 
             if (lockFileTarget == null)
             {
@@ -39,7 +46,7 @@ public static ProjectContext CreateProjectContext(
                 throw new BuildErrorException(Strings.AssetsFileMissingTarget, lockFile.Path, targetMoniker, framework.GetShortFolderName(), runtime);
             }
 
-            return new ProjectContext(lockFile, lockFileTarget, platformLibraryName);
+            return new ProjectContext(lockFile, lockFileTarget, platformLibraryName, filterlockFileTarget);
         }
 
         public static LockFileTargetLibrary GetLibrary(this LockFileTarget lockFileTarget, string libraryName)
@@ -76,6 +83,7 @@ public static Dictionary<string, string> GetProjectFileDependencies(this LockFil
 
             return projectDeps;
         }
+
 
         public static HashSet<string> GetPlatformExclusionList(
             this LockFileTarget lockFileTarget,

src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs

@@ -12,6 +12,7 @@ namespace Microsoft.NET.Build.Tasks
     public class ProjectContext
     {
         private readonly LockFile _lockFile;
+        private readonly LockFileTarget _filterlockFileTarget;
         private readonly LockFileTarget _lockFileTarget;
         private readonly string _platformLibraryName;
 
@@ -21,9 +22,10 @@ public class ProjectContext
         public LockFile LockFile => _lockFile;
         public LockFileTarget LockFileTarget => _lockFileTarget;
 
-        public ProjectContext(LockFile lockFile, LockFileTarget lockFileTarget, string platformLibraryName)
+        public ProjectContext(LockFile lockFile, LockFileTarget lockFileTarget, string platformLibraryName, LockFileTarget filterlockFileTarget = null)
         {
             _lockFile = lockFile;
+            _filterlockFileTarget = filterlockFileTarget;
             _lockFileTarget = lockFileTarget;
             _platformLibraryName = platformLibraryName;
 
@@ -54,6 +56,14 @@ public IEnumerable<LockFileTargetLibrary> GetRuntimeLibraries(IEnumerable<string
                 allExclusionList.UnionWith(privateAssetsExclusionList);
             }
 
+            if(_filterlockFileTarget != null)
+            {
+                IEnumerable<LockFileTargetLibrary> filterLibraries = _filterlockFileTarget.Libraries;
+                Dictionary<string, LockFileTargetLibrary> filterLookup = filterLibraries.ToDictionary(e => e.Name, StringComparer.OrdinalIgnoreCase);
+
+                allExclusionList.UnionWith(GetIntersection(filterLookup, libraryLookup));
+            }
+
             return runtimeLibraries.Filter(allExclusionList).ToArray();
         }
 
@@ -171,5 +181,35 @@ public HashSet<string> GetPrivateAssetsExclusionList(
 
             return privateAssetsToExclude;
         }
+        private static HashSet<string> GetIntersection(
+          IDictionary<string, LockFileTargetLibrary> collection1,
+          IDictionary<string, LockFileTargetLibrary> collection2)
+        {
+            var exclusionList = new HashSet<string>();
+            var iterated = collection1;
+            var lookup = collection2;
+
+            if (collection1.Count > collection2.Count)
+            {
+                iterated = collection2;
+                lookup = collection1;
+            }
+            foreach (var entry in iterated)
+            {
+                LockFileTargetLibrary library = lookup[entry.Key];
+
+                if (library != null)
+                {
+                    LockFileTargetLibrary dependency = entry.Value;
+
+                    if (library.Version.Equals(dependency.Version))
+                    {
+                        exclusionList.Add(entry.Key);
+                    }
+                }
+            }
+
+            return exclusionList;
+        }
     }
 }

src/Tasks/Microsoft.NET.Build.Tasks/ResolvePublishAssemblies.cs

@@ -29,8 +29,11 @@ public class ResolvePublishAssemblies : TaskBase
         public string PlatformLibraryName { get; set; }
 
         public ITaskItem[] PrivateAssetsPackageReferences { get; set; }
-        
+
         public bool PreserveCacheLayout { get; set; }
+
+        public string FilterProjectAssetsFile { get; set; }
+
         /// <summary>
         /// All the assemblies to publish.
         /// </summary>
@@ -42,16 +45,25 @@ public ITaskItem[] AssembliesToPublish
 
         protected override void ExecuteCore()
         {
-            LockFile lockFile = new LockFileCache(BuildEngine4).GetLockFile(AssetsFilePath);            
+            var lockFileCache = new LockFileCache(BuildEngine4);
+            LockFile lockFile = lockFileCache.GetLockFile(AssetsFilePath);
             IEnumerable<string> privateAssetsPackageIds = PackageReferenceConverter.GetPackageIds(PrivateAssetsPackageReferences);
             IPackageResolver packageResolver = NuGetPackageResolver.CreateResolver(lockFile, ProjectPath);
 
+            LockFile filterLockFile = null;
+            if (!string.IsNullOrEmpty(FilterProjectAssetsFile))
+            {
+                filterLockFile = lockFileCache.GetLockFile(FilterProjectAssetsFile);
+
+            }
             ProjectContext projectContext = lockFile.CreateProjectContext(
                 NuGetUtils.ParseFrameworkName(TargetFramework),
                 RuntimeIdentifier,
-                PlatformLibraryName);
+                PlatformLibraryName,
+                filterLockFile
+                );
 
-            IEnumerable<ResolvedFile> resolvedAssemblies = 
+            IEnumerable<ResolvedFile> resolvedAssemblies =
                 new PublishAssembliesResolver(packageResolver)
                     .WithPrivateAssets(privateAssetsPackageIds)
                     .WithPreserveCacheLayout(PreserveCacheLayout)

src/Tasks/Microsoft.NET.Build.Tasks/RuntimeOptions.cs

@@ -9,6 +9,8 @@ namespace Microsoft.NET.Build.Tasks
 {
     internal class RuntimeOptions
     {
+        public string tfm { get; set; }
+
         public RuntimeConfigFramework Framework { get; set; }
 
         public List<string> AdditionalProbingPaths { get; set; }

src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Publish.targets

@@ -227,10 +227,12 @@ Copyright (c) .NET Foundation. All rights reserved.
   <UsingTask TaskName="ResolvePublishAssemblies" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
   <Target Name="RunResolvePublishAssemblies"
           DependsOnTargets="ComputePrivateAssetsPackageReferences;
+                            ComputePackagesToBeFiltered;
                             _DefaultMicrosoftNETPlatformLibrary">
 
     <ResolvePublishAssemblies ProjectPath="$(MSBuildProjectFullPath)"
                               AssetsFilePath="$(ProjectAssetsFile)"
+                              FilterProjectAssetsFile="$(FilterProjectAssetsFile)"
                               TargetFramework="$(TargetFrameworkMoniker)"
                               RuntimeIdentifier="$(RuntimeIdentifier)"
                               PlatformLibraryName="$(MicrosoftNETPlatformLibrary)"
@@ -242,6 +244,33 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ResolvePublishAssemblies>
 
   </Target>
+
+ <!--
+    ============================================================
+                     ComputePackagesToBeFiltered
+
+    Gets the closure of all the specified packages in $(FilterProjFile)
+    These will be removed from the assets that are published
+    ============================================================
+    -->
+
+  <Target Name="ComputePackagesToBeFiltered"
+          Condition="'$(FilterProjFile)'!=''" >
+    <PropertyGroup>
+      <FilterProjFileDir>$(MSBuildProjectExtensionsPath)\filterprofile</FilterProjFileDir>
+      <FilterProjectAssetsFile>$(FilterProjFileDir)\project.assets.json</FilterProjectAssetsFile>
+    </PropertyGroup>
+    <MSBuild Projects="$(FilterProjFile)"
+             Targets="Restore"
+             Properties="RestoreGraphProjectInput=$(FilterProjFile);
+                         DisableImplicitFrameworkReferences=true;
+                         RestoreOutputPath=$(FilterProjFileDir);
+                         TargetFramework=$(TargetFramework);
+                         RuntimeIdentifier=$(RuntimeIdentifier)"/>
+
+
+
+  </Target>
 
   <!--
     ============================================================
@@ -498,7 +527,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     </PropertyGroup>
 
     <GenerateRuntimeConfigurationFiles AssetsFilePath="$(ProjectAssetsFile)"
-                                       TargetFramework="$(TargetFrameworkMoniker)"
+                                       TargetFrameworkMoniker="$(TargetFrameworkMoniker)"
+                                       TargetFramework="$(TargetFramework)"
                                        RuntimeConfigPath="$(PublishRuntimeConfigFilePath)"
                                        RuntimeIdentifier="$(RuntimeIdentifier)"
                                        PlatformLibraryName="$(MicrosoftNETPlatformLibrary)"

src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets

@@ -111,7 +111,8 @@ Copyright (c) .NET Foundation. All rights reserved.
           Outputs="$(ProjectRuntimeConfigFilePath);$(ProjectRuntimeConfigDevFilePath)">
 
     <GenerateRuntimeConfigurationFiles AssetsFilePath="$(ProjectAssetsFile)"
-                                       TargetFramework="$(TargetFrameworkMoniker)"
+                                       TargetFrameworkMoniker="$(TargetFrameworkMoniker)"
+                                       TargetFramework="$(TargetFramework)"
                                        RuntimeConfigPath="$(ProjectRuntimeConfigFilePath)"
                                        RuntimeConfigDevPath="$(ProjectRuntimeConfigDevFilePath)"
                                        RuntimeIdentifier="$(RuntimeIdentifier)"

test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithDependencies.cs

@@ -3,12 +3,16 @@
 
 using System.IO;
 using Microsoft.DotNet.Cli.Utils;
+using FluentAssertions;
 using Microsoft.NET.TestFramework;
 using Microsoft.NET.TestFramework.Assertions;
 using Microsoft.NET.TestFramework.Commands;
 using Xunit;
 using static Microsoft.NET.TestFramework.Commands.MSBuildTest;
+using Microsoft.DotNet.InternalAbstractions;
 using System.Runtime.InteropServices;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Microsoft.NET.Publish.Tests
 {
@@ -109,5 +113,94 @@ public void It_publishes_projects_targeting_netcoreapp11_with_p2p_targeting_netc
                 .Should()
                 .Pass();
         }
+
+        [Fact]
+        public void It_publishes_projects_with_simple_dependencies_with_filter_profile()
+        {
+            string project = "SimpleDependencies";
+            string tfm = "netcoreapp1.0";
+            TestAsset simpleDependenciesAsset = _testAssetsManager
+                .CopyTestAsset(project)
+                .WithSource()
+                .Restore("", $"/p:TargetFramework={tfm}");
+
+            string filterProjDir = _testAssetsManager.GetAndValidateTestProjectDirectory("NewtonsoftFilterProfile");
+            string filterProjFile = Path.Combine(filterProjDir, "NewtonsoftFilterProfile.csproj");
+
+            PublishCommand publishCommand = new PublishCommand(Stage0MSBuild, simpleDependenciesAsset.TestRoot);
+            publishCommand
+                .Execute($"/p:TargetFramework={tfm}", $"/p:FilterProjFile={filterProjFile}")
+                .Should()
+                .Pass();
+
+            DirectoryInfo publishDirectory = publishCommand.GetOutputDirectory();
+
+            publishDirectory.Should().OnlyHaveFiles(new[] {
+                $"{project}.dll",
+                $"{project}.pdb",
+                $"{project}.deps.json",
+                $"{project}.runtimeconfig.json",
+                "System.Collections.NonGeneric.dll"
+            });
+
+           var runtimeConfig = ReadJson(System.IO.Path.Combine(publishDirectory.ToString(), $"{project}.runtimeconfig.json"));
+
+           runtimeConfig["runtimeOptions"]["tfm"].ToString().Should().Be(tfm);
+
+//TODO: Enable testing the run once dotnet host has the notion of looking up shared packages
+        }
+
+        [Fact]
+        public void It_publishes_projects_with_filter_and_rid()
+        {
+            string project = "SimpleDependencies";
+            var rid = RuntimeEnvironment.GetRuntimeIdentifier();
+            TestAsset simpleDependenciesAsset = _testAssetsManager
+                .CopyTestAsset(project)
+                .WithSource()
+                .Restore("", $"/p:RuntimeIdentifier={rid}");
+
+            string filterProjDir = _testAssetsManager.GetAndValidateTestProjectDirectory("NewtonsoftFilterProfile");
+            string filterProjFile = Path.Combine(filterProjDir, "NewtonsoftFilterProfile.csproj");
+
+
+            PublishCommand publishCommand = new PublishCommand(Stage0MSBuild, simpleDependenciesAsset.TestRoot);
+            publishCommand
+                .Execute($"/p:RuntimeIdentifier={rid}", $"/p:FilterProjFile={filterProjFile}")
+                .Should()
+                .Pass();
+
+            DirectoryInfo publishDirectory = publishCommand.GetOutputDirectory(runtimeIdentifier: rid);
+
+            string libPrefix = "";
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                libPrefix = "lib";
+            }
+
+            publishDirectory.Should().HaveFiles(new[] {
+                $"{project}.dll",
+                $"{project}.pdb",
+                $"{project}.deps.json",
+                $"{project}.runtimeconfig.json",
+                "System.Collections.NonGeneric.dll",
+                $"{libPrefix}coreclr{Constants.DynamicLibSuffix}"
+            });
+
+            publishDirectory.Should().NotHaveFiles(new[] {
+                "Newtonsoft.Json.dll",
+                "System.Runtime.Serialization.Primitives.dll"
+            });
+
+//TODO: Enable testing the run once dotnet host has the notion of looking up shared packages
+        }
+        private static JObject ReadJson(string path)
+        {
+            using (JsonTextReader jsonReader = new JsonTextReader(File.OpenText(path)))
+            {
+                JsonSerializer serializer = new JsonSerializer();
+                return serializer.Deserialize<JObject>(jsonReader);
+            }
+        }
     }
 }

test/Microsoft.NET.TestFramework/TestAssetsManager.cs

@@ -89,7 +89,7 @@ public TestAsset CreateTestProject(
             return testAsset;
         }
 
-        private string GetAndValidateTestProjectDirectory(string testProjectName)
+        public string GetAndValidateTestProjectDirectory(string testProjectName)
         {
             string testProjectDirectory = Path.Combine(ProjectsRoot, testProjectName);