4 files changed, 2 insertions, 3 deletions

diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index ce65ea41..10dce157 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -16,7 +16,6 @@
   <ItemGroup>
     <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="redirects\wix.props" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="wix.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
index 613c6b88..687e8955 100644
--- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
@@ -20,7 +20,7 @@
     <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: $(NuspecBasePath). Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
 
     <PropertyGroup>
-      <NuspecProperties>$(NuspecProperties);Version=$(Version)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
     </PropertyGroup>
   </Target>
 </Project>
diff --git a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
index 5879b7a5..5b81d615 100644
--- a/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
@@ -11,7 +11,7 @@
   </metadata>
 
   <files>
-    <file src="redirects\wix.props" target="build" />
+    <file src="$projectFolder$$id$.props" target="build" />
 
     <file src="redirects\wix.targets" target="msbuild" />
     <file src="redirects\wix.ca.targets" target="msbuild" />
diff --git a/src/WixToolset.BuildTasks/redirects/wix.props b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props
index 7448d192..7448d192 100644
--- a/src/WixToolset.BuildTasks/redirects/wix.props
+++ b/src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.props