diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-27 22:26:16 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-29 14:40:09 -0500 |
commit | 8deeffb615244c62a0c94ea99d01ece88b1caf09 (patch) | |
tree | f28b80cc68fbcbd1a987d101bfdd305cec2a7fea /src/test/BalUtilUnitTest | |
parent | 11fe2c881d182f9caff28bd9ff08c2e4fe513989 (diff) | |
download | wix-8deeffb615244c62a0c94ea99d01ece88b1caf09.tar.gz wix-8deeffb615244c62a0c94ea99d01ece88b1caf09.tar.bz2 wix-8deeffb615244c62a0c94ea99d01ece88b1caf09.zip |
Integrate size_t and OnPlanPackageBegin changes in Burn headers.
Diffstat (limited to 'src/test/BalUtilUnitTest')
-rw-r--r-- | src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj | 20 | ||||
-rw-r--r-- | src/test/BalUtilUnitTest/packages.config | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj index 95d7ed5f..b7bbd77d 100644 --- a/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj +++ b/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj | |||
@@ -3,9 +3,9 @@ | |||
3 | 3 | ||
4 | 4 | ||
5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
6 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" /> | 6 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> |
7 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" /> | 7 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" /> |
8 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" /> | 8 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> |
9 | <ItemGroup Label="ProjectConfigurations"> | 9 | <ItemGroup Label="ProjectConfigurations"> |
10 | <ProjectConfiguration Include="Debug|Win32"> | 10 | <ProjectConfiguration Include="Debug|Win32"> |
11 | <Configuration>Debug</Configuration> | 11 | <Configuration>Debug</Configuration> |
@@ -50,10 +50,10 @@ | |||
50 | <Reference Include="System" /> | 50 | <Reference Include="System" /> |
51 | <Reference Include="System.Core" /> | 51 | <Reference Include="System.Core" /> |
52 | <Reference Include="WixBuildTools.TestSupport"> | 52 | <Reference Include="WixBuildTools.TestSupport"> |
53 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.47\lib\net472\WixBuildTools.TestSupport.dll</HintPath> | 53 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath> |
54 | </Reference> | 54 | </Reference> |
55 | <Reference Include="WixBuildTools.TestSupport.Native"> | 55 | <Reference Include="WixBuildTools.TestSupport.Native"> |
56 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath> | 56 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath> |
57 | </Reference> | 57 | </Reference> |
58 | </ItemGroup> | 58 | </ItemGroup> |
59 | <ItemGroup> | 59 | <ItemGroup> |
@@ -62,14 +62,14 @@ | |||
62 | </ProjectReference> | 62 | </ProjectReference> |
63 | </ItemGroup> | 63 | </ItemGroup> |
64 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 64 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
65 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" /> | 65 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" /> |
66 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 66 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
67 | <PropertyGroup> | 67 | <PropertyGroup> |
68 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | 68 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> |
69 | </PropertyGroup> | 69 | </PropertyGroup> |
70 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props'))" /> | 70 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" /> |
71 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets'))" /> | 71 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" /> |
72 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props'))" /> | 72 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> |
73 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props'))" /> | 73 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> |
74 | </Target> | 74 | </Target> |
75 | </Project> \ No newline at end of file | 75 | </Project> \ No newline at end of file |
diff --git a/src/test/BalUtilUnitTest/packages.config b/src/test/BalUtilUnitTest/packages.config index 49b76211..6d381fbe 100644 --- a/src/test/BalUtilUnitTest/packages.config +++ b/src/test/BalUtilUnitTest/packages.config | |||
@@ -1,10 +1,10 @@ | |||
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 | <packages> | 3 | <packages> |
4 | <package id="WixBuildTools.TestSupport" version="4.0.47" /> | 4 | <package id="WixBuildTools.TestSupport" version="4.0.50" /> |
5 | <package id="WixBuildTools.TestSupport.Native" version="4.0.47" /> | 5 | <package id="WixBuildTools.TestSupport.Native" version="4.0.50" /> |
6 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.132" targetFramework="native" /> | 6 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> |
7 | <package id="WixToolset.DUtil" version="4.0.70" targetFramework="native" /> | 7 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> |
8 | <package id="xunit.abstractions" version="2.0.3" /> | 8 | <package id="xunit.abstractions" version="2.0.3" /> |
9 | <package id="xunit.assert" version="2.4.1" /> | 9 | <package id="xunit.assert" version="2.4.1" /> |
10 | <package id="xunit.core" version="2.4.1" /> | 10 | <package id="xunit.core" version="2.4.1" /> |