Merge pull request #3113 from dotnet/merges/release/3.0.1xx-to-master

Merge release/3.0.1xx to master
dotnet · Apr 16, 2019 · 8cb31b0 · 8cb31b0
2 parents a0fe8df + 643d19e
commit 8cb31b0
Show file tree

Hide file tree

Showing 35 changed files with 1,585 additions and 72 deletions.
diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1
@@ -18,7 +18,7 @@ function InitializeCustomSDKToolset {
   InstallDotNetSharedFramework "1.0.5"
   InstallDotNetSharedFramework "1.1.2"
   InstallDotNetSharedFramework "2.1.0"
-  InstallDotNetSharedFramework "2.2.3"
+  InstallDotNetSharedFramework "2.2.4"
 
   CreateBuildEnvScript
   InstallNuget

diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh
@@ -13,7 +13,7 @@ function InitializeCustomSDKToolset {
   InstallDotNetSharedFramework "1.0.5"
   InstallDotNetSharedFramework "1.1.2"
   InstallDotNetSharedFramework "2.1.0"
-  InstallDotNetSharedFramework "2.2.3"
+  InstallDotNetSharedFramework "2.2.4"
 }
 
 # Installs additional shared frameworks for testing purposes

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview5-011162",
+    "dotnet": "3.0.100-preview5-011317",
     "vs-opt": {
       "version": "15.9"
     }

diff --git a/src/Tasks/Common/ConflictResolution/ConflictItem.cs b/src/Tasks/Common/ConflictResolution/ConflictItem.cs
@@ -158,11 +158,33 @@ public string PackageId
             {
                 if (_packageId == null)
                 {
-                    _packageId = OriginalItem?.GetMetadata(MetadataNames.NuGetPackageId) ?? String.Empty;
+                    _packageId = OriginalItem?.GetMetadata(MetadataNames.NuGetPackageId);
+
+                    if (string.IsNullOrEmpty(_packageId))
+                    {
+                        _packageId = OriginalItem?.GetMetadata(MetadataKeys.PackageName) ?? string.Empty;
+                    }
 
                     if (_packageId.Length == 0)
                     {
-                        _packageId = NuGetUtils.GetPackageIdFromSourcePath(SourcePath) ?? String.Empty;
+                        //  We want to move away from using the heuristic of walking up the folder tree until
+                        //  we find a .nuspec in order to determine the package ID of a file.  However, we
+                        //  don't want to accidentally stop having a package ID for a file that the heuristic
+                        //  would have found the package ID for.  So to catch those cases, we throw an
+                        //  exception if the heuristic finds a package ID but we don't have the package ID
+                        //  from any other source
+                        string packageIdFromPath = NuGetUtils.GetPackageIdFromSourcePath(SourcePath);
+                        if (!string.IsNullOrEmpty(packageIdFromPath))
+                        {
+                            string path = OriginalItem?.ItemSpec;
+                            if (string.IsNullOrEmpty(path))
+                            {
+                                path = SourcePath;
+                            }
+                            throw new InvalidOperationException("NuGetPackageId metadata not set on " + path);
+                        }
+
+                        _packageId = string.Empty;
                     }
                 }
 

diff --git a/src/Tasks/Common/ConflictResolution/FrameworkListReader.cs b/src/Tasks/Common/ConflictResolution/FrameworkListReader.cs
@@ -98,7 +98,7 @@ private static IEnumerable<ConflictItem> LoadConflictItems(string frameworkListP
                 }
 
                 ret.Add(new ConflictItem(assemblyName + ".dll",
-                                                packageId: null,
+                                                packageId: "TargetingPack",
                                                 assemblyVersion: assemblyVersion,
                                                 fileVersion: null));
             }

diff --git a/src/Tasks/Common/ConflictResolution/PackageOverride.cs b/src/Tasks/Common/ConflictResolution/PackageOverride.cs
@@ -45,7 +45,7 @@ private static IEnumerable<Tuple<string, Version>> CreateOverriddenPackages(stri
             if (!string.IsNullOrEmpty(overriddenPackagesString))
             {
                 overriddenPackagesString = overriddenPackagesString.Trim();
-                string[] overriddenPackagesAndVersions = overriddenPackagesString.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+                string[] overriddenPackagesAndVersions = overriddenPackagesString.Split(new char[] { ';', '\r', '\n', ' ' }, StringSplitOptions.RemoveEmptyEntries);
                 foreach (string overriddenPackagesAndVersion in overriddenPackagesAndVersions)
                 {
                     string trimmedOverriddenPackagesAndVersion = overriddenPackagesAndVersion.Trim();

diff --git a/src/Tasks/Common/ConflictResolution/ResolvePackageFileConflicts.cs b/src/Tasks/Common/ConflictResolution/ResolvePackageFileConflicts.cs
@@ -202,6 +202,7 @@ private ITaskItem CreateConflictTaskItem(ConflictItem conflict)
             if (conflict.PackageId != null)
             {
                 item.SetMetadata(nameof(ConflictItemType), conflict.ItemType.ToString());
+                item.SetMetadata(MetadataKeys.NuGetPackageId, conflict.PackageId);
             }
 
             return item;

diff --git a/src/Tasks/Common/MetadataKeys.cs b/src/Tasks/Common/MetadataKeys.cs
@@ -17,6 +17,7 @@ internal static class MetadataKeys
         public const string IsImplicitlyDefined = "IsImplicitlyDefined";
         public const string IsTopLevelDependency = "IsTopLevelDependency";
         public const string AllowExplicitVersion = "AllowExplicitVersion";
+        public const string RelativePath = "RelativePath";
 
         // Target Metadata
         public const string RuntimeIdentifier = "RuntimeIdentifier";
@@ -61,7 +62,7 @@ internal static class MetadataKeys
         public const string NuGetPackageId = "NuGetPackageId";
         public const string NuGetPackageVersion = "NuGetPackageVersion";
         public const string NuGetSourceType = "NuGetSourceType";
-        public const string RelativePath = "RelativePath";
+        public const string PathInPackage = "PathInPackage";
         public const string PackageDirectory = "PackageDirectory";
 
         // References

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/all.asset.types.osx.deps.json b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/all.asset.types.osx.deps.json
@@ -1,7 +1,7 @@
 {
   "runtimeTarget": {
     "name": ".NETCoreApp,Version=v1.0/osx.10.11-x64",
-    "signature": "6c0ed2851936790712df303bf7e27fc94dfbd644"
+    "signature": ""
   },
   "compilationOptions": {},
   "targets": {
@@ -83,4 +83,4 @@
       "hashPath": "system.spatial.5.7.0.nupkg.sha512"
     }
   }
-}
+}
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/all.asset.types.portable.deps.json b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/all.asset.types.portable.deps.json
@@ -1,7 +1,7 @@
 {
   "runtimeTarget": {
     "name": ".NETCoreApp,Version=v1.0",
-    "signature": "92c4a7720ef26003e081a02c73de57101baa7210"
+    "signature": ""
   },
   "compilationOptions": {},
   "targets": {
@@ -81,4 +81,4 @@
       "hashPath": "system.spatial.5.7.0.nupkg.sha512"
     }
   }
-}
+}
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/dotnet.new.deps.json b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/dotnet.new.deps.json
@@ -1,7 +1,7 @@
 {
   "runtimeTarget": {
     "name": ".NETCoreApp,Version=v1.0",
-    "signature": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+    "signature": ""
   },
   "compilationOptions": {},
   "targets": {

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/dotnet.new.resources.deps.json b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/dotnet.new.resources.deps.json
@@ -1,7 +1,7 @@
 {
   "runtimeTarget": {
     "name": ".NETCoreApp,Version=v1.0",
-    "signature": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+    "signature": ""
   },
   "compilationOptions": {},
   "targets": {

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/simple.dependencies.compilerOptions.deps.json b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/simple.dependencies.compilerOptions.deps.json
@@ -1,7 +1,7 @@
 {
   "runtimeTarget": {
     "name": ".NETCoreApp,Version=v1.0",
-    "signature": "a813617eb7d3bb5d69fa51d48f64bc6455d8ca5f"
+    "signature": ""
   },
   "compilationOptions": {
     "defines": [
@@ -2494,4 +2494,4 @@
       "hashPath": "system.xml.xpath.xdocument.4.0.1.nupkg.sha512"
     }
   }
-}
+}
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/simple.dependencies.deps.json b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/simple.dependencies.deps.json
@@ -1,7 +1,7 @@
 {
   "runtimeTarget": {
     "name": ".NETCoreApp,Version=v1.0",
-    "signature": "a813617eb7d3bb5d69fa51d48f64bc6455d8ca5f"
+    "signature": ""
   },
   "compilationOptions": {},
   "targets": {
@@ -63,4 +63,4 @@
       "hashPath": "system.runtime.serialization.primitives.4.1.1.nupkg.sha512"
     }
   }
-}
+}
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/simple.dependencies.directReference.deps.json b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/simple.dependencies.directReference.deps.json
@@ -1,7 +1,7 @@
 {
   "runtimeTarget": {
     "name": ".NETCoreApp,Version=v1.0",
-    "signature": "a813617eb7d3bb5d69fa51d48f64bc6455d8ca5f"
+    "signature": ""
   },
   "compilationOptions": {
     "defines": [
@@ -2513,4 +2513,4 @@
       "hashPath": "system.xml.xpath.xdocument.4.0.1.nupkg.sha512"
     }
   }
-}
+}
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs b/src/Tasks/Microsoft.NET.Build.Tasks/DependencyContextBuilder.cs
@@ -17,6 +17,8 @@ namespace Microsoft.NET.Build.Tasks
 {
     internal class DependencyContextBuilder
     {
+        private const string _runtimePackPrefix = "runtimepack.";
+
         private readonly VersionFolderPathResolver _versionFolderPathResolver;
         private readonly SingleProjectInfo _mainProjectInfo;
         private readonly ProjectContext _projectContext;
@@ -34,6 +36,7 @@ internal class DependencyContextBuilder
         private bool _includeMainProjectInDepsFile = true;
         private HashSet<string> _usedLibraryNames;
         private Dictionary<ReferenceInfo, string> _referenceLibraryNames;
+        private Dictionary<string, LockFileTargetLibrary> _compilationTargetLibraries;
 
         public DependencyContextBuilder(SingleProjectInfo mainProjectInfo, ProjectContext projectContext, bool includeRuntimeFileVersions)
         {
@@ -50,6 +53,12 @@ public DependencyContextBuilder(SingleProjectInfo mainProjectInfo, ProjectContex
                 //  it needs to read the file versions
                 _packageResolver = NuGetPackageResolver.CreateResolver(projectContext.LockFile);
             }
+
+            if (_projectContext.CompilationLockFileTarget != _projectContext.LockFileTarget)
+            {
+                _compilationTargetLibraries = _projectContext.CompilationLockFileTarget.Libraries
+                    .ToDictionary(l => l.Name, StringComparer.OrdinalIgnoreCase);
+            }
         }
 
         /// <summary>
@@ -169,7 +178,7 @@ public DependencyContext Build()
 
             var libraryLookup = new LockFileLookup(_projectContext.LockFile);
 
-            var runtimeSignature = GenerateRuntimeSignature(runtimeExports);
+            var runtimeSignature = string.Empty;
 
             IEnumerable<RuntimeLibrary> runtimeLibraries = Enumerable.Empty<RuntimeLibrary>();
             if (_includeMainProjectInDepsFile)
@@ -224,30 +233,6 @@ public DependencyContext Build()
                 new RuntimeFallbacks[] { });
         }
 
-        private static string GenerateRuntimeSignature(IEnumerable<LockFileTargetLibrary> runtimeExports)
-        {
-            var sha1 = SHA1.Create();
-            var builder = new StringBuilder();
-            var packages = runtimeExports
-                .Where(libraryExport => libraryExport.IsPackage());
-            var separator = "|";
-            foreach (var libraryExport in packages)
-            {
-                builder.Append(libraryExport.Name);
-                builder.Append(separator);
-                builder.Append(libraryExport.Version.ToString());
-                builder.Append(separator);
-            }
-            var hash = sha1.ComputeHash(Encoding.UTF8.GetBytes(builder.ToString()));
-
-            builder.Clear();
-            foreach (var hashByte in hash)
-            {
-                builder.AppendFormat("{0:x2}", hashByte);
-            }
-            return builder.ToString();
-        }
-
         private List<Dependency> GetProjectDependencies(
             ProjectContext projectContext,
             Dictionary<string, Dependency> dependencyLookup,
@@ -324,7 +309,7 @@ private RuntimeLibrary GetProjectRuntimeLibrary(
             List<Dependency> dependencies = GetProjectDependencies(projectContext, dependencyLookup, includeCompilationLibraries);
             foreach (var runtimePackGroup in _runtimePackAssets.GroupBy(asset => asset.PackageName + "/" + asset.PackageVersion))
             {
-                dependencies.Add(new Dependency("runtimepack." + runtimePackGroup.First().PackageName, runtimePackGroup.First().PackageVersion));
+                dependencies.Add(new Dependency(_runtimePackPrefix + runtimePackGroup.First().PackageName, runtimePackGroup.First().PackageVersion));
             }
 
             return CreateRuntimeLibrary(
@@ -376,7 +361,7 @@ private IEnumerable<RuntimeLibrary> GetRuntimePackLibraries(IEnumerable<RuntimeP
                     };
 
                     return new RuntimeLibrary("runtimepack",
-                        "runtimepack." + runtimePackAssetGroup.First().PackageName,
+                        _runtimePackPrefix + runtimePackAssetGroup.First().PackageName,
                         runtimePackAssetGroup.First().PackageVersion,
                         hash: string.Empty,
                         runtimeAssemblyGroups,
@@ -479,7 +464,28 @@ private Library GetLibrary(
             }
             else
             {
-                IEnumerable<string> assemblies = GetCompileTimeAssemblies(export, referenceProjectInfo);
+                IEnumerable<string> assemblies = Enumerable.Empty<string>();
+
+                //  In some situations, the assets file will include compilation assets under the RID-specific
+                //  target, but not under the RID-less target.  The RID-less target is what is used for project
+                //  compilation, so make sure we get those assets when writing the compile references to the assets
+                //  file.
+                //  This can happen when the runtime graph adds dependencies which don't have compile assets excluded.
+                //  This was encountered with the 4.3.0 System.Security.Claims, System.Security.Principal.Windows, and
+                //  System.Threading.Overlapped packages.
+                LockFileTargetLibrary exportWithCompileAssets;
+                if (_compilationTargetLibraries != null)
+                {
+                    _compilationTargetLibraries.TryGetValue(export.Name, out exportWithCompileAssets);
+                }
+                else
+                {
+                    exportWithCompileAssets = export;
+                }
+                if (exportWithCompileAssets != null)
+                {
+                    assemblies = GetCompileTimeAssemblies(exportWithCompileAssets, referenceProjectInfo);
+                }
 
                 return new CompilationLibrary(
                     type.ToLowerInvariant(),