diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-28 10:12:27 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 10:12:27 +1000 |
| commit | ca37ac8d6a7a3bab2d5b33216e793760e7455bb9 (patch) | |
| tree | 404f93e6308fb896f1d1cd06d9988c2e4f96acde /src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | |
| parent | 2480d0ad4bf4f0dd841697d6d607bb35a0fd8161 (diff) | |
| parent | 0b9fd5ae84460d943e685b9821473f356a66bd3b (diff) | |
| download | wix-ca37ac8d6a7a3bab2d5b33216e793760e7455bb9.tar.gz wix-ca37ac8d6a7a3bab2d5b33216e793760e7455bb9.tar.bz2 wix-ca37ac8d6a7a3bab2d5b33216e793760e7455bb9.zip | |
Merge pull request #30 from paulomorgado/patch-1
Allow more than one harvested file and files differing by extension
Diffstat (limited to 'src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj')
| -rw-r--r-- | src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj index 3909cc79..333c7c79 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj +++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| @@ -12,6 +12,10 @@ | |||
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <Content Include="TestData\HeatFilePackage\HeatFilePackage.wixproj" CopyToOutputDirectory="PreserveNewest" /> | 13 | <Content Include="TestData\HeatFilePackage\HeatFilePackage.wixproj" CopyToOutputDirectory="PreserveNewest" /> |
| 14 | <Content Include="TestData\HeatFilePackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | 14 | <Content Include="TestData\HeatFilePackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> |
| 15 | <Content Include="TestData\HeatFileMultpleFilesSameFileName\HeatFileMultpleFilesSameFileName.wixproj" CopyToOutputDirectory="PreserveNewest" /> | ||
| 16 | <Content Include="TestData\HeatFileMultpleFilesSameFileName\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 17 | <Content Include="TestData\HeatFileMultpleFilesSameFileName\MyProgram.txt" CopyToOutputDirectory="PreserveNewest" /> | ||
| 18 | <Content Include="TestData\HeatFileMultpleFilesSameFileName\MyProgram.json" CopyToOutputDirectory="PreserveNewest" /> | ||
| 15 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" /> | 19 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" /> |
| 16 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.de-de.wxl" CopyToOutputDirectory="PreserveNewest" /> | 20 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.de-de.wxl" CopyToOutputDirectory="PreserveNewest" /> |
| 17 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | 21 | <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> |