Skip to content

Commit

Permalink
namespace Server.Host.Testing (#58)
Browse files Browse the repository at this point in the history
Move class `ServerHostFixture` into sub-namespace `Server.Host.Testing`
  • Loading branch information
jthelin authored Nov 12, 2018
1 parent f6e79fe commit ef04094
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions ServerHost/AppDomainSetupUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public static class AppDomainSetupUtils
/// </summary>
/// <typeparam name="T"> The type of object to be created. </typeparam>
/// <param name="appDomain"> The AppDomain where the "far" tracer object should be created. </param>
/// <param name="args"> Constructor instance arguments. </param>
/// <returns> An instance of the remote trace instance. </returns>
[MethodImpl(MethodImplOptions.NoInlining)]
internal static T CreateObjectInstanceInAppDomain<T>(
Expand Down
3 changes: 2 additions & 1 deletion ServerHost/ServerHost.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.1.14</Version>
<Version>1.1.15</Version>
<Authors>Jorgen Thelin</Authors>
<Copyright>Copyright © Jorgen Thelin 2015-2018</Copyright>
<Description>ServerHost - A .NET Server Hosting utility library, including in-process server host testing.</Description>
Expand Down Expand Up @@ -45,6 +45,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageReference Include="log4net" Version="2.0.8" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using log4net;
using log4net.Config;

namespace Server.Host
namespace Server.Host.Testing
{
/// <summary>
/// xUnit test fixture to provide per-test-class usage of hosted server instances.
Expand Down
2 changes: 2 additions & 0 deletions Tests/Tests.Net46/ServerHostTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
using Xunit;
using Xunit.Abstractions;

using Server.Host.Testing;

namespace Server.Host.Tests.Net46
{
public sealed class ServerHostTests : IClassFixture<ServerHostFixture>, IDisposable
Expand Down
6 changes: 2 additions & 4 deletions Tests/Tests.Net46/Tests.Net46.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\ServerHost\ServerHost.csproj">
</ProjectReference>
<ProjectReference Include="..\TestServer\TestServer.csproj">
</ProjectReference>
<ProjectReference Include="..\..\ServerHost\ServerHost.csproj" />
<ProjectReference Include="..\TestServer\TestServer.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
Expand Down

0 comments on commit ef04094

Please sign in to comment.