Merge pull request #3333 from dsplaisted/wli3-update-stage0-061419

Update stage 0

Author: dsplaisted

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview7-012270",
+    "dotnet": "3.0.100-preview7-012402",
     "vs-opt": {
       "version": "15.9"
     }

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

@@ -69,7 +69,9 @@ protected override void ExecuteCore()
             string supportedRuntimeIdentifiers = frameworkRef == null ? null : frameworkRef.GetMetadata("RuntimePackRuntimeIdentifiers");
 
             // Get information on the runtime package used for the current target
-            ITaskItem frameworkPack = RuntimePacks.Where(pack => pack.ItemSpec.EndsWith(".Microsoft.NETCore.App", StringComparison.InvariantCultureIgnoreCase)).SingleOrDefault();
+            ITaskItem frameworkPack = RuntimePacks.Where(pack => 
+                    pack.GetMetadata(MetadataKeys.FrameworkName).Equals("Microsoft.NETCore.App", StringComparison.OrdinalIgnoreCase))
+                .SingleOrDefault();
             _runtimeIdentifier = frameworkPack == null ? null : frameworkPack.GetMetadata(MetadataKeys.RuntimeIdentifier);
             _packagePath = frameworkPack == null ? null : frameworkPack.GetMetadata(MetadataKeys.PackageDirectory);
 

src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs

@@ -396,7 +396,7 @@ public void RuntimeFrameworkVersionCanBeSpecifiedOnFrameworkReference()
             resolvedVersions.RuntimeFramework["Microsoft.NETCore.App"].Should().Be(runtimeFrameworkVersion);
             resolvedVersions.PackageDownload["Microsoft.NETCore.App.Ref"].Should().Be(targetingPackVersion);
             string runtimePackName = resolvedVersions.PackageDownload.Keys
-                .Where(k => k.StartsWith("runtime.") && k.EndsWith(".Microsoft.NETCore.App"))
+                .Where(k => k.StartsWith("Microsoft.NETCore.App.Runtime."))
                 .Single();
             resolvedVersions.PackageDownload[runtimePackName].Should().Be(runtimeFrameworkVersion);
             resolvedVersions.TargetingPack["Microsoft.NETCore.App"].Should().Be(targetingPackVersion);
@@ -419,7 +419,7 @@ public void RuntimeFrameworkVersionCanBeSpecifiedViaProperty()
             resolvedVersions.RuntimeFramework["Microsoft.NETCore.App"].Should().Be(runtimeFrameworkVersion);
             resolvedVersions.PackageDownload["Microsoft.NETCore.App.Ref"].Should().Be(targetingPackVersion);
             string runtimePackName = resolvedVersions.PackageDownload.Keys
-                .Where(k => k.StartsWith("runtime.") && k.EndsWith(".Microsoft.NETCore.App"))
+                .Where(k => k.StartsWith("Microsoft.NETCore.App.Runtime."))
                 .Single();
             resolvedVersions.PackageDownload[runtimePackName].Should().Be(runtimeFrameworkVersion);
             resolvedVersions.TargetingPack["Microsoft.NETCore.App"].Should().Be(targetingPackVersion);
@@ -455,7 +455,7 @@ public void TargetLatestPatchCanBeSpecifiedOnFrameworkReference(bool attributeVa
             resolvedVersions.RuntimeFramework["Microsoft.NETCore.App"].Should().Be(expectedRuntimeFrameworkVersion);
             resolvedVersions.PackageDownload["Microsoft.NETCore.App.Ref"].Should().Be(targetingPackVersion);
             string runtimePackName = resolvedVersions.PackageDownload.Keys
-                .Where(k => k.StartsWith("runtime.") && k.EndsWith(".Microsoft.NETCore.App"))
+                .Where(k => k.StartsWith("Microsoft.NETCore.App.Runtime."))
                 .Single();
             resolvedVersions.PackageDownload[runtimePackName].Should().Be(expectedRuntimeFrameworkVersion);
             resolvedVersions.TargetingPack["Microsoft.NETCore.App"].Should().Be(targetingPackVersion);
@@ -481,7 +481,7 @@ public void TargetLatestPatchCanBeSpecifiedViaProperty(bool propertyValue)
             resolvedVersions.RuntimeFramework["Microsoft.NETCore.App"].Should().Be(expectedRuntimeFrameworkVersion);
             resolvedVersions.PackageDownload["Microsoft.NETCore.App.Ref"].Should().Be(targetingPackVersion);
             string runtimePackName = resolvedVersions.PackageDownload.Keys
-                .Where(k => k.StartsWith("runtime.") && k.EndsWith(".Microsoft.NETCore.App"))
+                .Where(k => k.StartsWith("Microsoft.NETCore.App.Runtime."))
                 .Single();
             resolvedVersions.PackageDownload[runtimePackName].Should().Be(expectedRuntimeFrameworkVersion);
             resolvedVersions.TargetingPack["Microsoft.NETCore.App"].Should().Be(targetingPackVersion);
@@ -512,7 +512,7 @@ public void TargetingPackVersionCanBeSpecifiedOnFrameworkReference()
             resolvedVersions.RuntimeFramework["Microsoft.NETCore.App"].Should().Be(expectedRuntimeFrameworkVersion);
             resolvedVersions.PackageDownload["Microsoft.NETCore.App.Ref"].Should().Be(targetingPackVersion);
             string runtimePackName = resolvedVersions.PackageDownload.Keys
-                .Where(k => k.StartsWith("runtime.") && k.EndsWith(".Microsoft.NETCore.App"))
+                .Where(k => k.StartsWith("Microsoft.NETCore.App.Runtime."))
                 .Single();
             resolvedVersions.PackageDownload[runtimePackName].Should().Be(expectedRuntimeFrameworkVersion);
             resolvedVersions.TargetingPack["Microsoft.NETCore.App"].Should().Be(targetingPackVersion);
@@ -629,7 +629,7 @@ public void IsTrimmableDefaultsComeFromKnownFrameworkReference()
             var runtimeAssetTrimInfo = GetRuntimeAssetTrimInfo(testProject);
 
             string runtimePackName = runtimeAssetTrimInfo.Keys
-                .Where(k => k.StartsWith("runtime.") && k.EndsWith(".Microsoft.NETCore.App"))
+                .Where(k => k.StartsWith("Microsoft.NETCore.App.Runtime."))
                 .Single();
 
             foreach (var runtimeAsset in runtimeAssetTrimInfo[runtimePackName])
@@ -657,7 +657,7 @@ public void IsTrimmableCanBeSpecifiedOnFrameworkReference()
                 });
 
             string runtimePackName = runtimeAssetTrimInfo.Keys
-                .Where(k => k.StartsWith("runtime.") && k.EndsWith(".Microsoft.NETCore.App"))
+                .Where(k => k.StartsWith("Microsoft.NETCore.App.Runtime."))
                 .Single();
 
             foreach (var runtimeAsset in runtimeAssetTrimInfo[runtimePackName])

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

@@ -674,6 +674,7 @@ public void It_excludes_runtime_store_packages_from_the_refs_folder()
 System.ServiceModel.Web.dll
 System.ServiceProcess.dll
 System.Text.Encoding.dll
+System.Text.Encoding.CodePages.dll
 System.Text.Encoding.Extensions.dll
 System.Text.Encodings.Web.dll
 System.Text.RegularExpressions.dll