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

react to DNX renames

This commit is contained in:
Andrew Stanton-Nurse 2015-07-21 16:43:57 -07:00
parent ab124d2ca0
commit 4656872876
4 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
View File

@ -15,6 +15,7 @@ using Microsoft.AspNet.Http;
using Microsoft.Framework.Internal; using Microsoft.Framework.Internal;
using Microsoft.Framework.Logging; using Microsoft.Framework.Logging;
using Microsoft.Framework.Runtime; using Microsoft.Framework.Runtime;
using Microsoft.Framework.Runtime.Compilation;
namespace Microsoft.AspNet.Diagnostics namespace Microsoft.AspNet.Diagnostics
{ {

2
src/Microsoft.AspNet.Diagnostics/Views/RuntimeInfoPageModel.cs
View File

@ -16,6 +16,6 @@ namespace Microsoft.AspNet.Diagnostics.Views
public string RuntimeType { get; internal set; } public string RuntimeType { get; internal set; }
public IEnumerable<ILibraryInformation> References { get; internal set; } public IEnumerable<Library> References { get; internal set; }
} }
} }

2
src/Microsoft.AspNet.Diagnostics/project.json
View File

@ -12,7 +12,7 @@
"Microsoft.Framework.OptionsModel": "1.0.0-*", "Microsoft.Framework.OptionsModel": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" },
"Microsoft.Framework.WebEncoders.Core": "1.0.0-*", "Microsoft.Framework.WebEncoders.Core": "1.0.0-*",
"Microsoft.Framework.Runtime.Abstractions": "1.0.0-*", "Microsoft.Framework.Runtime.Compilation.Abstractions": "1.0.0-*",
"Microsoft.Framework.Logging.Abstractions": "1.0.0-*" "Microsoft.Framework.Logging.Abstractions": "1.0.0-*"
}, },
"frameworks": { "frameworks": {

50
test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -38,9 +39,9 @@ namespace Microsoft.AspNet.Diagnostics.Tests
public void CreateRuntimeInfoModel_GetsTheVersionAndAllPackages() public void CreateRuntimeInfoModel_GetsTheVersionAndAllPackages()
{ {
// Arrage // Arrage
var libraries = new ILibraryInformation[] { var libraries = new [] {
new FakeLibraryInformation() { Name ="LibInfo1", Path = "Path1" }, new Library("LibInfo1", string.Empty, "Path1", string.Empty, Enumerable.Empty<string>(), Enumerable.Empty<AssemblyName>()),
new FakeLibraryInformation() { Name ="LibInfo2", Path = "Path2" }, new Library("LibInfo2", string.Empty, "Path2", string.Empty, Enumerable.Empty<string>(), Enumerable.Empty<AssemblyName>())
}; };
var libraryManagerMock = new Mock<ILibraryManager>(MockBehavior.Strict); var libraryManagerMock = new Mock<ILibraryManager>(MockBehavior.Strict);
@ -109,9 +110,9 @@ namespace Microsoft.AspNet.Diagnostics.Tests
{ {
// Arrange // Arrange
var libraryManagerMock = new Mock<ILibraryManager>(MockBehavior.Strict); var libraryManagerMock = new Mock<ILibraryManager>(MockBehavior.Strict);
libraryManagerMock.Setup(l => l.GetLibraries()).Returns(new ILibraryInformation[] { libraryManagerMock.Setup(l => l.GetLibraries()).Returns(new [] {
new FakeLibraryInformation() { Name ="LibInfo1", Version = "1.0.0-beta1", Path = "Path1" }, new Library("LibInfo1", "1.0.0-beta1", "Path1", string.Empty, Enumerable.Empty<string>(), Enumerable.Empty<AssemblyName>()),
new FakeLibraryInformation() { Name ="LibInfo2", Version = "1.0.0-beta2", Path = "Path2" }, new Library("LibInfo2", "1.0.0-beta2", "Path2", string.Empty, Enumerable.Empty<string>(), Enumerable.Empty<AssemblyName>())
}); });
var runtimeEnvironmentMock = new Mock<IRuntimeEnvironment>(MockBehavior.Strict); var runtimeEnvironmentMock = new Mock<IRuntimeEnvironment>(MockBehavior.Strict);
@ -169,8 +170,8 @@ namespace Microsoft.AspNet.Diagnostics.Tests
{ {
// Arrange // Arrange
var libraryManagerMock = new Mock<ILibraryManager>(MockBehavior.Strict); var libraryManagerMock = new Mock<ILibraryManager>(MockBehavior.Strict);
libraryManagerMock.Setup(l => l.GetLibraries()).Returns(new ILibraryInformation[] { libraryManagerMock.Setup(l => l.GetLibraries()).Returns(new [] {
new FakeLibraryInformation() { Name ="LibInfo1", Version = "1.0.0-beta1", Path = "Path1" }, new Library("LibInfo1", "1.0.0-beta1", "Path1", string.Empty, Enumerable.Empty<string>(), Enumerable.Empty<AssemblyName>()),
}); });
var runtimeEnvironmentMock = new Mock<IRuntimeEnvironment>(MockBehavior.Strict); var runtimeEnvironmentMock = new Mock<IRuntimeEnvironment>(MockBehavior.Strict);
@ -219,39 +220,6 @@ namespace Microsoft.AspNet.Diagnostics.Tests
} }
#endif #endif
private class FakeLibraryInformation : ILibraryInformation
{
public string Name { get; set; }
public string Version { get; set; }
public string Path { get; set; }
public IEnumerable<string> Dependencies
{
get
{
throw new NotImplementedException("Should not be needed by this middleware");
}
}
public string Type
{
get
{
throw new NotImplementedException("Should not be needed by this middleware");
}
}
public IEnumerable<AssemblyName> LoadableAssemblies
{
get
{
throw new NotImplementedException("Should not be needed by this middleware");
}
}
}
private class CustomHtmlEncoder : IHtmlEncoder private class CustomHtmlEncoder : IHtmlEncoder
{ {
public string HtmlEncode(string value) public string HtmlEncode(string value)