diff --git a/.editorconfig b/.editorconfig
index 98fd05f5b3..e2566a262e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,28 +1,24 @@
-; EditorConfig to support per-solution formatting.
-; Use the EditorConfig VS add-in to make this work.
-; http://editorconfig.org/
+# EditorConfig is awesome:http://EditorConfig.org
 
-; This is the default for the codeline.
+# top-most EditorConfig file
 root = true
 
 [*]
 indent_style = space
 charset = utf-8
 trim_trailing_whitespace = true
-
-[*.{cs}]
-indent_size = 4
 insert_final_newline = true
 
-; All XML-based file formats
-[*.{config,csproj,nuspec,props,resx,targets,xml}]
-indent_size = 2
-
-[*.{json}]
-indent_size = 2
-
-[*.{ps1}]
+[*.cs]
 indent_size = 4
+dotnet_sort_system_directives_first = true:warning
 
-[*.{sh}]
+# Xml files
+[*.{csproj,config,props,targets,ruleset,config,resx,xml}]
+indent_size = 2
+
+[*.{json, yml}]
+indent_size = 2
+
+[*.{ps1,sh}]
 indent_size = 4
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj b/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj
index ee7f2acb06..193cfa8ac3 100644
--- a/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj
+++ b/src/Microsoft.DotNet.Watcher.Tools/Microsoft.DotNet.Watcher.Tools.csproj
@@ -10,20 +10,17 @@
     <PackageTags>dotnet;watch</PackageTags>
     <PackageType>DotnetCliTool</PackageType>
     <NetCoreAppImplicitPackageVersion>1.0.0</NetCoreAppImplicitPackageVersion>
-    <ContentTargetFolders>toolassets</ContentTargetFolders>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="..\..\shared\**\*.cs" />
     <EmbeddedResource Include="dotnetwatch.targets" LogicalName="dotnetwatch.targets" />
     <None Include="prefercliruntime" Pack="true" PackagePath="\prefercliruntime" />
-    <None Include="toolassets\*.targets" Pack="true" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="toolassets\*.targets" Pack="true" CopyToOutputDirectory="PreserveNewest" PackagePath="%(Identity)" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Process.Sources" Version="1.2.0-*" PrivateAssets="All" />
   </ItemGroup>
 
-  <Import Project="..\workaround.targets" />
-
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
index 468900312f..19f3aa9175 100644
--- a/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
+++ b/src/Microsoft.Extensions.Caching.SqlConfig.Tools/Microsoft.Extensions.Caching.SqlConfig.Tools.csproj
@@ -20,6 +20,4 @@
     <PackageReference Include="System.Data.SqlClient" Version="4.1.0" />
   </ItemGroup>
 
-  <Import Project="..\workaround.targets" />
-
 </Project>
\ No newline at end of file
diff --git a/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj b/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj
index 9730829536..dc050cfa32 100644
--- a/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj
+++ b/src/Microsoft.Extensions.SecretManager.Tools/Microsoft.Extensions.SecretManager.Tools.csproj
@@ -22,6 +22,4 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.0.1" />
   </ItemGroup>
 
-  <Import Project="..\workaround.targets" />
-
 </Project>
\ No newline at end of file
diff --git a/src/workaround.targets b/src/workaround.targets
deleted file mode 100644
index 4068dffd93..0000000000
--- a/src/workaround.targets
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project>
-  <!-- workaround https://github.com/NuGet/Home/issues/4321
-  
-  When fixed, replace with this instead
-  <None Include="$(ProjectRuntimeConfigFilePath)" Pack="true" PackagePath="lib\$(TargetFramework)\" />
-  -->
-  <PropertyGroup>
-    <DefaultItemExcludes>$(DefaultItemExcludes);lib\**\*</DefaultItemExcludes>
-  </PropertyGroup>
-  <Target Name="PackRuntimeConfigurationFile"
-          DependsOnTargets="GenerateBuildRuntimeConfigurationFiles"
-          BeforeTargets="_GetPackageFiles">
-    <Copy SourceFiles="$(ProjectRuntimeConfigFilePath)" DestinationFolder="$(MSBuildProjectDirectory)\lib\netcoreapp1.0\" />
-    <ItemGroup>
-      <_PackageFiles Include="lib\netcoreapp1.0\*.json" BuildAction="None" PackagePath="%(Identity)" />
-    </ItemGroup>
-  </Target>
-  <Target Name="CleanupTempRuntimeConfigurationFile"
-          AfterTargets="Pack">
-    <RemoveDir Directories="$(MSBuildProjectDirectory)\lib\" />
-  </Target>
-  <!-- end workaround -->
-</Project>
\ No newline at end of file