Skip to content

Commit 7a87e8c

Browse files
author
Nate McMaster
committed
Re-enable building runtime packs
Also, sort debug output in SharedFx tests for improved readability
1 parent fbaa3e8 commit 7a87e8c

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
<SharedFxName>Microsoft.AspNetCore.App</SharedFxName>
1616
<PackageId>$(MSBuildProjectName).$(RuntimeIdentifier)</PackageId>
1717
<IsShippingPackage>true</IsShippingPackage>
18-
<!-- Undo for Preview4. Preview 3 is shipping using the runtime.$(rid) packages instead. -->
19-
<IsPackable Condition="'$(PreReleaseLabel)'=='preview3'">false</IsPackable>
2018

2119
<PackageDescription>Provides a default set of APIs for building an ASP.NET Core application. Contains assets used for self-contained deployments.
2220

src/Framework/test/SharedFxTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public void SharedFrameworkContainsExpectedFiles()
3535
.ToHashSet();
3636

3737
_output.WriteLine("==== actual assemblies ====");
38-
_output.WriteLine(string.Join('\n', actualAssemblies));
38+
_output.WriteLine(string.Join('\n', actualAssemblies.OrderBy(i => i)));
3939
_output.WriteLine("==== expected assemblies ====");
40-
_output.WriteLine(string.Join('\n', expectedAssemblies));
40+
_output.WriteLine(string.Join('\n', expectedAssemblies.OrderBy(i => i)));
4141

4242
var missing = expectedAssemblies.Except(actualAssemblies);
4343
var unexpected = actualAssemblies.Except(expectedAssemblies);
@@ -62,7 +62,7 @@ public void PlatformManifestListsAllFiles()
6262
_output.WriteLine("==== file contents ====");
6363
_output.WriteLine(File.ReadAllText(platformManifestPath));
6464
_output.WriteLine("==== expected assemblies ====");
65-
_output.WriteLine(string.Join('\n', expectedAssemblies));
65+
_output.WriteLine(string.Join('\n', expectedAssemblies.OrderBy(i => i)));
6666

6767
AssertEx.FileExists(platformManifestPath);
6868

0 commit comments

Comments
 (0)