diff --git a/eng/BeforeTargetFrameworkInference.targets b/eng/BeforeTargetFrameworkInference.targets
new file mode 100644
index 0000000000000..92adb5df63538
--- /dev/null
+++ b/eng/BeforeTargetFrameworkInference.targets
@@ -0,0 +1,23 @@
+
+
+
+ <_OriginalTargetFramework>$(TargetFramework)
+ $(TargetFramework.SubString($([MSBuild]::Add($(TargetFramework.IndexOf('-')), 1))))
+ $(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-'))))
+
+
+
+ $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)'))
+
+
+
+
+
+ $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)'))
+ $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetFramework)-$(Configuration)'))
+
+ $([MSBuild]::NormalizeDirectory('$(BaseOutputPath)', '$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)'))
+ $([MSBuild]::NormalizeDirectory('$(BaseOutputPath)', '$(TargetFramework)-$(Configuration)'))
+
+
+
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 1f9897bd036ab..a86add4cad990 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -12,6 +12,7 @@
+ $(RepositoryEngineeringDir)BeforeTargetFrameworkInference.targets
$(RepoRoot)artifacts\toolset\Common\
$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))
true
@@ -169,8 +170,8 @@
$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', '$(MSBuildProjectName)', 'ref'))
$([MSBuild]::NormalizeDirectory('$(AssemblyBinDirOutputPath)', 'ref'))
-
-
+
+
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index cc509afb3947d..7c2f62de0a78f 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -30,7 +30,6 @@
$(TestStrongNameKeyId)
-
diff --git a/src/libraries/intellisense.targets b/src/libraries/intellisense.targets
deleted file mode 100644
index 18a96aed6ea61..0000000000000
--- a/src/libraries/intellisense.targets
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
- <_UnsupportedTargetFrameworkError>
-
-
-
-
-
-
-
- <_OriginalTargetFramework>$(TargetFramework)
- $(TargetFramework.SubString($([MSBuild]::Add($(TargetFramework.IndexOf('-')), 1))))
- $(TargetFramework.SubString(0, $(TargetFramework.IndexOf('-'))))
-
-
-
- $([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(TargetFramework)'))
-
-
-
-
- <_ShortFrameworkIdentifier>$(TargetFramework.TrimEnd('.0123456789'))
- <_ShortFrameworkVersion>$(TargetFramework.Substring($(_ShortFrameworkIdentifier.Length)))
-
-
-
-
- v$(_ShortFrameworkVersion)
-
-
-
-
- v$(_ShortFrameworkVersion[0]).0
- v$(_ShortFrameworkVersion[0]).$(_ShortFrameworkVersion[1])
- v$(_ShortFrameworkVersion[0]).$(_ShortFrameworkVersion[1]).$(_ShortFrameworkVersion[2])
-
-
-
-
- .NETStandard
- .NETCoreApp
-
-
- .NETFramework
- .NETCoreApp
-
-
-
-
- <_UnsupportedTargetFrameworkError>true
-
-
-
-
-
- $(TargetFrameworkIdentifier),Version=$(TargetFrameworkVersion),Profile=$(TargetFrameworkProfile)
- $(TargetFrameworkIdentifier),Version=$(TargetFrameworkVersion)
-
-
-
-
- $(IntermediateOutputPath)$(MSBuildProjectName).assets.cache
- $([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(ProjectAssetsCacheFile)))
- $(TargetFrameworkMoniker)
-
- $(OutputPath)$(TargetFileName)
- $(OutputPath)
-
-
-
diff --git a/src/libraries/targetframework.props b/src/libraries/targetframeworksuffix.props
similarity index 81%
rename from src/libraries/targetframework.props
rename to src/libraries/targetframeworksuffix.props
index 3ee83b5d4aabf..2f427328fd5fd 100644
--- a/src/libraries/targetframework.props
+++ b/src/libraries/targetframeworksuffix.props
@@ -74,12 +74,4 @@
-
- $(BaseIntermediateOutputPath)$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)\
- $(BaseIntermediateOutputPath)$(TargetFramework)-$(Configuration)\
-
- $(BaseOutputPath)$(TargetFramework)-$(TargetFrameworkSuffix)-$(Configuration)\
- $(BaseOutputPath)$(TargetFramework)-$(Configuration)\
-
-