Correctly name NuGet .props file
Rob Mensching committed
Sep 24, 2017 at 15:49 UTC
5d6c31d1f5e0b8a46f41d4f321e878adba156bb2
4 files changed
+2
-3
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
-1
@@ -16,7 +16,6 @@
16
<ItemGroup>
17
<Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" />
18
<Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
19
- <Content Include="redirects\wix.props" CopyToOutputDirectory="PreserveNewest" />
19
<Content Include="wix.targets" CopyToOutputDirectory="PreserveNewest" />
20
<Content Include="wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
21
<Content Include="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.csproj
+1
-1
@@ -20,7 +20,7 @@
20
<Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: $(NuspecBasePath). Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
21
22
<PropertyGroup>
23
- <NuspecProperties>$(NuspecProperties);Version=$(Version)</NuspecProperties>
23
+ <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
24
</PropertyGroup>
25
</Target>
26
</Project>
src/WixToolset.Core.InternalPackage/WixToolset.Core.InternalPackage.nuspec
+1
-1
@@ -11,7 +11,7 @@
11
</metadata>
12
13
<files>
14
- <file src="redirects\wix.props" target="build" />
14
+ <file src="$projectFolder$$id$.props" target="build" />
15
16
<file src="redirects\wix.targets" target="msbuild" />
17
<file src="redirects\wix.ca.targets" target="msbuild" />