From 7a87e8c6a711696863833ef4c21ed6a7997bf32c Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 21 Feb 2019 09:38:11 -0800
Subject: [PATCH] Re-enable building runtime packs

Also, sort debug output in SharedFx tests for improved readability
---
 src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj | 2 --
 src/Framework/test/SharedFxTests.cs                       | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
index 43935d13b8..dfc04127a1 100644
--- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
+++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
@@ -15,8 +15,6 @@
     <SharedFxName>Microsoft.AspNetCore.App</SharedFxName>
     <PackageId>$(MSBuildProjectName).$(RuntimeIdentifier)</PackageId>
     <IsShippingPackage>true</IsShippingPackage>
-    <!-- Undo for Preview4. Preview 3 is shipping using the runtime.$(rid) packages instead. -->
-    <IsPackable Condition="'$(PreReleaseLabel)'=='preview3'">false</IsPackable>
 
     <PackageDescription>Provides a default set of APIs for building an ASP.NET Core application. Contains assets used for self-contained deployments.
 
diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs
index 11ea2426f4..140a1a2ac1 100644
--- a/src/Framework/test/SharedFxTests.cs
+++ b/src/Framework/test/SharedFxTests.cs
@@ -35,9 +35,9 @@ namespace Microsoft.AspNetCore
                 .ToHashSet();
 
             _output.WriteLine("==== actual assemblies ====");
-            _output.WriteLine(string.Join('\n', actualAssemblies));
+            _output.WriteLine(string.Join('\n', actualAssemblies.OrderBy(i => i)));
             _output.WriteLine("==== expected assemblies ====");
-            _output.WriteLine(string.Join('\n', expectedAssemblies));
+            _output.WriteLine(string.Join('\n', expectedAssemblies.OrderBy(i => i)));
 
             var missing = expectedAssemblies.Except(actualAssemblies);
             var unexpected = actualAssemblies.Except(expectedAssemblies);
@@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore
             _output.WriteLine("==== file contents ====");
             _output.WriteLine(File.ReadAllText(platformManifestPath));
             _output.WriteLine("==== expected assemblies ====");
-            _output.WriteLine(string.Join('\n', expectedAssemblies));
+            _output.WriteLine(string.Join('\n', expectedAssemblies.OrderBy(i => i)));
 
             AssertEx.FileExists(platformManifestPath);