diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-12-22 14:19:16 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-12-22 14:19:16 -0800 |
| commit | 758bcf4bb6d61dd9d6471d9f9629d4f7b18d43cb (patch) | |
| tree | ca0e3cf7db12ccedc033a6c4ea60e91b404b6bb4 /src | |
| parent | ee8bb3f35024c3567ffe590d4492198f53b61bb1 (diff) | |
| download | wix-758bcf4bb6d61dd9d6471d9f9629d4f7b18d43cb.tar.gz wix-758bcf4bb6d61dd9d6471d9f9629d4f7b18d43cb.tar.bz2 wix-758bcf4bb6d61dd9d6471d9f9629d4f7b18d43cb.zip | |
Fix the dependencies of the WixToolset.Core.TestPackage.nupkg
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj | 9 | ||||
| -rw-r--r-- | src/WixToolset.Core/WixToolset.Core.csproj | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj b/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj index a40cea9c..5fb5a3bf 100644 --- a/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj +++ b/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj | |||
| @@ -22,6 +22,15 @@ | |||
| 22 | <_PackageFiles Include="$(OutputPath)\WixToolset.Core.WindowsInstaller.dll" BuildAction="None" PackagePath="lib\$(TargetFramework)\" /> | 22 | <_PackageFiles Include="$(OutputPath)\WixToolset.Core.WindowsInstaller.dll" BuildAction="None" PackagePath="lib\$(TargetFramework)\" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | 24 | ||
| 25 | <!-- | ||
| 26 | These package references duplicate the dependencies in WixToolset.Core.csproj to ensure | ||
| 27 | WixToolset.Core.dll's dependencies are referenced by this test .nupkg. | ||
| 28 | --> | ||
| 29 | <ItemGroup> | ||
| 30 | <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" /> | ||
| 31 | <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" /> | ||
| 32 | </ItemGroup> | ||
| 33 | |||
| 25 | <ItemGroup> | 34 | <ItemGroup> |
| 26 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | 35 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> |
| 27 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> | 36 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> |
diff --git a/src/WixToolset.Core/WixToolset.Core.csproj b/src/WixToolset.Core/WixToolset.Core.csproj index 32a77c5a..22063606 100644 --- a/src/WixToolset.Core/WixToolset.Core.csproj +++ b/src/WixToolset.Core/WixToolset.Core.csproj | |||
| @@ -16,6 +16,10 @@ | |||
| 16 | <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" /> | 16 | <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | 18 | ||
| 19 | <!-- | ||
| 20 | These package references are duplicated in WixToolset.Core.TestPackage.csproj. If | ||
| 21 | you update these here, be sure to update them there. | ||
| 22 | --> | ||
| 19 | <ItemGroup> | 23 | <ItemGroup> |
| 20 | <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" /> | 24 | <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" /> |
| 21 | <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" /> | 25 | <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" /> |