@joebigelow / wix / commits / d5925b2b

Run unit tests in the build script.

Sean Hall committed Nov 15, 2020 at 12:38 UTC d5925b2bd8e71933cb88a0d17298088260b5b7db
6 files changed +16 -11
appveyor.cmd
+2
@@ -3,6 +3,8 @@
3
4 nuget restore || exit /b
5
6 +msbuild -t:Test -p:Configuration=Release src\test\DUtilUnitTest || exit /b
7 +
8 msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140 || exit /b
9 msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140 || exit /b
10
appveyor.yml
+2
@@ -21,6 +21,8 @@ environment:
21 build_script:
22 - appveyor.cmd
23
24 +test: off
25 +
26 pull_requests:
27 do_not_increment_build_number: true
28
src/dutil/dutil.vcxproj
+2 -2
@@ -43,7 +43,7 @@
43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
44
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>
48
49 <Import Project="..\NativeMultiTargeting.Build.props" />
@@ -190,6 +190,6 @@
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>
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>
195 </Project>
\ No newline at end of file
src/dutil/packages.config
+1 -1
@@ -1,4 +1,4 @@
1 <?xml version="1.0" encoding="utf-8"?>
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
src/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+6 -6
@@ -3,7 +3,7 @@
3
4
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">
8 <ProjectConfiguration Include="Debug|Win32">
9 <Configuration>Debug</Configuration>
@@ -63,22 +63,22 @@
63 <Reference Include="System" />
64 <Reference Include="System.Core" />
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>
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>
71 </ItemGroup>
72 <ItemGroup>
73 <ProjectReference Include="..\..\dutil\dutil.vcxproj" />
74 </ItemGroup>
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">
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>
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'))" />
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'))" />
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.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>
84 </Project>
\ No newline at end of file
src/test/DUtilUnitTest/packages.config
+3 -2
@@ -6,7 +6,8 @@
6 <package id="xunit.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" />
9 + <package id="xunit.runner.msbuild" 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.Native" version="4.0.40" />
11 + <package id="WixBuildTools.TestSupport" version="4.0.47" />
12 + <package id="WixBuildTools.TestSupport.Native" version="4.0.47" />
13 </packages>
\ No newline at end of file