aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-11-15 12:38:41 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-11-15 12:42:12 -0600
commitd5925b2bd8e71933cb88a0d17298088260b5b7db (patch)
tree9a5f656225b72252574727dc646e3f63bddd8ddd /src
parentc6a94a7f3556c8dc998630aa65b4e812c7898ad1 (diff)
downloadwix-d5925b2bd8e71933cb88a0d17298088260b5b7db.tar.gz
wix-d5925b2bd8e71933cb88a0d17298088260b5b7db.tar.bz2
wix-d5925b2bd8e71933cb88a0d17298088260b5b7db.zip
Run unit tests in the build script.
Diffstat (limited to 'src')
-rw-r--r--src/dutil/dutil.vcxproj4
-rw-r--r--src/dutil/packages.config2
-rw-r--r--src/test/DUtilUnitTest/DUtilUnitTest.vcxproj12
-rw-r--r--src/test/DUtilUnitTest/packages.config5
4 files changed, 12 insertions, 11 deletions
diff --git a/src/dutil/dutil.vcxproj b/src/dutil/dutil.vcxproj
index 017f7a6f..2cf99d13 100644
--- a/src/dutil/dutil.vcxproj
+++ b/src/dutil/dutil.vcxproj
@@ -43,7 +43,7 @@
43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
44 44
45 <ImportGroup Label="Shared"> 45 <ImportGroup Label="Shared">
46 <Import Project="..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" /> 46 <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
47 </ImportGroup> 47 </ImportGroup>
48 48
49 <Import Project="..\NativeMultiTargeting.Build.props" /> 49 <Import Project="..\NativeMultiTargeting.Build.props" />
@@ -190,6 +190,6 @@
190 <PropertyGroup> 190 <PropertyGroup>
191 <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> 191 <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>
192 </PropertyGroup> 192 </PropertyGroup>
193 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets'))" /> 193 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
194 </Target> 194 </Target>
195</Project> \ No newline at end of file 195</Project> \ No newline at end of file
diff --git a/src/dutil/packages.config b/src/dutil/packages.config
index 29fbf9e4..1ffaa8df 100644
--- a/src/dutil/packages.config
+++ b/src/dutil/packages.config
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<packages> 2<packages>
3 <package id="Nerdbank.GitVersioning" version="3.1.91" targetFramework="native" developmentDependency="true" /> 3 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
4</packages> \ No newline at end of file 4</packages> \ No newline at end of file
diff --git a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj
index 31b5a5c0..e1164aca 100644
--- a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+++ b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj
@@ -3,7 +3,7 @@
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\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props')" /> 6 <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 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
8 <ProjectConfiguration Include="Debug|Win32"> 8 <ProjectConfiguration Include="Debug|Win32">
9 <Configuration>Debug</Configuration> 9 <Configuration>Debug</Configuration>
@@ -63,22 +63,22 @@
63 <Reference Include="System" /> 63 <Reference Include="System" />
64 <Reference Include="System.Core" /> 64 <Reference Include="System.Core" />
65 <Reference Include="WixBuildTools.TestSupport"> 65 <Reference Include="WixBuildTools.TestSupport">
66 <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.40\lib\net472\WixBuildTools.TestSupport.dll</HintPath> 66 <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.47\lib\net472\WixBuildTools.TestSupport.dll</HintPath>
67 </Reference> 67 </Reference>
68 <Reference Include="WixBuildTools.TestSupport.Native"> 68 <Reference Include="WixBuildTools.TestSupport.Native">
69 <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath> 69 <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>
70 </Reference> 70 </Reference>
71 </ItemGroup> 71 </ItemGroup>
72 <ItemGroup> 72 <ItemGroup>
73 <ProjectReference Include="..\..\dutil\dutil.vcxproj" /> 73 <ProjectReference Include="..\..\dutil\dutil.vcxproj" />
74 </ItemGroup> 74 </ItemGroup>
75 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 75 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
76 <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.targets')" /> 76 <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')" />
77 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 77 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
78 <PropertyGroup> 78 <PropertyGroup>
79 <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> 79 <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>
80 </PropertyGroup> 80 </PropertyGroup>
81 <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props'))" /> 81 <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'))" />
82 <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.targets'))" /> 82 <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'))" />
83 </Target> 83 </Target>
84</Project> \ No newline at end of file 84</Project> \ No newline at end of file
diff --git a/src/test/DUtilUnitTest/packages.config b/src/test/DUtilUnitTest/packages.config
index 44e5fe06..a4fef2bf 100644
--- a/src/test/DUtilUnitTest/packages.config
+++ b/src/test/DUtilUnitTest/packages.config
@@ -6,7 +6,8 @@
6 <package id="xunit.core" version="2.4.1" /> 6 <package id="xunit.core" version="2.4.1" />
7 <package id="xunit.extensibility.core" version="2.4.1" /> 7 <package id="xunit.extensibility.core" version="2.4.1" />
8 <package id="xunit.extensibility.execution" version="2.4.1" /> 8 <package id="xunit.extensibility.execution" version="2.4.1" />
9 <package id="xunit.runner.msbuild" version="2.4.1" />
9 <package id="xunit.runner.visualstudio" version="2.4.1" /> 10 <package id="xunit.runner.visualstudio" version="2.4.1" />
10 <package id="WixBuildTools.TestSupport" version="4.0.40" /> 11 <package id="WixBuildTools.TestSupport" version="4.0.47" />
11 <package id="WixBuildTools.TestSupport.Native" version="4.0.40" /> 12 <package id="WixBuildTools.TestSupport.Native" version="4.0.47" />
12</packages> \ No newline at end of file 13</packages> \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 19:48:49 +0000