From 82f99b34b4eacb8d3281374126b50d21e6654efa Mon Sep 17 00:00:00 2001
From: Matthew Erbs <matthew.erbs@merbla.com>
Date: Wed, 20 Jan 2016 14:30:32 +1000
Subject: [PATCH] Moved PeriodicBatching Sink to new project

---
 Serilog.sln                                   |  7 ++++
 .../Properties/InternalsVisibleTo.cs          | 11 +++++++
 .../Serilog.Sinks.PeriodicBatching.xproj      | 20 +++++++++++
 .../BatchedConnectionStatus.cs                |  0
 .../PeriodicBatching/PeriodicBatchingSink.cs  |  0
 .../Sinks/PeriodicBatching/PortableTimer.cs   |  0
 .../project.json                              | 33 +++++++++++++++++++
 test/Serilog.Tests/project.json               |  3 +-
 8 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 src/Serilog.Sinks.PeriodicBatching/Properties/InternalsVisibleTo.cs
 create mode 100644 src/Serilog.Sinks.PeriodicBatching/Serilog.Sinks.PeriodicBatching.xproj
 rename src/{Serilog => Serilog.Sinks.PeriodicBatching}/Sinks/PeriodicBatching/BatchedConnectionStatus.cs (100%)
 rename src/{Serilog => Serilog.Sinks.PeriodicBatching}/Sinks/PeriodicBatching/PeriodicBatchingSink.cs (100%)
 rename src/{Serilog => Serilog.Sinks.PeriodicBatching}/Sinks/PeriodicBatching/PortableTimer.cs (100%)
 create mode 100644 src/Serilog.Sinks.PeriodicBatching/project.json

diff --git a/Serilog.sln b/Serilog.sln
index 5fc811ffb..4af04fe91 100644
--- a/Serilog.sln
+++ b/Serilog.sln
@@ -33,6 +33,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.RollingFile",
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.SystemConsole", "src\Serilog.Sinks.SystemConsole\Serilog.Sinks.SystemConsole.xproj", "{50B24ACA-D8F0-4268-A477-871B0A92A04A}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.PeriodicBatching", "src\Serilog.Sinks.PeriodicBatching\Serilog.Sinks.PeriodicBatching.xproj", "{324C2F52-D9F7-4844-9BC4-9906E228D380}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +69,10 @@ Global
 		{50B24ACA-D8F0-4268-A477-871B0A92A04A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{50B24ACA-D8F0-4268-A477-871B0A92A04A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50B24ACA-D8F0-4268-A477-871B0A92A04A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{324C2F52-D9F7-4844-9BC4-9906E228D380}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{324C2F52-D9F7-4844-9BC4-9906E228D380}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{324C2F52-D9F7-4844-9BC4-9906E228D380}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{324C2F52-D9F7-4844-9BC4-9906E228D380}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -80,5 +86,6 @@ Global
 		{57E0ED0E-0F45-48AB-A73D-6A92B7C32095} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9}
 		{A3E6E5B4-995F-4C3D-9673-A4B6000F4E21} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9}
 		{50B24ACA-D8F0-4268-A477-871B0A92A04A} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9}
+		{324C2F52-D9F7-4844-9BC4-9906E228D380} = {9EC69873-5A97-4C25-AB5A-31DDE589B2D9}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Serilog.Sinks.PeriodicBatching/Properties/InternalsVisibleTo.cs b/src/Serilog.Sinks.PeriodicBatching/Properties/InternalsVisibleTo.cs
new file mode 100644
index 000000000..dd34d0bdb
--- /dev/null
+++ b/src/Serilog.Sinks.PeriodicBatching/Properties/InternalsVisibleTo.cs
@@ -0,0 +1,11 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyVersion("2.0.0.0")]
+
+[assembly: InternalsVisibleTo("Serilog.Tests, PublicKey=" +
+                              "0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" +
+                              "6fe0fe83ef33c1080bf30690765bc6eb0df26ebfdf8f21670c64265b30db09f73a0dea5b3db4c9" +
+                              "d18dbf6d5a25af5ce9016f281014d79dc3b4201ac646c451830fc7e61a2dfd633d34c39f87b818" +
+                              "94191652df5ac63cc40c77f3542f702bda692e6e8a9158353df189007a49da0f3cfd55eb250066" +
+                              "b19485ec")]
diff --git a/src/Serilog.Sinks.PeriodicBatching/Serilog.Sinks.PeriodicBatching.xproj b/src/Serilog.Sinks.PeriodicBatching/Serilog.Sinks.PeriodicBatching.xproj
new file mode 100644
index 000000000..0b37f33e2
--- /dev/null
+++ b/src/Serilog.Sinks.PeriodicBatching/Serilog.Sinks.PeriodicBatching.xproj
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>324c2f52-d9f7-4844-9bc4-9906e228d380</ProjectGuid>
+    <RootNamespace>Serilog.Sinks.PeriodicBatching</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
diff --git a/src/Serilog/Sinks/PeriodicBatching/BatchedConnectionStatus.cs b/src/Serilog.Sinks.PeriodicBatching/Sinks/PeriodicBatching/BatchedConnectionStatus.cs
similarity index 100%
rename from src/Serilog/Sinks/PeriodicBatching/BatchedConnectionStatus.cs
rename to src/Serilog.Sinks.PeriodicBatching/Sinks/PeriodicBatching/BatchedConnectionStatus.cs
diff --git a/src/Serilog/Sinks/PeriodicBatching/PeriodicBatchingSink.cs b/src/Serilog.Sinks.PeriodicBatching/Sinks/PeriodicBatching/PeriodicBatchingSink.cs
similarity index 100%
rename from src/Serilog/Sinks/PeriodicBatching/PeriodicBatchingSink.cs
rename to src/Serilog.Sinks.PeriodicBatching/Sinks/PeriodicBatching/PeriodicBatchingSink.cs
diff --git a/src/Serilog/Sinks/PeriodicBatching/PortableTimer.cs b/src/Serilog.Sinks.PeriodicBatching/Sinks/PeriodicBatching/PortableTimer.cs
similarity index 100%
rename from src/Serilog/Sinks/PeriodicBatching/PortableTimer.cs
rename to src/Serilog.Sinks.PeriodicBatching/Sinks/PeriodicBatching/PortableTimer.cs
diff --git a/src/Serilog.Sinks.PeriodicBatching/project.json b/src/Serilog.Sinks.PeriodicBatching/project.json
new file mode 100644
index 000000000..a929fd1d0
--- /dev/null
+++ b/src/Serilog.Sinks.PeriodicBatching/project.json
@@ -0,0 +1,33 @@
+{
+  "version": "2.0.0-beta-*",
+  "description": "The periodic batching sink for Serilog",
+  "authors": [ "Serilog Contributors" ],
+  "tags": [ "serilog", "batching", "timer"],
+  "projectUrl": "http://serilog.net",
+  "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
+  "iconUrl": "http://serilog.net/images/serilog-sink-nuget.png",
+  "dependencies": {
+    "Serilog": { "target": "project" }, 
+  },
+  "compilationOptions": {
+    "keyFile": "../../assets/Serilog.snk"
+  },
+  "frameworks": {
+    "net45": {
+      "compilationOptions": { 
+        "define": [ "PERIODIC_BATCHING" ]
+      },
+      "frameworkAssemblies": {
+        "System.Configuration": ""
+      }
+    },
+    "dotnet5.2": {
+      "compilationOptions": {
+        "define": [ "PERIODIC_BATCHING", "NO_TIMER", "NO_APPDOMAIN" ]
+      },
+      "dependencies": {
+        "System.Collections.Concurrent": "4.0.11-beta-23516"
+      }
+    } 
+  }
+}
\ No newline at end of file
diff --git a/test/Serilog.Tests/project.json b/test/Serilog.Tests/project.json
index 945fb5af5..1dfa53bc3 100644
--- a/test/Serilog.Tests/project.json
+++ b/test/Serilog.Tests/project.json
@@ -14,7 +14,8 @@
         "Serilog.Sinks.Console": { "target": "project" },
         "Serilog.Sinks.DiagnosticTrace": { "target": "project" },
         "Serilog.Sinks.IOFile": { "target": "project" }, 
-        "Serilog.Sinks.RollingFile": {"target": "project"}
+        "Serilog.Sinks.RollingFile": { "target": "project" },
+        "Serilog.Sinks.PeriodicBatching": {"target": "project"}
     },
     "frameworks": {
         "dnx451": {