diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-30 18:55:57 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-31 15:11:21 +1000 |
| commit | 05ee2175b44c68816c24a33a16861a637fa15ad7 (patch) | |
| tree | 1558e82360c67ca17fbc4440b773b7d74be5aac1 /src/WixToolset.MSBuild | |
| parent | d57dad051e9c15919646fb9e4fb320003ba839da (diff) | |
| download | wix-05ee2175b44c68816c24a33a16861a637fa15ad7.tar.gz wix-05ee2175b44c68816c24a33a16861a637fa15ad7.tar.bz2 wix-05ee2175b44c68816c24a33a16861a637fa15ad7.zip | |
Update MSBuild tests to use WixToolset.MSBuild.props to find wix.targets.
Diffstat (limited to 'src/WixToolset.MSBuild')
| -rw-r--r-- | src/WixToolset.MSBuild/WixToolset.MSBuild.csproj | 1 | ||||
| -rw-r--r-- | src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec | 2 | ||||
| -rw-r--r-- | src/WixToolset.MSBuild/build/WixToolset.MSBuild.props (renamed from src/WixToolset.MSBuild/WixToolset.MSBuild.props) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj index 2d5ea01b..ba67660c 100644 --- a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj +++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <Content Include="build\$(MSBuildThisFileName).props" CopyToOutputDirectory="PreserveNewest" /> | ||
| 15 | <Content Include="tools\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" /> | 16 | <Content Include="tools\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" /> |
| 16 | <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" /> | 17 | <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" /> |
| 17 | <Content Include="tools\wix.signing.targets" CopyToOutputDirectory="PreserveNewest" /> | 18 | <Content Include="tools\wix.signing.targets" CopyToOutputDirectory="PreserveNewest" /> |
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec index ff0d74ee..be04d21b 100644 --- a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec +++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | </metadata> | 11 | </metadata> |
| 12 | 12 | ||
| 13 | <files> | 13 | <files> |
| 14 | <file src="$projectFolder$$id$.props" target="build" /> | 14 | <file src="build\**\*" target="build" /> |
| 15 | <file src="tools\**\*" target="tools" /> | 15 | <file src="tools\**\*" target="tools" /> |
| 16 | </files> | 16 | </files> |
| 17 | </package> | 17 | </package> |
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.props b/src/WixToolset.MSBuild/build/WixToolset.MSBuild.props index b453361b..b453361b 100644 --- a/src/WixToolset.MSBuild/WixToolset.MSBuild.props +++ b/src/WixToolset.MSBuild/build/WixToolset.MSBuild.props | |||