diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index d9c325f..8e6bda8 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -17,8 +17,8 @@
     </PackageReference>
   </ItemGroup>
 
-  <Target Name="SetVersionFromGit" BeforeTargets="BeforeBuild">
-    <Exec Command="git.exe describe --tags --abbrev=0" WorkingDirectory="$(MSBuildProjectDirectory)" ConsoleToMsBuild="true" StandardOutputImportance="Low">
+  <Target Name="SetVersionFromGit" BeforeTargets="BeforeBuild;AssignTargetPaths">
+    <Exec Command="git.exe describe --tags --abbrev=0" WorkingDirectory="$(MSBuildProjectDirectory)" ConsoleToMSBuild="true" StandardOutputImportance="Low">
       <Output TaskParameter="ConsoleOutput" PropertyName="GitTag" />
     </Exec>
 
diff --git a/src/PSDataProtection/PSDataProtection.csproj b/src/PSDataProtection/PSDataProtection.csproj
index 39107dd..fa5333f 100644
--- a/src/PSDataProtection/PSDataProtection.csproj
+++ b/src/PSDataProtection/PSDataProtection.csproj
@@ -25,14 +25,7 @@
     <ModuleManifestName>PSDataProtection.psd1</ModuleManifestName>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Update="$(NameModuleManifest)">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-
-  <Target Name="CreateModuleManifest" AfterTargets="SetVersionFromGit" BeforeTargets="BeforeBuild">
+  <Target Name="CreateModuleManifest" AfterTargets="SetVersionFromGit" BeforeTargets="BeforeBuild;AssignTargetPaths">
     <PropertyGroup>
       <ModuleManifestContent>
 @{
@@ -55,7 +48,7 @@
     <WriteLinesToFile File="$(ModuleManifestName)" Overwrite="true" Lines="$(ModuleManifestContent)" />
   </Target>
 
-  <Target Name="IncludeModuleManifest" AfterTargets="CreateModuleManifest" BeforeTargets="BeforeBuild">
+  <Target Name="IncludeModuleManifest" AfterTargets="CreateModuleManifest" BeforeTargets="BeforeBuild;AssignTargetPaths">
     <ItemGroup>
       <None Include="$(ModuleManifestName)" CopyToOutputDirectory="Always" />
     </ItemGroup>