huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Re-enable building runtime packs 

Also, sort debug output in SharedFx tests for improved readability
This commit is contained in:
Nate McMaster 2019-02-21 09:38:11 -08:00
parent fbaa3e8b77
commit 7a87e8c6a7
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
View File

@ -15,8 +15,6 @@
<SharedFxName>Microsoft.AspNetCore.App</SharedFxName> <SharedFxName>Microsoft.AspNetCore.App</SharedFxName>
<PackageId>$(MSBuildProjectName).$(RuntimeIdentifier)</PackageId> <PackageId>$(MSBuildProjectName).$(RuntimeIdentifier)</PackageId>
<IsShippingPackage>true</IsShippingPackage> <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. <PackageDescription>Provides a default set of APIs for building an ASP.NET Core application. Contains assets used for self-contained deployments.

6
src/Framework/test/SharedFxTests.cs
View File

@ -35,9 +35,9 @@ namespace Microsoft.AspNetCore
.ToHashSet(); .ToHashSet();
_output.WriteLine("==== actual assemblies ===="); _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("==== expected assemblies ====");
_output.WriteLine(string.Join('\n', expectedAssemblies)); _output.WriteLine(string.Join('\n', expectedAssemblies.OrderBy(i => i)));
var missing = expectedAssemblies.Except(actualAssemblies); var missing = expectedAssemblies.Except(actualAssemblies);
var unexpected = actualAssemblies.Except(expectedAssemblies); var unexpected = actualAssemblies.Except(expectedAssemblies);
@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore
_output.WriteLine("==== file contents ===="); _output.WriteLine("==== file contents ====");
_output.WriteLine(File.ReadAllText(platformManifestPath)); _output.WriteLine(File.ReadAllText(platformManifestPath));
_output.WriteLine("==== expected assemblies ===="); _output.WriteLine("==== expected assemblies ====");
_output.WriteLine(string.Join('\n', expectedAssemblies)); _output.WriteLine(string.Join('\n', expectedAssemblies.OrderBy(i => i)));
AssertEx.FileExists(platformManifestPath); AssertEx.FileExists(platformManifestPath);