diff --git a/samples/directory.build.props b/samples/directory.build.props
index 6102dcc6..21822ceb 100644
--- a/samples/directory.build.props
+++ b/samples/directory.build.props
@@ -1,3 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Pull in parent Directory.Build.props, if it exists. OneBranch auto-injects into the root. -->
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)../))" Condition="'$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)../))' != ''" />
   <Import Project="$(SolutionDir)test\xdp.test.props" />
 </Project>
diff --git a/src/onebranch/onebranch.vcxproj b/src/onebranch/onebranch.vcxproj
index f8a4b7ff..2a400c26 100644
--- a/src/onebranch/onebranch.vcxproj
+++ b/src/onebranch/onebranch.vcxproj
@@ -26,9 +26,6 @@
   <Target Name="Catalog" Condition="'$(BuildStage)' == 'Catalog'" AfterTargets="Build" >
       <MSBuild Projects="$(SolutionDir)src\xdp\xdp.vcxproj" Targets="Inf2Cat" Properties="EnableInf2Cat=true"/>
   </Target>
-  <Target Name="PackageMsi" Condition="'$(BuildStage)' == 'Package'" AfterTargets="Package" >
-      <MSBuild Projects="$(SolutionDir)src\xdpinstaller\xdpinstaller.wixproj" Targets="Build"/>
-  </Target>
   <ItemGroup Condition="'$(BuildStage)' == 'AllPackage'">
     <ProjectReference Include="$(SolutionDir)src\nuget\nuget.vcxproj">
       <Project>{fbf60d12-183d-42d1-b884-8b9fa4f1273f}</Project>
diff --git a/src/xdpinstaller/xdpinstaller.wixproj b/src/xdpinstaller/xdpinstaller.wixproj
index 222390cf..d2c1e86e 100644
--- a/src/xdpinstaller/xdpinstaller.wixproj
+++ b/src/xdpinstaller/xdpinstaller.wixproj
@@ -36,12 +36,15 @@
   <ItemGroup Condition="'$(BuildStage)' != 'Binary'">
     <Compile Include="product.wxs" />
   </ItemGroup>
+  <!-- OneBranch doesn't build the WiX project, but loading the .props and .targets files during
+       NuGet restore causes unrelated OneBranch errors. Suppress these internally for now.
+       -->
   <ItemGroup>
-    <PackageReference Include="WixToolset.UI.wixext" Version="$(WixVer)" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="$(WixVer)" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="$(WixVer)" Condition="'$(UndockedOfficial)' != 'true'" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="$(WixVer)" Condition="'$(UndockedOfficial)' != 'true'" />
   </ItemGroup>
-  <Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="$(WixVer)" />
-  <Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="$(WixVer)" />
+  <Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="$(WixVer)" Condition="'$(UndockedOfficial)' != 'true'" />
+  <Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="$(WixVer)" Condition="'$(UndockedOfficial)' != 'true'" />
   <Target Name="SignMsi" Condition="'$(BuildStage)' != 'Binary' and '$(SignMode)' != 'Off'" AfterTargets="Build">
     <MSBuild Projects="$(SolutionDir)src\xdpinstaller\xdpinstaller.vcxproj" Targets="SignMsi"/>
   </Target>
diff --git a/test/directory.build.props b/test/directory.build.props
index 6102dcc6..21822ceb 100644
--- a/test/directory.build.props
+++ b/test/directory.build.props
@@ -1,3 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Pull in parent Directory.Build.props, if it exists. OneBranch auto-injects into the root. -->
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)../))" Condition="'$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)../))' != ''" />
   <Import Project="$(SolutionDir)test\xdp.test.props" />
 </Project>