diff --git a/src/NetEvolve.Defaults/build/SupportGeneral.targets b/src/NetEvolve.Defaults/build/SupportGeneral.targets
index 7146ffe..3b6d9b4 100644
--- a/src/NetEvolve.Defaults/build/SupportGeneral.targets
+++ b/src/NetEvolve.Defaults/build/SupportGeneral.targets
@@ -14,8 +14,8 @@
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
   </PropertyGroup>
   <ItemGroup>
-    <None Remove="$(ProjectDir)/*.sarif" />
-    <None Remove="$(ProjectDir)/**/*.sarif" />
-    <None Remove="$(ProjectDir)/TestResults/**" />
+    <None Remove="$(MSBuildProjectDirectory)/*.sarif" />
+    <None Remove="$(MSBuildProjectDirectory)/**/*.sarif" />
+    <None Remove="$(MSBuildProjectDirectory)/TestResults/**" />
   </ItemGroup>
 </Project>
diff --git a/src/NetEvolve.Defaults/build/SupportPackageInformation.targets b/src/NetEvolve.Defaults/build/SupportPackageInformation.targets
index c00c6d5..6272003 100644
--- a/src/NetEvolve.Defaults/build/SupportPackageInformation.targets
+++ b/src/NetEvolve.Defaults/build/SupportPackageInformation.targets
@@ -39,7 +39,7 @@
       Visible="false"
       Condition="Exists(@(_SolutionLicense))"
     />
-    <_ProjectReadme Include="$(ProjectDir)README.md" Condition="Exists('$(ProjectDir)README.md')" />
+    <_ProjectReadme Include="$(MSBuildProjectDirectory)README.md" Condition="Exists('$(MSBuildProjectDirectory)README.md')" />
     <_SolutionReadme
       Include="$(SolutionDir)README.md"
       Condition="@(_ProjectReadme) == '' and Exists('$(SolutionDir)README.md')"
@@ -58,7 +58,7 @@
       Visible="false"
       Condition="'$(DisableReadme)' != 'true' and !Exists(@(_ProjectReadme)) and Exists(@(_SolutionReadme))"
     />
-    <_ProjectLogo Include="$(ProjectDir)logo.png" Condition="Exists('$(ProjectDir)logo.png')" />
+    <_ProjectLogo Include="$(MSBuildProjectDirectory)logo.png" Condition="Exists('$(MSBuildProjectDirectory)logo.png')" />
     <_SolutionLogo
       Include="$(SolutionDir)logo.png"
       Condition="@(_ProjectLogo) == '' and Exists('$(SolutionDir)logo.png')"