提交 28f4caa4 编写于 作者: J Jared Parsons

Re-arranging portable TestUtilities part 3

Code move before refactoring it.
上级 1ce0fd18
......@@ -21,6 +21,7 @@
using Roslyn.Utilities;
using Xunit;
using Roslyn.Test.Utilities;
using Microsoft.CodeAnalysis.Test.Utilities.CodeRuntime;
namespace Microsoft.CodeAnalysis.CSharp.Test.Utilities
{
......
......@@ -2,6 +2,7 @@
Imports Microsoft.CodeAnalysis
Imports Microsoft.CodeAnalysis.Test.Utilities
Imports Microsoft.CodeAnalysis.Test.Utilities.CodeRuntime
Imports Microsoft.CodeAnalysis.VisualBasic
Imports Roslyn.Test.Utilities
......
......@@ -8,7 +8,7 @@
using System.Text;
using System.Threading.Tasks;
namespace Microsoft.CodeAnalysis.Test.Utilities
namespace Microsoft.CodeAnalysis.Test.Utilities.CodeRuntime
{
/// <summary>
/// This is a singleton per AppDomain which manages all of the assemblies which were ever loaded into it.
......
......@@ -14,9 +14,9 @@
using Roslyn.Utilities;
using static Roslyn.Test.Utilities.RuntimeUtilities;
namespace Microsoft.CodeAnalysis.Test.Utilities
namespace Microsoft.CodeAnalysis.Test.Utilities.CodeRuntime
{
public sealed class HostedRuntimeEnvironment : IDisposable, IRuntimeEnvironment, IInternalRuntimeEnvironment
public sealed class DesktopRuntimeEnvironment : IDisposable, IRuntimeEnvironment, IInternalRuntimeEnvironment
{
private sealed class RuntimeData : IDisposable
{
......@@ -86,7 +86,7 @@ internal EmitData()
private readonly CompilationTestData _testData = new CompilationTestData();
private readonly IEnumerable<ModuleData> _additionalDependencies;
public HostedRuntimeEnvironment(IEnumerable<ModuleData> additionalDependencies = null)
public DesktopRuntimeEnvironment(IEnumerable<ModuleData> additionalDependencies = null)
{
_additionalDependencies = additionalDependencies;
}
......
......@@ -4,14 +4,15 @@
using System.Text;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Utilities;
namespace Roslyn.Test.Utilities
namespace Microsoft.CodeAnalysis.Test.Utilities.CodeRuntime
{
public sealed class DesktopRuntimeEnvironmentFactory : IRuntimeEnvironmentFactory
{
public IRuntimeEnvironment Create(IEnumerable<ModuleData> additionalDependencies)
{
return new HostedRuntimeEnvironment(additionalDependencies);
return new DesktopRuntimeEnvironment(additionalDependencies);
}
}
}
......@@ -3,9 +3,10 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using Microsoft.CodeAnalysis;
using static Roslyn.Test.Utilities.ExceptionHelper;
namespace Microsoft.CodeAnalysis.Test.Utilities
namespace Microsoft.CodeAnalysis.Test.Utilities.CodeRuntime
{
[Serializable]
public class EmitException : Exception
......
......@@ -9,7 +9,7 @@
using System.Text;
using Roslyn.Test.Utilities;
namespace Microsoft.CodeAnalysis.Test.Utilities
namespace Microsoft.CodeAnalysis.Test.Utilities.CodeRuntime
{
internal sealed class RuntimeAssemblyManager : MarshalByRefObject, IDisposable
{
......
......@@ -87,20 +87,20 @@
</Compile>
<Compile Include="AppDomainUtils.cs" />
<Compile Include="CLRHelpers.cs" />
<Compile Include="DesktopRuntimeEnvironmentFactory.cs" />
<Compile Include="CodeRuntime\DesktopRuntimeEnvironmentFactory.cs" />
<Compile Include="DesktopRuntimeUtil.cs" />
<Compile Include="InstrumentationChecker.cs" />
<Compile Include="ConditionalFactAttribute.cs" />
<Compile Include="ObjectReference.cs" />
<Compile Include="AppDomainAssemblyCache.cs" />
<Compile Include="Exceptions.cs" />
<Compile Include="CodeRuntime\AppDomainAssemblyCache.cs" />
<Compile Include="CodeRuntime\Exceptions.cs" />
<Compile Include="Extensions.cs" />
<Compile Include="RuntimeAssemblyManager.cs" />
<Compile Include="CodeRuntime\RuntimeAssemblyManager.cs" />
<Compile Include="SharedResourceHelpers.cs" />
<Compile Include="CommonDiagnosticAnalyzers.cs" />
<Compile Include="CultureContext.cs" />
<Compile Include="ErrorDiagnostics.cs" />
<Compile Include="HostedRuntimeEnvironment.cs" />
<Compile Include="CodeRuntime\DesktopRuntimeEnvironment.cs" />
<Compile Include="MetadataSignatureHelper.cs" />
<Compile Include="SigningTestHelpers.cs" />
<Compile Include="TestHelpers.cs" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册