diff --git a/Serilog.sln b/Serilog.sln
index 69cd9c834..f2b4bfb3e 100644
--- a/Serilog.sln
+++ b/Serilog.sln
@@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog", "src\Serilog\Serilog.xproj", "{803CD13A-D54B-4CEC-A55F-E22AE3D93B3C}"
EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Tests", "test\Serilog.Tests\Serilog.Tests.xproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -29,11 +31,16 @@ Global
{803CD13A-D54B-4CEC-A55F-E22AE3D93B3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{803CD13A-D54B-4CEC-A55F-E22AE3D93B3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{803CD13A-D54B-4CEC-A55F-E22AE3D93B3C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3C2D8E01-5580-426A-BDD9-EC59CD98E618}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{803CD13A-D54B-4CEC-A55F-E22AE3D93B3C} = {037440DE-440B-4129-9F7A-09B42D00397E}
+ {3C2D8E01-5580-426A-BDD9-EC59CD98E618} = {0D135C0C-A60B-454A-A2F4-CD74A30E04B0}
EndGlobalSection
EndGlobal
diff --git a/packages/repositories.config b/packages/repositories.config
deleted file mode 100644
index ef84a0768..000000000
--- a/packages/repositories.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Serilog/Properties/AssemblyInfo.cs b/src/Serilog/Properties/AssemblyInfo.cs
deleted file mode 100644
index 603b63da6..000000000
--- a/src/Serilog/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyTitle("Serilog")]
-[assembly: AssemblyDescription("Serilog Logging Library")]
-[assembly: AssemblyCopyright("Copyright © Serilog Contributors 2014")]
-
-#if !ASPNETCORE50
-[assembly: InternalsVisibleTo("Serilog.FullNetFx, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" +
- "6fe0fe83ef33c1080bf30690765bc6eb0df26ebfdf8f21670c64265b30db09f73a0dea5b3db4c9" +
- "d18dbf6d5a25af5ce9016f281014d79dc3b4201ac646c451830fc7e61a2dfd633d34c39f87b818" +
- "94191652df5ac63cc40c77f3542f702bda692e6e8a9158353df189007a49da0f3cfd55eb250066" +
- "b19485ec")]
-
-[assembly: InternalsVisibleTo("Serilog.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" +
- "6fe0fe83ef33c1080bf30690765bc6eb0df26ebfdf8f21670c64265b30db09f73a0dea5b3db4c9" +
- "d18dbf6d5a25af5ce9016f281014d79dc3b4201ac646c451830fc7e61a2dfd633d34c39f87b818" +
- "94191652df5ac63cc40c77f3542f702bda692e6e8a9158353df189007a49da0f3cfd55eb250066" +
- "b19485ec")]
-#else
-[assembly: InternalsVisibleTo("Serilog.FullNetFx")]
-[assembly: InternalsVisibleTo("Serilog.Tests")]
-#endif
diff --git a/src/Serilog/Properties/InternalsVisibleTo.cs b/src/Serilog/Properties/InternalsVisibleTo.cs
new file mode 100644
index 000000000..7e4fc9582
--- /dev/null
+++ b/src/Serilog/Properties/InternalsVisibleTo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Serilog.Tests")]
\ No newline at end of file
diff --git a/test/Serilog.Tests/Context/LogContextTests-net40.cs b/test/Serilog.Tests/Context/LogContextTests-net40.cs
index 899d1e4c0..304715b06 100644
--- a/test/Serilog.Tests/Context/LogContextTests-net40.cs
+++ b/test/Serilog.Tests/Context/LogContextTests-net40.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+#if NET40
+using NUnit.Framework;
using Serilog.Context;
using Serilog.Events;
using Serilog.Tests.Support;
@@ -38,3 +39,4 @@ public void MoreNestedPropertiesOverrideLessNestedOnes()
}
}
}
+#endif
\ No newline at end of file
diff --git a/test/Serilog.Tests/Serilog.Tests-net40.csproj b/test/Serilog.Tests/Serilog.Tests-net40.csproj
deleted file mode 100644
index 9f9f7cf85..000000000
--- a/test/Serilog.Tests/Serilog.Tests-net40.csproj
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
- Debug
- AnyCPU
- {D5648551-D19D-41E3-9FC1-E74B111EEF41}
- Library
- Properties
- Serilog.Tests
- Serilog.Tests
- v4.0
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
- $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
- False
- UnitTest
- ..\..\
-
-
-
- true
- full
- false
- bin40\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin40\Release\
- TRACE
- prompt
- 4
-
-
- true
-
-
- ..\..\assets\Serilog.snk
-
-
-
-
- ..\..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll
-
-
- ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Serilog.snk
-
-
-
-
-
-
-
- {7a9e1095-167d-402a-b43d-b36b97ff183d}
- Serilog.FullNetFx-net40
-
-
- {0915dbd9-0f7c-4439-8d9e-74c3d579b219}
- Serilog-net40
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/Serilog.Tests/Serilog.Tests.csproj b/test/Serilog.Tests/Serilog.Tests.csproj
deleted file mode 100644
index e87711582..000000000
--- a/test/Serilog.Tests/Serilog.Tests.csproj
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-
- Debug
- AnyCPU
- {D5648551-D19D-41E3-9FC1-E74B111EEF41}
- Library
- Properties
- Serilog.Tests
- Serilog.Tests
- v4.5
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
- $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
- False
- UnitTest
- ..\..\
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
- true
-
-
- ..\..\assets\Serilog.snk
-
-
-
-
- False
- ..\..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll
-
-
- False
- ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll
-
-
-
-
- False
- ..\..\packages\Rx-Core.2.2.1-beta\lib\net45\System.Reactive.Core.dll
-
-
- False
- ..\..\packages\Rx-Interfaces.2.2.1-beta\lib\net45\System.Reactive.Interfaces.dll
-
-
- False
- ..\..\packages\Rx-Linq.2.2.1-beta\lib\net45\System.Reactive.Linq.dll
-
-
- False
- ..\..\packages\Rx-PlatformServices.2.2.1-beta\lib\net45\System.Reactive.PlatformServices.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Serilog.snk
-
-
-
- Designer
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/Serilog.Tests/Serilog.Tests.xproj b/test/Serilog.Tests/Serilog.Tests.xproj
new file mode 100644
index 000000000..2d093ee6f
--- /dev/null
+++ b/test/Serilog.Tests/Serilog.Tests.xproj
@@ -0,0 +1,24 @@
+
+
+
+ 14.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+ 3c2d8e01-5580-426a-bdd9-ec59cd98e618
+ Serilog.Tests
+ ..\..\artifacts\obj\$(MSBuildProjectName)
+ ..\..\artifacts\bin\$(MSBuildProjectName)\
+
+
+ 2.0
+
+
+ True
+
+
+ False
+
+
+
diff --git a/test/Serilog.Tests/app.config b/test/Serilog.Tests/app.config
deleted file mode 100644
index 0bc5f58f6..000000000
--- a/test/Serilog.Tests/app.config
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/Serilog.Tests/packages.config b/test/Serilog.Tests/packages.config
deleted file mode 100644
index c644c58fc..000000000
--- a/test/Serilog.Tests/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/Serilog.Tests/project.json b/test/Serilog.Tests/project.json
new file mode 100644
index 000000000..a8250c4f7
--- /dev/null
+++ b/test/Serilog.Tests/project.json
@@ -0,0 +1,11 @@
+{
+ "dependencies": {
+ "Newtonsoft.Json": "6.0.6",
+ "NUnit": "2.6.4",
+ "Rx-Main": "2.2.5",
+ "Serilog": ""
+ },
+ "frameworks": {
+ "dnx451": { }
+ }
+}