diff --git a/LoggingExtensions.sln b/LoggingExtensions.sln
index 3d75fe0..288e861 100644
--- a/LoggingExtensions.sln
+++ b/LoggingExtensions.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Kralizek.LoggingExtensions", "src\Kralizek.LoggingExtensions\Kralizek.LoggingExtensions.xproj", "{A51F4C0B-F737-4FEB-98BC-AE60505BA8DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kralizek.LoggingExtensions", "src\Kralizek.LoggingExtensions\Kralizek.LoggingExtensions.csproj", "{A51F4C0B-F737-4FEB-98BC-AE60505BA8DA}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ConsoleAppSample", "sample\ConsoleAppSample\ConsoleAppSample.xproj", "{4893B22D-5C3B-4B61-9169-84002416FE53}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppSample", "sample\ConsoleAppSample\ConsoleAppSample.csproj", "{4893B22D-5C3B-4B61-9169-84002416FE53}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/global.json b/global.json
deleted file mode 100644
index 4e67c5a..0000000
--- a/global.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "projects": [ "src", "tests" ],
-  "sdk": {
-    "version": "1.0.0-preview2-003131"
-  }
-}
-
diff --git a/sample/ConsoleAppSample/ConsoleAppSample.csproj b/sample/ConsoleAppSample/ConsoleAppSample.csproj
new file mode 100644
index 0000000..2fb766a
--- /dev/null
+++ b/sample/ConsoleAppSample/ConsoleAppSample.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AssemblyName>ConsoleAppSample</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <PackageId>ConsoleAppSample</PackageId>
+    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Kralizek.LoggingExtensions\Kralizek.LoggingExtensions.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/sample/ConsoleAppSample/ConsoleAppSample.xproj b/sample/ConsoleAppSample/ConsoleAppSample.xproj
deleted file mode 100644
index 5521b31..0000000
--- a/sample/ConsoleAppSample/ConsoleAppSample.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>4893b22d-5c3b-4b61-9169-84002416fe53</ProjectGuid>
-    <RootNamespace>ConsoleAppSample</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/sample/ConsoleAppSample/project.json b/sample/ConsoleAppSample/project.json
deleted file mode 100644
index ac2d1fa..0000000
--- a/sample/ConsoleAppSample/project.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "emitEntryPoint": true
-  },
-
-  "dependencies": {
-    "Kralizek.LoggingExtensions": "1.0.0-*",
-    "Microsoft.Extensions.Logging": "1.1.0",
-    "Microsoft.Extensions.Logging.Console": "1.1.0", 
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "1.0.1"
-    }
-  },
-
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": "dnxcore50"
-    }
-  }
-}
diff --git a/src/Kralizek.LoggingExtensions/Kralizek.LoggingExtensions.csproj b/src/Kralizek.LoggingExtensions/Kralizek.LoggingExtensions.csproj
new file mode 100644
index 0000000..b79d6f7
--- /dev/null
+++ b/src/Kralizek.LoggingExtensions/Kralizek.LoggingExtensions.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyTitle>LoggingExtensions for .NET Core</AssemblyTitle>
+    <VersionPrefix>1.0.1</VersionPrefix>
+    <Authors>Renato Golia</Authors>
+    <TargetFramework>netstandard1.1</TargetFramework>
+    <AssemblyName>Kralizek.Extensions.Logging</AssemblyName>
+    <PackageId>Kralizek.Extensions.Logging</PackageId>
+    <PackageProjectUrl>https://github.com/Kralizek/LoggingExtensions</PackageProjectUrl>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/Kralizek/LoggingExtensions/master/LICENSE</PackageLicenseUrl>
+    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <DotNetCliToolReference Include="dotnet-version" Version="1.2.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Kralizek.LoggingExtensions/Kralizek.LoggingExtensions.xproj b/src/Kralizek.LoggingExtensions/Kralizek.LoggingExtensions.xproj
deleted file mode 100644
index 4a8f45f..0000000
--- a/src/Kralizek.LoggingExtensions/Kralizek.LoggingExtensions.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>a51f4c0b-f737-4feb-98bc-ae60505ba8da</ProjectGuid>
-    <RootNamespace>Kralizek.LoggingExtensions</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/src/Kralizek.LoggingExtensions/project.json b/src/Kralizek.LoggingExtensions/project.json
deleted file mode 100644
index bfcafc3..0000000
--- a/src/Kralizek.LoggingExtensions/project.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "version": "1.0.1-*",
-  "name": "Kralizek.Extensions.Logging",
-  "title": "LoggingExtensions for .NET Core",
-  "authors": [ "Renato Golia" ],
-
-  "dependencies": {
-    "NETStandard.Library": "1.6.0",
-    "Microsoft.Extensions.Logging.Abstractions": "1.0.1"
-  },
-
-  "frameworks": {
-    "netstandard1.1": {
-      "imports": "dnxcore50"
-    }
-  },
-
-  "tools": {
-    "dotnet-version": "1.2.0"
-  },
-
-  "packOptions": {
-    "owners": [ "Renato Golia" ],
-    "requireLicenseAcceptance": false,
-    "summary": "Provides some utility extension methods to aspnet/Logging ILogger",
-    "licenseUrl": "https://raw.githubusercontent.com/Kralizek/LoggingExtensions/master/LICENSE",
-    "projectUrl": "https://github.com/Kralizek/LoggingExtensions"
-  }
-}