Merge in 'release/2.2' changes

src/SiteExtensions/Directory.Build.props

@@ -1,7 +1,6 @@
 <Project>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
+  <!-- Not including parent is intentional, this build should be isolated -->
   <Import Project="build\sources.props" />
   <Import Project="build\dependencies.props" />
   <Import Project="version.props" />

src/SiteExtensions/Directory.Build.targets

@@ -0,0 +1,5 @@
+<Project>
+
+  <!-- Not including parent is intentional, this build should be isolated -->
+
+</Project>