diff --git a/.editorconfig b/.editorconfig
index f76c08aa0..f16002aca 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,16 @@
-root=true
+root = true
 
 [*]
+trim_trailing_whitespace = true
+insert_final_newline = true
 indent_style = space
 indent_size = 4
+
+[*.{csproj,json,config,yml}]
+indent_size = 2
+
+[*.sh]
+end_of_line = lf
+
+[*.{cmd, bat}]
+end_of_line = crlf
diff --git a/NuGet.Config b/NuGet.config
similarity index 100%
rename from NuGet.Config
rename to NuGet.config
diff --git a/Serilog.sln b/Serilog.sln
index bb776e9ca..f0986179f 100644
--- a/Serilog.sln
+++ b/Serilog.sln
@@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5
 		appveyor.yml = appveyor.yml
 		Build.ps1 = Build.ps1
 		global.json = global.json
-		NuGet.Config = NuGet.Config
+		NuGet.config = NuGet.config
 		README.md = README.md
 		assets\Serilog.snk = assets\Serilog.snk
 	EndProjectSection
diff --git a/Serilog.sln.DotSettings b/Serilog.sln.DotSettings
index e2434be72..d2969c16e 100644
--- a/Serilog.sln.DotSettings
+++ b/Serilog.sln.DotSettings
@@ -530,6 +530,7 @@ II.2.12 <HandlesEvent />
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	
 	
 	
diff --git a/global.json b/global.json
index a627426d0..7ee23dc6a 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
-    "projects": [ "src", "test" ],
+  "projects": [ "src", "test" ],
   "sdk": {
     "version": "1.0.0-preview1-002702"
   }
diff --git a/src/Serilog/Serilog.xproj b/src/Serilog/Serilog.xproj
index aaf9619ee..865914c3d 100644
--- a/src/Serilog/Serilog.xproj
+++ b/src/Serilog/Serilog.xproj
@@ -4,7 +4,7 @@
     <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)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>803cd13a-d54b-4cec-a55f-e22ae3d93b3c</ProjectGuid>
     <RootNamespace>Serilog</RootNamespace>
diff --git a/src/Serilog/project.json b/src/Serilog/project.json
index 21a8ec03c..e7314f09e 100644
--- a/src/Serilog/project.json
+++ b/src/Serilog/project.json
@@ -1,17 +1,21 @@
 {
   "version": "2.0.0-rc-*",
+
   "description": "Simple .NET logging with fully-structured events",
   "authors": [ "Serilog Contributors" ],
+
   "packOptions": {
     "tags": [ "serilog", "logging", "semantic", "structured" ],
     "projectUrl": "http://serilog.net",
     "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
     "iconUrl": "http://serilog.net/images/serilog-nuget.png"
   },
+
   "buildOptions": {
     "keyFile": "../../assets/Serilog.snk",
     "xmlDoc": true
   },
+
   "frameworks": {
     "net4.5": {
       "buildOptions": {
diff --git a/test/Serilog.Tests/Serilog.Tests.xproj b/test/Serilog.Tests/Serilog.Tests.xproj
index 9e7949e5e..31c6d3031 100644
--- a/test/Serilog.Tests/Serilog.Tests.xproj
+++ b/test/Serilog.Tests/Serilog.Tests.xproj
@@ -4,7 +4,7 @@
     <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)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>3c2d8e01-5580-426a-bdd9-ec59cd98e618</ProjectGuid>
     <RootNamespace>Serilog.Tests</RootNamespace>
@@ -15,4 +15,4 @@
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/Serilog.Tests/project.json b/test/Serilog.Tests/project.json
index dfad77092..3f24cbe51 100644
--- a/test/Serilog.Tests/project.json
+++ b/test/Serilog.Tests/project.json
@@ -1,15 +1,17 @@
 {
-  "version": "2.0.0-rc-*",
   "testRunner": "xunit",
+
   "dependencies": {
     "Serilog": { "target": "project" },
     "TestDummies": { "target": "project" },
     "xunit": "2.1.0",
     "dotnet-test-xunit": "1.0.0-rc2-build10015"
   },
+
   "buildOptions": {
     "keyFile": "../../assets/Serilog.snk"
   },
+
   "frameworks": {
     "net4.5.2": {
       "buildOptions": {
diff --git a/test/TestDummies/project.json b/test/TestDummies/project.json
index 66858cb93..ebcb9bc42 100644
--- a/test/TestDummies/project.json
+++ b/test/TestDummies/project.json
@@ -1,6 +1,4 @@
 {
-  "version": "1.0.0-*",
-
   "buildOptions": {
     "keyFile": "../../assets/Serilog.snk"
   },