Merge release/2.0.0 to master

DotnetCLIVersion.txt

@@ -1 +1 @@
-2.0.0-preview2-006082
+2.0.0-preview2-006189

TestAssets/TestProjects/CompilationContext/TestApp/TestApp.csproj

@@ -10,5 +10,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.3.0" />
   </ItemGroup>
 </Project>

TestAssets/TestProjects/LinkTest/LinkTest/Class1.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace LinkTest
+{
+    public class Class1
+    {
+    }
+}

TestAssets/TestProjects/LinkTest/LinkTest/LinkTest.csproj

@@ -0,0 +1,63 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(IncludeWithGlob)' == 'true' And '$(UseLinkBase)' == 'true'">
+    <Compile Include="..\Linked\**\*.cs" LinkBase="Linked\Files" />
+    <AdditionalFiles Include="..\Linked\**\*.Additional.txt" LinkBase="Linked\Files" />
+    <None Include="..\Linked\**\*.None.txt" LinkBase="Linked\Files" />
+    <Content Include="..\Linked\**\*.Content.txt" LinkBase="Linked\Files" />
+    <EmbeddedResource Include="..\Linked\**\*.Embedded.txt" LinkBase="Linked\Files" />
+    <CustomItem Include="..\Linked\**\*.Custom.txt" LinkBase="Linked\Files" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IncludeWithGlob)' == 'true' And '$(UseLinkBase)' != 'true'">
+    <Compile Include="..\Linked\**\*.cs" />
+    <AdditionalFiles Include="..\Linked\**\*.Additional.txt" />
+    <None Include="..\Linked\**\*.None.txt" />
+    <Content Include="..\Linked\**\*.Content.txt" />
+    <EmbeddedResource Include="..\Linked\**\*.Embedded.txt" />
+    <CustomItem Include="..\Linked\**\*.Custom.txt" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IncludeWithGlob)' != 'true' And '$(UseLinkBase)' == 'true'">
+    <Compile Include="..\Linked\Linked.Class.cs" LinkBase="Linked\Files"/>
+    <AdditionalFiles Include="..\Linked\Linked.Additional.txt" LinkBase="Linked\Files"/>
+    <None Include="..\Linked\Linked.None.txt" LinkBase="Linked\Files"/>
+    <Content Include="..\Linked\Linked.Content.txt" LinkBase="Linked\Files"/>
+    <EmbeddedResource Include="..\Linked\Linked.Embedded.txt" LinkBase="Linked\Files"/>
+    <CustomItem Include="..\Linked\*Linked.Custom.txt" LinkBase="Linked\Files"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IncludeWithGlob)' != 'true' And '$(UseLinkBase)' != 'true'">
+    <Compile Include="..\Linked\Linked.Class.cs"/>
+    <AdditionalFiles Include="..\Linked\Linked.Additional.txt" />
+    <None Include="..\Linked\Linked.None.txt" />
+    <Content Include="..\Linked\Linked.Content.txt" />
+    <EmbeddedResource Include="..\Linked\Linked.Embedded.txt" />
+    <CustomItem Include="..\Linked\*Linked.Custom.txt" />
+  </ItemGroup>
+
+
+  <Target Name="WriteItems" DependsOnTargets="Compile">
+    <ItemGroup>
+      <LinesToWrite Include="Compile%09%(Compile.FullPath)%09%(Compile.Link)" />
+      <LinesToWrite Include="AdditionalFiles%09%(AdditionalFiles.FullPath)%09%(AdditionalFiles.Link)" />
+      <LinesToWrite Include="None%09%(None.FullPath)%09%(None.Link)" />
+      <LinesToWrite Include="Content%09%(Content.FullPath)%09%(Content.Link)" />
+      <LinesToWrite Include="EmbeddedResource%09%(EmbeddedResource.FullPath)%09%(EmbeddedResource.Link)" />
+      <LinesToWrite Include="CustomItem%09%(CustomItem.FullPath)%09%(CustomItem.Link)" />
+    </ItemGroup>
+
+    <WriteLinesToFile
+      File="$(IntermediateOutputPath)\Items.txt"
+      Lines="@(LinesToWrite)"
+      Overwrite="true"
+      Encoding="Unicode"
+      />
+  </Target>
+
+
+</Project>

TestAssets/TestProjects/LinkTest/Linked/A/B C/Linked.Class.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace LinkTest
+{
+    public class LinkedSubClass
+    {
+    }
+}

TestAssets/TestProjects/LinkTest/Linked/Linked.Class.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace LinkTest
+{
+    public class LinkedClass
+    {
+    }
+}

netci.groovy

@@ -56,6 +56,7 @@ ${buildCommand}""")
 
         def archiveSettings = new ArchivalSettings()
         archiveSettings.addFiles("bin/**/*")
+        archiveSettings.addFiles("bin/log/**/*")
         archiveSettings.excludeFiles("bin/obj/*")
         archiveSettings.setFailIfNothingArchived()
         archiveSettings.setArchiveOnFailure()

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

@@ -26,7 +26,7 @@ internal class DependencyContextBuilder
         private IEnumerable<string> _excludeFromPublishPackageIds;
         private CompilationOptions _compilationOptions;
         private string _referenceAssembliesPath;
-        private Dictionary<PackageIdentity, StringBuilder> _filteredPackages;
+        private Dictionary<PackageIdentity, string> _filteredPackages;
         private bool _includeMainProjectInDepsFile = true;
 
         public DependencyContextBuilder(SingleProjectInfo mainProjectInfo, ProjectContext projectContext)
@@ -82,7 +82,7 @@ public DependencyContextBuilder WithReferenceAssembliesPath(string referenceAsse
             return this;
         }
 
-        public DependencyContextBuilder WithPackagesThatWhereFiltered(Dictionary<PackageIdentity, StringBuilder> packagesThatWhereFiltered)
+        public DependencyContextBuilder WithPackagesThatWhereFiltered(Dictionary<PackageIdentity, string> packagesThatWhereFiltered)
         {
             _filteredPackages = packagesThatWhereFiltered;
             return this;
@@ -223,11 +223,7 @@ private RuntimeLibrary CreateRuntimeLibrary(
         {
             string runtimeStoreManifestName = null;
             var pkg = new PackageIdentity(name, NuGetVersion.Parse(version));
-            StringBuilder listofManifests = null;
-            if (_filteredPackages?.TryGetValue(pkg, out listofManifests) == true)
-            {
-                runtimeStoreManifestName = listofManifests.ToString();
-            }
+            _filteredPackages?.TryGetValue(pkg, out runtimeStoreManifestName);
 
             return new RuntimeLibrary(
                 type,

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

@@ -0,0 +1,48 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Build.Framework;
+using NuGet.Packaging.Core;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.NET.Build.Tasks
+{
+    /// <summary>
+    /// Returns the ITaskItem values in Items that were resolved from the specified
+    /// set of Packages.
+    /// </summary>
+    /// <remarks>
+    /// Both Items and Packages are expected to have 'PackageName' and 'PackageVersion' 
+    /// metadata properties to use for the matching.
+    /// </remarks>
+    public sealed class FindItemsFromPackages : TaskBase
+    {
+        [Required]
+        public ITaskItem[] Items { get; set; }
+
+        [Required]
+        public ITaskItem[] Packages { get; set; }
+
+        [Output]
+        public ITaskItem[] ItemsFromPackages { get; private set; }
+
+        protected override void ExecuteCore()
+        {
+            var packageIdentities = new HashSet<PackageIdentity>(
+                Packages.Select(p => ItemUtilities.GetPackageIdentity(p)));
+
+            var itemsFromPackages = new List<ITaskItem>();
+            foreach (ITaskItem item in Items)
+            {
+                PackageIdentity identity = ItemUtilities.GetPackageIdentity(item);
+                if (identity != null && packageIdentities.Contains(identity))
+                {
+                    itemsFromPackages.Add(item);
+                }
+            }
+
+            ItemsFromPackages = itemsFromPackages.ToArray();
+        }
+    }
+}

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

@@ -7,12 +7,11 @@
 using Newtonsoft.Json;
 using NuGet.Packaging.Core;
 using NuGet.ProjectModel;
+using NuGet.Versioning;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace Microsoft.NET.Build.Tasks
 {
@@ -65,7 +64,7 @@ public class GenerateDepsFile : TaskBase
 
         public ITaskItem[] ExcludeFromPublishPackageReferences { get; set; }
 
-        public string[] TargetManifestFileList { get; set; }
+        public ITaskItem[] RuntimeStorePackages { get; set; }
 
         public bool IsSelfContained { get; set; }
 
@@ -80,35 +79,21 @@ public ITaskItem[] FilesWritten
         private Dictionary<string, HashSet<string>> compileFilesToSkip = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
         private Dictionary<string, HashSet<string>> runtimeFilesToSkip = new Dictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
 
-        private Dictionary<PackageIdentity, StringBuilder> GetFilteredPackages()
+        private Dictionary<PackageIdentity, string> GetFilteredPackages()
         {
-            Dictionary<PackageIdentity, StringBuilder> filteredPackages = null;
+            Dictionary<PackageIdentity, string> filteredPackages = null;
 
-            if (TargetManifestFileList != null && TargetManifestFileList.Length > 0)
+            if (RuntimeStorePackages != null && RuntimeStorePackages.Length > 0)
             {
-                filteredPackages = new Dictionary<PackageIdentity, StringBuilder>();
-
-                foreach (var targetManifestFile in TargetManifestFileList)
+                filteredPackages = new Dictionary<PackageIdentity, string>();
+                foreach (var package in RuntimeStorePackages)
                 {
-                    Log.LogMessage(MessageImportance.Low, string.Format(CultureInfo.CurrentCulture, Strings.ParsingFiles, targetManifestFile));
-                    var packagesSpecified = StoreArtifactParser.Parse(targetManifestFile);
-                    var targetManifestFileName = Path.GetFileName(targetManifestFile);
-
-                    foreach (var pkg in packagesSpecified)
-                    {
-                        Log.LogMessage(MessageImportance.Low, string.Format(CultureInfo.CurrentCulture, Strings.PackageInfoLog, pkg.Id, pkg.Version));
-                        StringBuilder fileList;
-                        if (filteredPackages.TryGetValue(pkg, out fileList))
-                        {
-                            fileList.Append($";{targetManifestFileName}");
-                        }
-                        else
-                        {
-                            filteredPackages.Add(pkg, new StringBuilder(targetManifestFileName));
-                        }
-                    }
+                    filteredPackages.Add(
+                        ItemUtilities.GetPackageIdentity(package),
+                        package.GetMetadata(MetadataKeys.RuntimeStoreManifestNames));
                 }
             }
+
             return filteredPackages;
         }
 

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

@@ -1,9 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
 using Microsoft.Build.Framework;
 using Microsoft.NET.Build.Tasks.ConflictResolution;
+using NuGet.Packaging.Core;
+using NuGet.Versioning;
+using System;
 using System.IO;
 
 namespace Microsoft.NET.Build.Tasks
@@ -132,5 +134,20 @@ public static string GetTargetPath(ITaskItem item)
 
             return Path.GetFileName(sourcePath);
         }
+
+        public static PackageIdentity GetPackageIdentity(ITaskItem item)
+        {
+            string packageName = item.GetMetadata(MetadataKeys.PackageName);
+            string packageVersion = item.GetMetadata(MetadataKeys.PackageVersion);
+
+            if (string.IsNullOrEmpty(packageName) || string.IsNullOrEmpty(packageVersion))
+            {
+                return null;
+            }
+
+            return new PackageIdentity(
+                packageName,
+                NuGetVersion.Parse(packageVersion));
+        }
     }
 }

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

@@ -47,5 +47,8 @@ internal static class MetadataKeys
         public const string StartColumn = "StartColumn";
         public const string EndLine = "EndLine";
         public const string EndColumn = "EndColumn";
+
+        // Publish Target Manifest
+        public const string RuntimeStoreManifestNames = "RuntimeStoreManifestNames";
     }
 }

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

@@ -0,0 +1,71 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using NuGet.Packaging.Core;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+namespace Microsoft.NET.Build.Tasks
+{
+    /// <summary>
+    /// Parses the target manifest files into MSBuild Items.
+    /// </summary>
+    public sealed class ParseTargetManifests : TaskBase
+    {
+        public string TargetManifestFiles { get; set; }
+
+        [Output]
+        public ITaskItem[] RuntimeStorePackages { get; private set; }
+
+        protected override void ExecuteCore()
+        {
+            string[] targetManifestFileList = TargetManifestFiles?.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+
+            if (targetManifestFileList != null && targetManifestFileList.Length > 0)
+            {
+                var runtimeStorePackages = new Dictionary<PackageIdentity, StringBuilder>();
+                foreach (var manifestFile in targetManifestFileList)
+                {
+                    Log.LogMessage(MessageImportance.Low, string.Format(CultureInfo.CurrentCulture, Strings.ParsingFiles, manifestFile));
+                    var packagesSpecified = StoreArtifactParser.Parse(manifestFile);
+                    var targetManifestFileName = Path.GetFileName(manifestFile);
+
+                    foreach (var pkg in packagesSpecified)
+                    {
+                        Log.LogMessage(MessageImportance.Low, string.Format(CultureInfo.CurrentCulture, Strings.PackageInfoLog, pkg.Id, pkg.Version));
+                        StringBuilder fileList;
+                        if (runtimeStorePackages.TryGetValue(pkg, out fileList))
+                        {
+                            fileList.Append($";{targetManifestFileName}");
+                        }
+                        else
+                        {
+                            runtimeStorePackages.Add(pkg, new StringBuilder(targetManifestFileName));
+                        }
+                    }
+                }
+
+                var resultPackages = new List<ITaskItem>();
+                foreach (var storeEntry in runtimeStorePackages)
+                {
+                    string packageName = storeEntry.Key.Id;
+                    string packageVersion = storeEntry.Key.Version.ToNormalizedString();
+
+                    TaskItem item = new TaskItem($"{packageName}/{packageVersion}");
+                    item.SetMetadata(MetadataKeys.PackageName, packageName);
+                    item.SetMetadata(MetadataKeys.PackageVersion, packageVersion);
+                    item.SetMetadata(MetadataKeys.RuntimeStoreManifestNames, storeEntry.Value.ToString());
+
+                    resultPackages.Add(item);
+                }
+
+                RuntimeStorePackages = resultPackages.ToArray();
+            }
+        }
+    }
+}