From c247caba6dd7c3ac0c4d3411fb3f56dfc52e3a92 Mon Sep 17 00:00:00 2001
From: ihirt <ihirt@greenliff.com>
Date: Tue, 24 Nov 2015 17:36:45 +0100
Subject: [PATCH 1/4] Support for ASP.NET 5 Beta 8

---
 AzureTableStorageNLogTarget.1.0.9.nupkg       | Bin 8365 -> 0 bytes
 .../.gitignore                                | 206 ++++++++++++++++++
 ...s.AzureTableStorage.EmptyApplication.xproj |  19 ++
 .../NLog.config                               |  30 +++
 .../Startup.cs                                |  60 +++++
 .../appsettings.json                          |   5 +
 .../project.json                              |  33 +++
 .../wwwroot/web.config                        |   9 +
 .../App.config                                |  26 ---
 .../AzureTableStorageTargetTests.cs           | 115 +++++++---
 ....Extensions.AzureTableStorage.Tests.csproj | 134 ------------
 ...g.Extensions.AzureTableStorage.Tests.xproj |  21 ++
 .../appsettings.json                          |   5 +
 .../packages.config                           |  19 --
 .../project.json                              |  24 ++
 NLog.Extensions.AzureTableStorage.sln         |  47 ++++
 .../AtsCoreServiceCollectionExtensions.cs     |  15 ++
 .../AtsOptions.cs                             |  25 +++
 .../AzureTableStorageTarget.cs                |   6 +-
 .../ConfigManager.cs                          |  11 +-
 .../NLog.Extensions.AzureTableStorage.csproj  |  99 ---------
 .../NLog.Extensions.AzureTableStorage.xproj   |  20 ++
 .../NotNullAttribute.cs                       |   9 +
 .../Properties/AssemblyInfo.cs                |  29 +--
 .../TableStorageManager.cs                    |   4 +-
 NLog.Extensions.AzureTableStorage/app.config  |  23 --
 .../packages.config                           |  11 -
 .../project.json                              |  27 +++
 NLog.Extensions.sln                           |  35 ---
 NuGet.Config                                  |   8 +
 README.md                                     |  21 +-
 global.json                                   |   6 +
 32 files changed, 679 insertions(+), 423 deletions(-)
 delete mode 100644 AzureTableStorageNLogTarget.1.0.9.nupkg
 create mode 100644 NLog.Extensions.AzureTableStorage.EmptyApplication/.gitignore
 create mode 100644 NLog.Extensions.AzureTableStorage.EmptyApplication/NLog.Extensions.AzureTableStorage.EmptyApplication.xproj
 create mode 100644 NLog.Extensions.AzureTableStorage.EmptyApplication/NLog.config
 create mode 100644 NLog.Extensions.AzureTableStorage.EmptyApplication/Startup.cs
 create mode 100644 NLog.Extensions.AzureTableStorage.EmptyApplication/appsettings.json
 create mode 100644 NLog.Extensions.AzureTableStorage.EmptyApplication/project.json
 create mode 100644 NLog.Extensions.AzureTableStorage.EmptyApplication/wwwroot/web.config
 delete mode 100644 NLog.Extensions.AzureTableStorage.Tests/App.config
 delete mode 100644 NLog.Extensions.AzureTableStorage.Tests/NLog.Extensions.AzureTableStorage.Tests.csproj
 create mode 100644 NLog.Extensions.AzureTableStorage.Tests/NLog.Extensions.AzureTableStorage.Tests.xproj
 create mode 100644 NLog.Extensions.AzureTableStorage.Tests/appsettings.json
 delete mode 100644 NLog.Extensions.AzureTableStorage.Tests/packages.config
 create mode 100644 NLog.Extensions.AzureTableStorage.Tests/project.json
 create mode 100644 NLog.Extensions.AzureTableStorage.sln
 create mode 100644 NLog.Extensions.AzureTableStorage/AtsCoreServiceCollectionExtensions.cs
 create mode 100644 NLog.Extensions.AzureTableStorage/AtsOptions.cs
 delete mode 100644 NLog.Extensions.AzureTableStorage/NLog.Extensions.AzureTableStorage.csproj
 create mode 100644 NLog.Extensions.AzureTableStorage/NLog.Extensions.AzureTableStorage.xproj
 create mode 100644 NLog.Extensions.AzureTableStorage/NotNullAttribute.cs
 delete mode 100644 NLog.Extensions.AzureTableStorage/app.config
 delete mode 100644 NLog.Extensions.AzureTableStorage/packages.config
 create mode 100644 NLog.Extensions.AzureTableStorage/project.json
 delete mode 100644 NLog.Extensions.sln
 create mode 100644 NuGet.Config
 create mode 100644 global.json

diff --git a/AzureTableStorageNLogTarget.1.0.9.nupkg b/AzureTableStorageNLogTarget.1.0.9.nupkg
deleted file mode 100644
index 477705442c984e5a6eb4eed295f58c27d0f2f1d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8365
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
YcWX~yi;(Edj1c>MfnA~p%xA6t18hf_)c^nh

diff --git a/NLog.Extensions.AzureTableStorage.EmptyApplication/.gitignore b/NLog.Extensions.AzureTableStorage.EmptyApplication/.gitignore
new file mode 100644
index 0000000..97e402e
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.EmptyApplication/.gitignore
@@ -0,0 +1,206 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+bower_components/
+orleans.codegen.cs
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
diff --git a/NLog.Extensions.AzureTableStorage.EmptyApplication/NLog.Extensions.AzureTableStorage.EmptyApplication.xproj b/NLog.Extensions.AzureTableStorage.EmptyApplication/NLog.Extensions.AzureTableStorage.EmptyApplication.xproj
new file mode 100644
index 0000000..98bef58
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.EmptyApplication/NLog.Extensions.AzureTableStorage.EmptyApplication.xproj
@@ -0,0 +1,19 @@
+<?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>87d6bdf5-8313-45be-90ce-d0f8f15c44a9</ProjectGuid>
+    <RootNamespace>EmptyApplication</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>
\ No newline at end of file
diff --git a/NLog.Extensions.AzureTableStorage.EmptyApplication/NLog.config b/NLog.Extensions.AzureTableStorage.EmptyApplication/NLog.config
new file mode 100644
index 0000000..da83444
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.EmptyApplication/NLog.config
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog throwsException="true" xmlns="http://www.nlog-project.org/schemas/NLog.xsd" 
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      autoReload="true">
+
+  <extensions>
+    <add assembly="NLog.Extensions.AzureTableStorage"/>
+  </extensions>
+  
+  <targets>
+    <target name="logfile"
+            xsi:type="File" 
+            deleteOldFileOnStartup="true"
+            fileName="log.txt"
+            layout="${longdate} ${level:uppercase=true} ${logger} ${event-context:item=EventId} ${message} ${ndc}" />
+    <target name="console"
+            xsi:type="ColoredConsole"
+            layout="${longdate} ${level:uppercase=true} ${logger} ${event-context:item=EventId} ${message} ${ndc}" />
+    <target name="AzureTableStorage"
+            xsi:type="AzureTableStorage"
+            layout="${longdate} ${level:uppercase=true} ${logger} ${event-context:item=EventId} ${message} ${ndc}"
+            PartitionKeyPrefix="customPrefix"
+            connectionStringKey="StorageAccountConnectionString"
+            tableName="TempAzureTableStorageTargetTestsLogs" />
+  </targets>
+
+  <rules>
+        <logger name="*" minlevel="Debug" writeTo="logfile,console,AzureTableStorage" />
+    </rules>
+</nlog>
diff --git a/NLog.Extensions.AzureTableStorage.EmptyApplication/Startup.cs b/NLog.Extensions.AzureTableStorage.EmptyApplication/Startup.cs
new file mode 100644
index 0000000..ce8e849
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.EmptyApplication/Startup.cs
@@ -0,0 +1,60 @@
+
+using System.IO;
+using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
+using Microsoft.AspNet.Http;
+using Microsoft.Dnx.Runtime;
+using Microsoft.Framework.Configuration;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.Logging;
+
+namespace NLog.Extensions.AzureTableStorage.EmptyApplication
+{
+    public class Startup
+    {
+        private Microsoft.Framework.Logging.ILogger _log;
+        private string logConfigurationFile = string.Empty;
+
+        public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv)
+        {
+            // Setup configuration sources.
+
+            var builder = new ConfigurationBuilder()
+                .SetBasePath(appEnv.ApplicationBasePath)
+                .AddJsonFile("appsettings.json")
+                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);
+            logConfigurationFile = Path.Combine(appEnv.ApplicationBasePath, "NLog.config");
+
+            builder.AddEnvironmentVariables();
+            Configuration = builder.Build();
+        }
+
+        public IConfigurationRoot Configuration { get; set; }
+
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // Configure AtsOption for NLog.Extensions.AzureTableStorage
+            services.ConfigureAts(options => {
+                options.StorageAccountConnectionString = Configuration["AppSettings:StorageAccountConnectionString"];
+            });
+        }
+
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        {
+            // add NLog for logging
+            loggerFactory.AddNLog(new LogFactory(new NLog.Config.XmlLoggingConfiguration(logConfigurationFile)));
+            _log = loggerFactory.CreateLogger<Startup>();
+
+            // generate some log output
+            _log.LogInformation("Happy table logging!");
+            _log.LogInformation(string.Format("Log configuration: {0}", logConfigurationFile));
+
+            app.UseIISPlatformHandler();
+
+            app.Run(async (context) =>
+            {
+                await context.Response.WriteAsync("Hello World!");
+            });
+        }
+    }
+}
diff --git a/NLog.Extensions.AzureTableStorage.EmptyApplication/appsettings.json b/NLog.Extensions.AzureTableStorage.EmptyApplication/appsettings.json
new file mode 100644
index 0000000..74ddae3
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.EmptyApplication/appsettings.json
@@ -0,0 +1,5 @@
+{
+  "AppSettings": {
+    "StorageAccountConnectionString": "UseDevelopmentStorage=true"
+  }
+}
diff --git a/NLog.Extensions.AzureTableStorage.EmptyApplication/project.json b/NLog.Extensions.AzureTableStorage.EmptyApplication/project.json
new file mode 100644
index 0000000..61a9477
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.EmptyApplication/project.json
@@ -0,0 +1,33 @@
+{
+  "version": "1.0.0-*",
+
+  "tooling": {
+    "defaultNamespace": "NLog.Extensions.AzureTableStorage.EmptyApplication"
+  },
+
+  "dependencies": {
+    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8",
+    "Microsoft.AspNet.Hosting": "1.0.0-beta8",
+    "Microsoft.Framework.DependencyInjection": "1.0.0-beta8",
+    "Microsoft.Framework.Logging.NLog": "1.0.0-beta8-*",
+    "NLog.Extensions.AzureTableStorage": ""
+  },
+
+  "commands": {
+    "web": "Microsoft.AspNet.Server.Kestrel"
+  },
+
+  "frameworks": {
+    "dnx451": { }
+  },
+
+  "exclude": [
+    "wwwroot",
+    "node_modules"
+  ],
+  "publishExclude": [
+    "**.user",
+    "**.vspscc"
+  ]
+}
diff --git a/NLog.Extensions.AzureTableStorage.EmptyApplication/wwwroot/web.config b/NLog.Extensions.AzureTableStorage.EmptyApplication/wwwroot/web.config
new file mode 100644
index 0000000..e70a777
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.EmptyApplication/wwwroot/web.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified"/>
+    </handlers>
+    <httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" stdoutLogEnabled="false"/>
+  </system.webServer>
+</configuration>
diff --git a/NLog.Extensions.AzureTableStorage.Tests/App.config b/NLog.Extensions.AzureTableStorage.Tests/App.config
deleted file mode 100644
index dab5818..0000000
--- a/NLog.Extensions.AzureTableStorage.Tests/App.config
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <appSettings>
-    <add key="StorageAccountConnectionString" value="UseDevelopmentStorage=true" />
-  </appSettings>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/NLog.Extensions.AzureTableStorage.Tests/AzureTableStorageTargetTests.cs b/NLog.Extensions.AzureTableStorage.Tests/AzureTableStorageTargetTests.cs
index dc546ff..1fb91dd 100644
--- a/NLog.Extensions.AzureTableStorage.Tests/AzureTableStorageTargetTests.cs
+++ b/NLog.Extensions.AzureTableStorage.Tests/AzureTableStorageTargetTests.cs
@@ -1,44 +1,75 @@
 using Microsoft.Azure;
+using Microsoft.Framework.Configuration;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace NLog.Extensions.AzureTableStorage.Tests
 {
+    public static class Extensions
+    {
+        public static async Task<IList<T>> ExecuteQueryAsync<T>(this CloudTable table, TableQuery<T> query, CancellationToken ct = default(CancellationToken), Action<IList<T>> onProgress = null) where T : ITableEntity, new()
+        {
+            var items = new List<T>();
+            TableContinuationToken token = null;
+
+            do
+            {
+                TableQuerySegment<T> seg = await table.ExecuteQuerySegmentedAsync<T>(query, token);
+                token = seg.ContinuationToken;
+                items.AddRange(seg);
+                if (onProgress != null) onProgress(items);
+
+            } while (token != null && !ct.IsCancellationRequested);
+
+            return items;
+        }
+    }
+
     public class AzureTableStorageTargetTests : IDisposable
     {
         private readonly Logger _logger;
         private readonly CloudTable _cloudTable;
         private const string TargetTableName = "TempAzureTableStorageTargetTestsLogs"; //must match table name in AzureTableStorage target in NLog.config
 
+        public void SetupAction(AtsOptions options)
+        {
+            var cb = new ConfigurationBuilder().AddJsonFile("appsettings.json");
+            IConfigurationRoot config = cb.Build();
+            options.StorageAccountConnectionString = config["AppSettings:StorageAccountConnectionString"];
+        }
+
         public AzureTableStorageTargetTests()
         {
             try
             {
-                _logger = LogManager.GetLogger(GetType().ToString());
+                AtsCoreServiceCollectionExtensions.ConfigureAts(null, SetupAction);
+                LogManager.Configuration = new NLog.Config.XmlLoggingConfiguration("NLog.config");
+                _logger = LogManager.GetCurrentClassLogger();
                 var storageAccount = GetStorageAccount();
                 // Create the table client.
                 var tableClient = storageAccount.CreateCloudTableClient();
                 //create charts table if not exists.
                 _cloudTable = tableClient.GetTableReference(TargetTableName);
-                _cloudTable.CreateIfNotExists();
+                _cloudTable.CreateIfNotExistsAsync().Wait();
             }
             catch (Exception ex)
             {
                 throw new Exception("Failed to initialize tests, make sure Azure Storage Emulator is running.", ex);
             }
-            
         }
 
         [Fact]
-        public void CanLogInformation()
+        public async Task CanLogInformation()
         {
-            Assert.True(GetLogEntities().Count == 0);
+            Assert.True((await GetLogEntities()).Count == 0);
             _logger.Log(LogLevel.Info, "information");
-            var entities = GetLogEntities();
+            var entities = await GetLogEntities();
             var entity = entities.Single();
             Assert.True(entities.Count == 1);
             Assert.Equal("information", entity.Message);
@@ -47,11 +78,11 @@ public void CanLogInformation()
         }
 
         [Fact]
-        public void CanLogExceptions()
+        public async Task CanLogExceptions()
         {
-            Assert.True(GetLogEntities().Count == 0);
-            _logger.Log(LogLevel.Error, "exception message", (Exception)new NullReferenceException());
-            var entities = GetLogEntities();
+            Assert.True((await GetLogEntities()).Count == 0);
+            _logger.Log(LogLevel.Error, new NullReferenceException(), "exception message");
+            var entities = await GetLogEntities();
             var entity = entities.Single();
             Assert.True(entities.Count == 1);
             Assert.Equal("exception message", entity.Message);
@@ -61,45 +92,43 @@ public void CanLogExceptions()
         }
 
         [Fact]
-        public void IncludeExceptionFormattedMessengerInLoggedRow()
+        public async Task IncludeExceptionFormattedMessengerInLoggedRow()
         {
             _logger.Debug("exception message {0} and {1}.", 2010, 2014);
-            var entity = GetLogEntities().Single();
+            var entity = (await GetLogEntities()).Single();
             Assert.Equal("exception message 2010 and 2014.", entity.Message);
         }
 
         [Fact]
-        public void IncludeExceptionDataInLoggedRow()
+        public async Task IncludeExceptionDataInLoggedRow()
         {
             var exception = new NullReferenceException();
             var errorId = Guid.NewGuid();
             exception.Data["id"] = errorId;
             exception.Data["name"] = "ahmed";
-            _logger.Log(LogLevel.Error, "execption messege", (Exception)exception);
-            var entities = GetLogEntities();
+            _logger.Log(LogLevel.Error, exception, "execption message");
+            var entities = await GetLogEntities();
             var entity = entities.Single();
             Assert.True(entity.ExceptionData.Contains(errorId.ToString()));
             Assert.True(entity.ExceptionData.Contains("name=ahmed"));
         }
 
-
         [Fact]
-        public void IncludeExceptionDetailsInLoggedRow()
+        public async Task IncludeExceptionDetailsInLoggedRow()
         {
             var exception = new NullReferenceException();
-            _logger.Log(LogLevel.Error, "execption messege", (Exception)exception);
-            var entity = GetLogEntities().Single();
+            _logger.Log(LogLevel.Error, exception, "execption message");
+            var entity = (await GetLogEntities()).Single();
             Assert.NotNull(entity.Exception);
             Assert.Equal(exception.ToString().ExceptBlanks(), entity.Exception.ExceptBlanks());
         }
 
-
         [Fact]
-        public void IncludeInnerExceptionDetailsInLoggedRow()
+        public async Task IncludeInnerExceptionDetailsInLoggedRow()
         {
             var exception = new NullReferenceException("exception message", new DivideByZeroException());
-            _logger.Log(LogLevel.Error, "execption messege", (Exception)exception);
-            var entity = GetLogEntities().Single();
+            _logger.Log(LogLevel.Error, exception, "execption message");
+            var entity = (await GetLogEntities()).Single();
             Assert.NotNull(entity.Exception);
             Assert.Equal(exception.ToString().ExceptBlanks(), entity.Exception.ExceptBlanks());
             Assert.NotNull(entity.InnerException);
@@ -107,29 +136,29 @@ public void IncludeInnerExceptionDetailsInLoggedRow()
         }
 
         [Fact]
-        public void IncludePartitionKeyPrefix()
+        public async Task IncludePartitionKeyPrefix()
         {
             var exception = new NullReferenceException();
-            _logger.Log(LogLevel.Error, "execption messege", (Exception)exception);
-            var entity = GetLogEntities().Single();
+            _logger.Log(LogLevel.Error, exception, "execption message");
+            var entity = (await GetLogEntities()).Single();
             Assert.True(entity.PartitionKey.Contains("customPrefix"));
         }
 
         [Fact]
-        public void IncludeMachineName()
+        public async Task IncludeMachineName()
         {
             var exception = new NullReferenceException();
-            _logger.Log(LogLevel.Error, "execption messege", (Exception)exception);
-            var entity = GetLogEntities().Single();
+            _logger.Log(LogLevel.Error, exception, "execption message");
+            var entity = (await GetLogEntities()).Single();
             Assert.Equal(entity.MachineName, Environment.MachineName);
         }
 
         [Fact]
-        public void IncludeGuidAndTimeComponentInRowKey()
+        public async Task IncludeGuidAndTimeComponentInRowKey()
         {
             var exception = new NullReferenceException();
-            _logger.Log(LogLevel.Error, "execption messege", (Exception)exception);
-            var entity = GetLogEntities().Single();
+            _logger.Log(LogLevel.Error, (Exception)exception, "execption message");
+            var entity = (await GetLogEntities()).Single();
             const string splitter = "__";
             Assert.True(entity.RowKey.Contains(splitter));
             var splitterArray = "__".ToCharArray();
@@ -144,25 +173,39 @@ public void IncludeGuidAndTimeComponentInRowKey()
 
         private string GetStorageAccountConnectionString()
         {
-            return CloudConfigurationManager.GetSetting("StorageAccountConnectionString");
+            //try get connection string from app settings or cloud service config
+            var connectionStringValue = CloudConfigurationManager.GetSetting("StorageAccountConnectionString");
+            if (string.IsNullOrEmpty(connectionStringValue))
+            {
+                //try get connection string from configured AtsOptions
+                connectionStringValue = AtsOptions.Instance.StorageAccountConnectionString;
+            }
+
+            return connectionStringValue;
         }
+
         private CloudStorageAccount GetStorageAccount()
         {
             var connectionString = GetStorageAccountConnectionString();
             var storageAccount = CloudStorageAccount.Parse(connectionString);
             return storageAccount;
         }
-        private List<LogEntity> GetLogEntities()
+
+        private async Task<List<LogEntity>> GetLogEntities()
         {
             // Construct the query operation for all customer entities where PartitionKey="Smith".
             var query = new TableQuery<LogEntity>()
                 .Where(TableQuery.GenerateFilterCondition("PartitionKey", QueryComparisons.Equal, "customPrefix." + GetType()));
-            var entities = _cloudTable.ExecuteQuery(query);
+            //var entities = _cloudTable.ExecuteQuery(query);
+            IList<LogEntity> entities = await _cloudTable.ExecuteQueryAsync(query);
+
             return entities.ToList();
         }
+
         public void Dispose()
         {
-            _cloudTable.DeleteIfExists();
+            //_cloudTable.DeleteIfExists();
+            _cloudTable.DeleteIfExistsAsync().Wait();
         }
     }
 }
diff --git a/NLog.Extensions.AzureTableStorage.Tests/NLog.Extensions.AzureTableStorage.Tests.csproj b/NLog.Extensions.AzureTableStorage.Tests/NLog.Extensions.AzureTableStorage.Tests.csproj
deleted file mode 100644
index 50b5552..0000000
--- a/NLog.Extensions.AzureTableStorage.Tests/NLog.Extensions.AzureTableStorage.Tests.csproj
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FFF58919-9BC6-4FFA-B0B4-2197F468813D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NLog.Extensions.AzureTableStorage.Tests</RootNamespace>
-    <AssemblyName>NLog.Extensions.AzureTableStorage.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>5f660091</NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Data.Services.Client, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog">
-      <HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.Services.Client" />
-    <Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AzureStorageTableNameValidatorTests.cs" />
-    <Compile Include="AzureTableStorageTargetTests.cs" />
-    <Compile Include="Helpers.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="NLog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <None Include="App.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="NLog.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NLog.Extensions.AzureTableStorage\NLog.Extensions.AzureTableStorage.csproj">
-      <Project>{69b79032-f3c0-4087-b14e-54e7e91fc4a0}</Project>
-      <Name>NLog.Extensions.AzureTableStorage</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/NLog.Extensions.AzureTableStorage.Tests/NLog.Extensions.AzureTableStorage.Tests.xproj b/NLog.Extensions.AzureTableStorage.Tests/NLog.Extensions.AzureTableStorage.Tests.xproj
new file mode 100644
index 0000000..e06d667
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.Tests/NLog.Extensions.AzureTableStorage.Tests.xproj
@@ -0,0 +1,21 @@
+<?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>2f71836f-3707-4779-829e-ba7f474fff86</ProjectGuid>
+    <RootNamespace>NLog.Extensions.AzureTableStorage.Tests</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
\ No newline at end of file
diff --git a/NLog.Extensions.AzureTableStorage.Tests/appsettings.json b/NLog.Extensions.AzureTableStorage.Tests/appsettings.json
new file mode 100644
index 0000000..74ddae3
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.Tests/appsettings.json
@@ -0,0 +1,5 @@
+{
+  "AppSettings": {
+    "StorageAccountConnectionString": "UseDevelopmentStorage=true"
+  }
+}
diff --git a/NLog.Extensions.AzureTableStorage.Tests/packages.config b/NLog.Extensions.AzureTableStorage.Tests/packages.config
deleted file mode 100644
index 680bc8a..0000000
--- a/NLog.Extensions.AzureTableStorage.Tests/packages.config
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
-  <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
-  <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
-  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.1.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
-  <package id="NLog" version="3.2.0.0" targetFramework="net45" />
-  <package id="NLog.Config" version="3.2.0.0" targetFramework="net45" />
-  <package id="NLog.Schema" version="3.2.0.0" targetFramework="net45" />
-  <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net45" />
-  <package id="xunit" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/NLog.Extensions.AzureTableStorage.Tests/project.json b/NLog.Extensions.AzureTableStorage.Tests/project.json
new file mode 100644
index 0000000..85e82a1
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.Tests/project.json
@@ -0,0 +1,24 @@
+{
+  "version": "1.0.0-*",
+  "description": "NLog.Extensions.AzureTableStorage.Tests Class Library",
+  "authors": [ "greenliff.com" ],
+  "tags": [ "" ],
+  "projectUrl": "",
+  "licenseUrl": "",
+
+  "dependencies": {
+    "Microsoft.Framework.Configuration": "1.0.0-beta8",
+    "Microsoft.Framework.OptionsModel": "1.0.0-beta8-*",
+    "NLog.Extensions.AzureTableStorage": "",
+    "xunit": "2.1.0-rc2-build3176",
+    "xunit.runner.dnx": "2.1.0-beta6-build191"
+  },
+
+  "frameworks": {
+    "dnx451": { }
+  },
+
+  "commands": {
+    "test": "xunit.runner.dnx"
+  }
+}
diff --git a/NLog.Extensions.AzureTableStorage.sln b/NLog.Extensions.AzureTableStorage.sln
new file mode 100644
index 0000000..03d7938
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.sln
@@ -0,0 +1,47 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{625E4C17-5831-4FF2-914C-C3E326941B87}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3EF3BC13-E023-45DC-959A-6A6C0F97C744}"
+	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
+		NuGet.Config = NuGet.Config
+	EndProjectSection
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NLog.Extensions.AzureTableStorage", "NLog.Extensions.AzureTableStorage\NLog.Extensions.AzureTableStorage.xproj", "{F27F5ACA-07BD-486D-818C-CC5B26D3446B}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NLog.Extensions.AzureTableStorage.Tests", "NLog.Extensions.AzureTableStorage.Tests\NLog.Extensions.AzureTableStorage.Tests.xproj", "{2F71836F-3707-4779-829E-BA7F474FFF86}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NLog.Extensions.AzureTableStorage.EmptyApplication", "NLog.Extensions.AzureTableStorage.EmptyApplication\NLog.Extensions.AzureTableStorage.EmptyApplication.xproj", "{87D6BDF5-8313-45BE-90CE-D0F8F15C44A9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F27F5ACA-07BD-486D-818C-CC5B26D3446B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F27F5ACA-07BD-486D-818C-CC5B26D3446B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F27F5ACA-07BD-486D-818C-CC5B26D3446B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F27F5ACA-07BD-486D-818C-CC5B26D3446B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F71836F-3707-4779-829E-BA7F474FFF86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F71836F-3707-4779-829E-BA7F474FFF86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F71836F-3707-4779-829E-BA7F474FFF86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F71836F-3707-4779-829E-BA7F474FFF86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87D6BDF5-8313-45BE-90CE-D0F8F15C44A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87D6BDF5-8313-45BE-90CE-D0F8F15C44A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87D6BDF5-8313-45BE-90CE-D0F8F15C44A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87D6BDF5-8313-45BE-90CE-D0F8F15C44A9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{F27F5ACA-07BD-486D-818C-CC5B26D3446B} = {625E4C17-5831-4FF2-914C-C3E326941B87}
+		{2F71836F-3707-4779-829E-BA7F474FFF86} = {625E4C17-5831-4FF2-914C-C3E326941B87}
+		{87D6BDF5-8313-45BE-90CE-D0F8F15C44A9} = {625E4C17-5831-4FF2-914C-C3E326941B87}
+	EndGlobalSection
+EndGlobal
diff --git a/NLog.Extensions.AzureTableStorage/AtsCoreServiceCollectionExtensions.cs b/NLog.Extensions.AzureTableStorage/AtsCoreServiceCollectionExtensions.cs
new file mode 100644
index 0000000..a2460cb
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage/AtsCoreServiceCollectionExtensions.cs
@@ -0,0 +1,15 @@
+using System;
+using Microsoft.Framework.DependencyInjection;
+
+namespace NLog.Extensions.AzureTableStorage
+{
+    public static class AtsCoreServiceCollectionExtensions
+    {
+        public static void ConfigureAts(this IServiceCollection services,
+                                        [NotNull] Action<AtsOptions> setupAction)
+        {
+            var options = AtsOptions.Instance;
+            setupAction(options);
+        }
+    }
+}
diff --git a/NLog.Extensions.AzureTableStorage/AtsOptions.cs b/NLog.Extensions.AzureTableStorage/AtsOptions.cs
new file mode 100644
index 0000000..40540b0
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage/AtsOptions.cs
@@ -0,0 +1,25 @@
+using System;
+
+namespace NLog.Extensions.AzureTableStorage
+{
+    public class AtsOptions
+    {
+        private static AtsOptions _instance;
+
+        public string StorageAccountConnectionString { get; set; }
+
+        private AtsOptions() { }
+
+        public static AtsOptions Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = new AtsOptions();
+                }
+                return _instance;
+            }
+        }
+    }
+}
diff --git a/NLog.Extensions.AzureTableStorage/AzureTableStorageTarget.cs b/NLog.Extensions.AzureTableStorage/AzureTableStorageTarget.cs
index 5925a0a..8a309f9 100644
--- a/NLog.Extensions.AzureTableStorage/AzureTableStorageTarget.cs
+++ b/NLog.Extensions.AzureTableStorage/AzureTableStorageTarget.cs
@@ -1,5 +1,5 @@
 using System;
-using System.ComponentModel.DataAnnotations;
+using NLog.Config;
 using NLog.Targets;
 
 namespace NLog.Extensions.AzureTableStorage
@@ -10,10 +10,10 @@ public class AzureTableStorageTarget : TargetWithLayout
         private ConfigManager _configManager;
         private TableStorageManager _tableStorageManager;
 
-        [Required]
+        [RequiredParameter]
         public string ConnectionStringKey { get; set; }
 
-        [Required]
+        [RequiredParameter]
         public string TableName { get; set; }
 
         public string PartitionKeyPrefix { get; set; }
diff --git a/NLog.Extensions.AzureTableStorage/ConfigManager.cs b/NLog.Extensions.AzureTableStorage/ConfigManager.cs
index 8fc2c7b..f6f7e30 100644
--- a/NLog.Extensions.AzureTableStorage/ConfigManager.cs
+++ b/NLog.Extensions.AzureTableStorage/ConfigManager.cs
@@ -1,6 +1,5 @@
 using Microsoft.Azure;
 using Microsoft.WindowsAzure.Storage;
-using System.Configuration;
 
 namespace NLog.Extensions.AzureTableStorage
 {
@@ -17,14 +16,12 @@ private string GetStorageAccountConnectionString()
         {
             //try get connection string from app settings or cloud service config
             var connectionStringValue = CloudConfigurationManager.GetSetting(_connectionStringKey);
-            if (!string.IsNullOrEmpty(connectionStringValue)) return connectionStringValue;
-
-            //try get connection string from ConfigurationManager.ConnectionStrings
-            var connectionString = ConfigurationManager.ConnectionStrings[_connectionStringKey];
-            if (connectionString != null)
+            if (string.IsNullOrEmpty(connectionStringValue))
             {
-                connectionStringValue = connectionString.ConnectionString;
+                //try get connection string from configured AtsOptions
+                connectionStringValue = AtsOptions.Instance.StorageAccountConnectionString;
             }
+
             return connectionStringValue;
         }
 
diff --git a/NLog.Extensions.AzureTableStorage/NLog.Extensions.AzureTableStorage.csproj b/NLog.Extensions.AzureTableStorage/NLog.Extensions.AzureTableStorage.csproj
deleted file mode 100644
index 8648322..0000000
--- a/NLog.Extensions.AzureTableStorage/NLog.Extensions.AzureTableStorage.csproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{69B79032-F3C0-4087-B14E-54E7E91FC4A0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NLog.Extensions.AzureTableStorage</RootNamespace>
-    <AssemblyName>NLog.Extensions.AzureTableStorage</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Data.Services.Client, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=3.2.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.Services.Client" />
-    <Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AzureStorageTableNameValidator.cs" />
-    <Compile Include="AzureTableStorageTarget.cs" />
-    <Compile Include="ConfigManager.cs" />
-    <Compile Include="LogEntity.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TableStorageManager.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/NLog.Extensions.AzureTableStorage/NLog.Extensions.AzureTableStorage.xproj b/NLog.Extensions.AzureTableStorage/NLog.Extensions.AzureTableStorage.xproj
new file mode 100644
index 0000000..7ff5d3a
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage/NLog.Extensions.AzureTableStorage.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>f27f5aca-07bd-486d-818c-cc5b26d3446b</ProjectGuid>
+    <RootNamespace>NLog.Extensions.AzureTableStorage</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/NLog.Extensions.AzureTableStorage/NotNullAttribute.cs b/NLog.Extensions.AzureTableStorage/NotNullAttribute.cs
new file mode 100644
index 0000000..39188fe
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage/NotNullAttribute.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace NLog.Extensions.AzureTableStorage
+{
+    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
+    internal sealed class NotNullAttribute : Attribute
+    {
+    }
+}
diff --git a/NLog.Extensions.AzureTableStorage/Properties/AssemblyInfo.cs b/NLog.Extensions.AzureTableStorage/Properties/AssemblyInfo.cs
index 46edf5a..c244197 100644
--- a/NLog.Extensions.AzureTableStorage/Properties/AssemblyInfo.cs
+++ b/NLog.Extensions.AzureTableStorage/Properties/AssemblyInfo.cs
@@ -1,38 +1,23 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Resources;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("NLog.Extensions.AzureTableStorage")]
-[assembly: AssemblyDescription("Azure Table Storage Target for NLog")]
+[assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("harouny")]
+[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("NLog.Extensions.AzureTableStorage")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("5f9b332d-1edb-4e18-bc2f-e1d5b5fbd76b")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.4")]
-[assembly: AssemblyFileVersion("1.0.0.4")]
-[assembly: NeutralResourcesLanguageAttribute("en")]
+[assembly: Guid("f27f5aca-07bd-486d-818c-cc5b26d3446b")]
diff --git a/NLog.Extensions.AzureTableStorage/TableStorageManager.cs b/NLog.Extensions.AzureTableStorage/TableStorageManager.cs
index 56a1ac1..f9223de 100644
--- a/NLog.Extensions.AzureTableStorage/TableStorageManager.cs
+++ b/NLog.Extensions.AzureTableStorage/TableStorageManager.cs
@@ -13,13 +13,13 @@ public TableStorageManager(ConfigManager configManager, string tableName)
             var tableClient = storageAccount.CreateCloudTableClient();
             //create charts table if not exists.
             _cloudTable = tableClient.GetTableReference(tableName);
-            _cloudTable.CreateIfNotExists();
+            _cloudTable.CreateIfNotExistsAsync().Wait();
         }
 
         public void Add(LogEntity entity)
         {
             var insertOperation = TableOperation.Insert(entity);
-            _cloudTable.Execute(insertOperation);
+            _cloudTable.ExecuteAsync(insertOperation).Wait(); ;
         }
     }
 }
diff --git a/NLog.Extensions.AzureTableStorage/app.config b/NLog.Extensions.AzureTableStorage/app.config
deleted file mode 100644
index 64f8844..0000000
--- a/NLog.Extensions.AzureTableStorage/app.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/NLog.Extensions.AzureTableStorage/packages.config b/NLog.Extensions.AzureTableStorage/packages.config
deleted file mode 100644
index 5c54981..0000000
--- a/NLog.Extensions.AzureTableStorage/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
-  <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
-  <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
-  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.1.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
-  <package id="NLog" version="3.2.0.0" targetFramework="net45" />
-  <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/NLog.Extensions.AzureTableStorage/project.json b/NLog.Extensions.AzureTableStorage/project.json
new file mode 100644
index 0000000..2ab52b1
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage/project.json
@@ -0,0 +1,27 @@
+{
+  "version": "1.0.0-*",
+  "description": "NLog.Extensions.AzureTableStorage Class Library",
+  "authors": [ "greenliff.com" ],
+  "tags": [ "" ],
+  "projectUrl": "",
+  "licenseUrl": "",
+
+  "dependencies": {
+    "Microsoft.Data.Edm": "5.6.2",
+    "Microsoft.Data.OData": "5.6.2",
+    "Microsoft.Data.Services.Client": "5.6.2",
+    "Microsoft.Framework.Configuration": "1.0.0-beta8",
+    "Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
+    "Microsoft.WindowsAzure.ConfigurationManager": "3.1.0",
+    "Microsoft.Extensions.NotNullAttribute.Sources": "1.0.0-rc1-15718", 
+    "Microsoft.Framework.DependencyInjection": "1.0.0-beta8",
+    "Newtonsoft.Json": "7.0.1",
+    "NLog": "4.2.1",
+    "System.Spatial": "5.6.2",
+    "WindowsAzure.Storage": "6.1.1-preview"
+  },
+
+  "frameworks": {
+    "dnx451": { }
+  }
+}
diff --git a/NLog.Extensions.sln b/NLog.Extensions.sln
deleted file mode 100644
index 5a1f985..0000000
--- a/NLog.Extensions.sln
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLog.Extensions.AzureTableStorage", "NLog.Extensions.AzureTableStorage\NLog.Extensions.AzureTableStorage.csproj", "{69B79032-F3C0-4087-B14E-54E7E91FC4A0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLog.Extensions.AzureTableStorage.Tests", "NLog.Extensions.AzureTableStorage.Tests\NLog.Extensions.AzureTableStorage.Tests.csproj", "{FFF58919-9BC6-4FFA-B0B4-2197F468813D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{576BC019-896A-4287-9399-76FB1DEE0C2C}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{69B79032-F3C0-4087-B14E-54E7E91FC4A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69B79032-F3C0-4087-B14E-54E7E91FC4A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69B79032-F3C0-4087-B14E-54E7E91FC4A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69B79032-F3C0-4087-B14E-54E7E91FC4A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FFF58919-9BC6-4FFA-B0B4-2197F468813D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FFF58919-9BC6-4FFA-B0B4-2197F468813D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FFF58919-9BC6-4FFA-B0B4-2197F468813D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FFF58919-9BC6-4FFA-B0B4-2197F468813D}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/NuGet.Config b/NuGet.Config
new file mode 100644
index 0000000..95143bd
--- /dev/null
+++ b/NuGet.Config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+</configuration>
diff --git a/README.md b/README.md
index dd18a31..3d5b0af 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,26 @@
-NLog Azure Table Storage Target 
-===============================
+NLog Azure Table Storage Target updated by Greenliff
+====================================================
 
 Azure Table Storage Target for NLog
 
 For more info about NLog targets and how to use it, refer to <a href="https://github.com/nlog/NLog/wiki/How%20to%20write%20a%20Target">How To Write a Target</a>
 
-Download
-==========
-Download package from <a href="https://www.nuget.org/packages/AzureTableStorageNLogTarget/">Nuget</a>
+Original source
+===============
+Based on the source available at <a href="https://github.com/harouny/NLog.Extensions.AzureTableStorage">Github</a>
+
+Modifications
+=============
+- Support for ASP.NET 5 Beta8
+- Support for NLog 4.2.1
+- Support for WindowsAzure.Storage 6.1.1-preview
+- Note that the latest available package Microsoft.WindowsAzure.ConfigurationManager 3.1.0 does not support DNX Core 5.0
+- app.config has been replaced with appsettings.json, see Startup.cs in project NLog.Extensions.AzureTableStorage.EmptyApplication and AzureTableStorageTargetTests.cs in project NLog.Extensions.AzureTableStorage.Tests
 
 How to use
 ==========
-- Download package from <a href="https://www.nuget.org/packages/AzureTableStorageNLogTarget/">Nuget</a>.
+- There is currently no Nuget package for download available. Add the project NLog.Extensions.AzureTableStorage to your solution. Add the following dependency to your project.json file: "NLog.Extensions.AzureTableStorage": ""
+- Configure your application for logging (appsettings.json, NLog.config, create logger). See sample code in Startup.cs of included project NLog.Extensions.AzureTableStorage.EmptyApplication 
 - If you didn't setup Azure storage connection string yet, follow instructions in <a href="http://msdn.microsoft.com/en-us/library/azure/ee758697.aspx">Setup a storage connection string</a>.
 - Open NLog configurations file ex: ```NLog.config``` and add the following lines:
 - Add ```NLog.Extensions.AzureTableStorage``` assemply to ```extensions``` section:
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..0c71551
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "projects": [ "src", "test" ],
+  "sdk": {
+    "version": "1.0.0-beta8"
+  }
+}

From a48c22fa5e3367d24515c6a296f9c107a0e48dfe Mon Sep 17 00:00:00 2001
From: ihirt <ihirt@greenliff.com>
Date: Tue, 24 Nov 2015 17:48:48 +0100
Subject: [PATCH 2/4] update project.json files

---
 NLog.Extensions.AzureTableStorage.EmptyApplication/project.json | 1 +
 NLog.Extensions.AzureTableStorage.Tests/project.json            | 1 -
 NLog.Extensions.AzureTableStorage/project.json                  | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/NLog.Extensions.AzureTableStorage.EmptyApplication/project.json b/NLog.Extensions.AzureTableStorage.EmptyApplication/project.json
index 61a9477..89d48d7 100644
--- a/NLog.Extensions.AzureTableStorage.EmptyApplication/project.json
+++ b/NLog.Extensions.AzureTableStorage.EmptyApplication/project.json
@@ -1,5 +1,6 @@
 {
   "version": "1.0.0-*",
+  "authors": [ "greenliff.com" ],
 
   "tooling": {
     "defaultNamespace": "NLog.Extensions.AzureTableStorage.EmptyApplication"
diff --git a/NLog.Extensions.AzureTableStorage.Tests/project.json b/NLog.Extensions.AzureTableStorage.Tests/project.json
index 85e82a1..bb7843d 100644
--- a/NLog.Extensions.AzureTableStorage.Tests/project.json
+++ b/NLog.Extensions.AzureTableStorage.Tests/project.json
@@ -1,7 +1,6 @@
 {
   "version": "1.0.0-*",
   "description": "NLog.Extensions.AzureTableStorage.Tests Class Library",
-  "authors": [ "greenliff.com" ],
   "tags": [ "" ],
   "projectUrl": "",
   "licenseUrl": "",
diff --git a/NLog.Extensions.AzureTableStorage/project.json b/NLog.Extensions.AzureTableStorage/project.json
index 2ab52b1..97d2885 100644
--- a/NLog.Extensions.AzureTableStorage/project.json
+++ b/NLog.Extensions.AzureTableStorage/project.json
@@ -1,7 +1,6 @@
 {
   "version": "1.0.0-*",
   "description": "NLog.Extensions.AzureTableStorage Class Library",
-  "authors": [ "greenliff.com" ],
   "tags": [ "" ],
   "projectUrl": "",
   "licenseUrl": "",

From a4033a95ac1d3f9cb779eea4cb9833bfdca59469 Mon Sep 17 00:00:00 2001
From: ihirt <ihirt@greenliff.com>
Date: Wed, 25 Nov 2015 16:05:50 +0100
Subject: [PATCH 3/4] Remove dependency
 Microsoft.Extensions.NotNullAttribute.Sources

---
 NLog.Extensions.AzureTableStorage/project.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NLog.Extensions.AzureTableStorage/project.json b/NLog.Extensions.AzureTableStorage/project.json
index 97d2885..dbbee23 100644
--- a/NLog.Extensions.AzureTableStorage/project.json
+++ b/NLog.Extensions.AzureTableStorage/project.json
@@ -12,7 +12,6 @@
     "Microsoft.Framework.Configuration": "1.0.0-beta8",
     "Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
     "Microsoft.WindowsAzure.ConfigurationManager": "3.1.0",
-    "Microsoft.Extensions.NotNullAttribute.Sources": "1.0.0-rc1-15718", 
     "Microsoft.Framework.DependencyInjection": "1.0.0-beta8",
     "Newtonsoft.Json": "7.0.1",
     "NLog": "4.2.1",

From 7be5300cf0a5e76e3c770528291fdd4228181f10 Mon Sep 17 00:00:00 2001
From: ihirt <ihirt@greenliff.com>
Date: Fri, 27 Nov 2015 14:57:21 +0100
Subject: [PATCH 4/4] Update from ASP.NET Beta8 to RC1

---
 .../Properties/launchSettings.json            | 25 +++++++++++++++++++
 .../Startup.cs                                |  9 ++++---
 .../project.json                              | 13 ++++++----
 .../AzureTableStorageTargetTests.cs           |  2 +-
 .../project.json                              |  8 +++---
 .../AtsCoreServiceCollectionExtensions.cs     |  2 +-
 .../project.json                              |  6 ++---
 README.md                                     |  2 +-
 global.json                                   |  2 +-
 9 files changed, 49 insertions(+), 20 deletions(-)
 create mode 100644 NLog.Extensions.AzureTableStorage.EmptyApplication/Properties/launchSettings.json

diff --git a/NLog.Extensions.AzureTableStorage.EmptyApplication/Properties/launchSettings.json b/NLog.Extensions.AzureTableStorage.EmptyApplication/Properties/launchSettings.json
new file mode 100644
index 0000000..da290f9
--- /dev/null
+++ b/NLog.Extensions.AzureTableStorage.EmptyApplication/Properties/launchSettings.json
@@ -0,0 +1,25 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:56012/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "Hosting:Environment": "Development"
+      }
+    },
+    "web": {
+      "commandName": "web",
+      "environmentVariables": {
+        "Hosting:Environment": "Development"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/NLog.Extensions.AzureTableStorage.EmptyApplication/Startup.cs b/NLog.Extensions.AzureTableStorage.EmptyApplication/Startup.cs
index ce8e849..dd71e1a 100644
--- a/NLog.Extensions.AzureTableStorage.EmptyApplication/Startup.cs
+++ b/NLog.Extensions.AzureTableStorage.EmptyApplication/Startup.cs
@@ -4,15 +4,16 @@
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.Dnx.Runtime;
-using Microsoft.Framework.Configuration;
-using Microsoft.Framework.DependencyInjection;
-using Microsoft.Framework.Logging;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.PlatformAbstractions;
 
 namespace NLog.Extensions.AzureTableStorage.EmptyApplication
 {
     public class Startup
     {
-        private Microsoft.Framework.Logging.ILogger _log;
+        private Microsoft.Extensions.Logging.ILogger _log;
         private string logConfigurationFile = string.Empty;
 
         public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv)
diff --git a/NLog.Extensions.AzureTableStorage.EmptyApplication/project.json b/NLog.Extensions.AzureTableStorage.EmptyApplication/project.json
index 89d48d7..b237ada 100644
--- a/NLog.Extensions.AzureTableStorage.EmptyApplication/project.json
+++ b/NLog.Extensions.AzureTableStorage.EmptyApplication/project.json
@@ -7,15 +7,18 @@
   },
 
   "dependencies": {
-    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8",
-    "Microsoft.AspNet.Hosting": "1.0.0-beta8",
-    "Microsoft.Framework.DependencyInjection": "1.0.0-beta8",
-    "Microsoft.Framework.Logging.NLog": "1.0.0-beta8-*",
+    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final-*",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final-*",
+    "Microsoft.AspNet.Hosting": "1.0.0-rc1-final-*",
+    "Microsoft.Dnx.Runtime": "1.0.0-rc1-final-*",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final-*",
+    "Microsoft.Extensions.Logging.NLog": "1.0.0-rc1-final-*",
     "NLog.Extensions.AzureTableStorage": ""
   },
 
   "commands": {
+    "kestrel": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.Kestrel --server.urls http://*:5004",
+    "ef": "EntityFramework.Commands",
     "web": "Microsoft.AspNet.Server.Kestrel"
   },
 
diff --git a/NLog.Extensions.AzureTableStorage.Tests/AzureTableStorageTargetTests.cs b/NLog.Extensions.AzureTableStorage.Tests/AzureTableStorageTargetTests.cs
index 1fb91dd..27ef59e 100644
--- a/NLog.Extensions.AzureTableStorage.Tests/AzureTableStorageTargetTests.cs
+++ b/NLog.Extensions.AzureTableStorage.Tests/AzureTableStorageTargetTests.cs
@@ -1,5 +1,5 @@
 using Microsoft.Azure;
-using Microsoft.Framework.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
diff --git a/NLog.Extensions.AzureTableStorage.Tests/project.json b/NLog.Extensions.AzureTableStorage.Tests/project.json
index bb7843d..b05d314 100644
--- a/NLog.Extensions.AzureTableStorage.Tests/project.json
+++ b/NLog.Extensions.AzureTableStorage.Tests/project.json
@@ -6,11 +6,11 @@
   "licenseUrl": "",
 
   "dependencies": {
-    "Microsoft.Framework.Configuration": "1.0.0-beta8",
-    "Microsoft.Framework.OptionsModel": "1.0.0-beta8-*",
+    "Microsoft.Extensions.Configuration": "1.0.0-rc1-final-*",
+    "Microsoft.Extensions.OptionsModel": "1.0.0-rc1-final-*",
     "NLog.Extensions.AzureTableStorage": "",
-    "xunit": "2.1.0-rc2-build3176",
-    "xunit.runner.dnx": "2.1.0-beta6-build191"
+    "xunit": "2.1.0",
+    "xunit.runner.dnx": "2.1.0-rc1-build204"
   },
 
   "frameworks": {
diff --git a/NLog.Extensions.AzureTableStorage/AtsCoreServiceCollectionExtensions.cs b/NLog.Extensions.AzureTableStorage/AtsCoreServiceCollectionExtensions.cs
index a2460cb..a33ec86 100644
--- a/NLog.Extensions.AzureTableStorage/AtsCoreServiceCollectionExtensions.cs
+++ b/NLog.Extensions.AzureTableStorage/AtsCoreServiceCollectionExtensions.cs
@@ -1,5 +1,5 @@
 using System;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace NLog.Extensions.AzureTableStorage
 {
diff --git a/NLog.Extensions.AzureTableStorage/project.json b/NLog.Extensions.AzureTableStorage/project.json
index dbbee23..9b9543d 100644
--- a/NLog.Extensions.AzureTableStorage/project.json
+++ b/NLog.Extensions.AzureTableStorage/project.json
@@ -9,10 +9,10 @@
     "Microsoft.Data.Edm": "5.6.2",
     "Microsoft.Data.OData": "5.6.2",
     "Microsoft.Data.Services.Client": "5.6.2",
-    "Microsoft.Framework.Configuration": "1.0.0-beta8",
-    "Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
+    "Microsoft.Extensions.Configuration": "1.0.0-rc1-final-*",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final-*",
     "Microsoft.WindowsAzure.ConfigurationManager": "3.1.0",
-    "Microsoft.Framework.DependencyInjection": "1.0.0-beta8",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final-*",
     "Newtonsoft.Json": "7.0.1",
     "NLog": "4.2.1",
     "System.Spatial": "5.6.2",
diff --git a/README.md b/README.md
index 3d5b0af..095063c 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Based on the source available at <a href="https://github.com/harouny/NLog.Extens
 
 Modifications
 =============
-- Support for ASP.NET 5 Beta8
+- Support for ASP.NET 5 RC1
 - Support for NLog 4.2.1
 - Support for WindowsAzure.Storage 6.1.1-preview
 - Note that the latest available package Microsoft.WindowsAzure.ConfigurationManager 3.1.0 does not support DNX Core 5.0
diff --git a/global.json b/global.json
index 0c71551..e4870b2 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "test" ],
   "sdk": {
-    "version": "1.0.0-beta8"
+    "version": "1.0.0-rc1-final"
   }
 }