Merge branch 'release' into dev
This commit is contained in:
commit
758f15a3eb
|
|
@ -1,37 +0,0 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System.Runtime.Versioning;
|
||||
using Microsoft.Extensions.PlatformAbstractions;
|
||||
|
||||
public class TestApplicationEnvironment : IApplicationEnvironment
|
||||
{
|
||||
private readonly IApplicationEnvironment _original;
|
||||
|
||||
public TestApplicationEnvironment(IApplicationEnvironment original, string name, string basePath)
|
||||
{
|
||||
_original = original;
|
||||
ApplicationName = name;
|
||||
ApplicationBasePath = basePath;
|
||||
}
|
||||
|
||||
public string ApplicationName { get; }
|
||||
|
||||
public string ApplicationVersion
|
||||
{
|
||||
get
|
||||
{
|
||||
return _original.ApplicationVersion;
|
||||
}
|
||||
}
|
||||
|
||||
public string ApplicationBasePath { get; }
|
||||
|
||||
public FrameworkName RuntimeFramework
|
||||
{
|
||||
get
|
||||
{
|
||||
return _original.RuntimeFramework;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,14 +2,10 @@
|
|||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Net.Http;
|
||||
using System.Reflection;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.TestHost;
|
||||
using Microsoft.AspNetCore.Testing;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.PlatformAbstractions;
|
||||
|
||||
namespace Microsoft.AspNetCore.Diagnostics.FunctionalTests
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue