diff --git a/Source/MSBuild.Sdk.Extras/Build/EndOfProjectImports.targets b/Source/MSBuild.Sdk.Extras/Build/EndOfProjectImports.targets
new file mode 100644
index 0000000..3cbab7d
--- /dev/null
+++ b/Source/MSBuild.Sdk.Extras/Build/EndOfProjectImports.targets
@@ -0,0 +1,10 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)Core.props"/>
+  <Import Project="$(MSBuildThisFileDirectory)Core.targets"/>
+
+</Project>
\ No newline at end of file
diff --git a/Source/MSBuild.Sdk.Extras/Build/MSBuild.Sdk.Extras.props b/Source/MSBuild.Sdk.Extras/Build/MSBuild.Sdk.Extras.props
index 6158fa6..d24beb0 100644
--- a/Source/MSBuild.Sdk.Extras/Build/MSBuild.Sdk.Extras.props
+++ b/Source/MSBuild.Sdk.Extras/Build/MSBuild.Sdk.Extras.props
@@ -1,14 +1,13 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)Workarounds.props"/>
-  <Import Project="$(MSBuildThisFileDirectory)Core.props"/>
 
   <PropertyGroup>
-    <MSBuildSdkExtrasTargets>$(MSBuildThisFileDirectory)Core.targets</MSBuildSdkExtrasTargets>
+    <MSBuildSdkExtrasTargets>$(MSBuildThisFileDirectory)EndOfProjectImports.targets</MSBuildSdkExtrasTargets>
   </PropertyGroup>
 
 </Project>
\ No newline at end of file