diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-18 21:44:23 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-18 21:48:44 +1000 |
| commit | e39bb78e89148ef1635085c58cc348c1291d4439 (patch) | |
| tree | 27c2fb33bab999bda3043a84ea3f6b219cdd126e | |
| parent | 420b3029645bf7ed19458654b701157b03499350 (diff) | |
| download | wix-e39bb78e89148ef1635085c58cc348c1291d4439.tar.gz wix-e39bb78e89148ef1635085c58cc348c1291d4439.tar.bz2 wix-e39bb78e89148ef1635085c58cc348c1291d4439.zip | |
Fail build on each command.
| -rw-r--r-- | appveyor.cmd | 24 | ||||
| -rw-r--r-- | src/wcautil/packages.config | 2 | ||||
| -rw-r--r-- | src/wcautil/wcautil.vcxproj | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/appveyor.cmd b/appveyor.cmd index fde7f34f..c1d4dbfe 100644 --- a/appveyor.cmd +++ b/appveyor.cmd | |||
| @@ -1,22 +1,22 @@ | |||
| 1 | @setlocal | 1 | @setlocal |
| 2 | @pushd %~dp0 | 2 | @pushd %~dp0 |
| 3 | 3 | ||
| 4 | nuget restore | 4 | nuget restore || exit /b |
| 5 | 5 | ||
| 6 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140 | 6 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v140 || exit /b |
| 7 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140 | 7 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140 || exit /b |
| 8 | 8 | ||
| 9 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141 | 9 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141 || exit /b |
| 10 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141 | 10 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141 || exit /b |
| 11 | msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141 | 11 | msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141 || exit /b |
| 12 | msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141 | 12 | msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141 || exit /b |
| 13 | 13 | ||
| 14 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v142 | 14 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v142 || exit /b |
| 15 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v142 | 15 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v142 || exit /b |
| 16 | msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v142 | 16 | msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v142 || exit /b |
| 17 | msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142 | 17 | msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142 || exit /b |
| 18 | 18 | ||
| 19 | msbuild -p:Configuration=Release -t:PackNativeNuget src\wcautil\wcautil.vcxproj | 19 | msbuild -p:Configuration=Release -t:PackNativeNuget src\wcautil\wcautil.vcxproj || exit /b |
| 20 | 20 | ||
| 21 | @popd | 21 | @popd |
| 22 | @endlocal \ No newline at end of file | 22 | @endlocal \ No newline at end of file |
diff --git a/src/wcautil/packages.config b/src/wcautil/packages.config index 0b643acb..adda87b9 100644 --- a/src/wcautil/packages.config +++ b/src/wcautil/packages.config | |||
| @@ -1,5 +1,5 @@ | |||
| 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="2.1.65" developmentDependency="true" targetFramework="net40" /> | 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> |
| 4 | <package id="WixToolset.DUtil" version="4.0.20" targetFramework="native" /> | 4 | <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" /> |
| 5 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |
diff --git a/src/wcautil/wcautil.vcxproj b/src/wcautil/wcautil.vcxproj index a31994ab..2d027540 100644 --- a/src/wcautil/wcautil.vcxproj +++ b/src/wcautil/wcautil.vcxproj | |||
| @@ -1,7 +1,7 @@ | |||
| 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.20\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.20\build\WixToolset.DUtil.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" /> |
| 5 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 6 | <ProjectConfiguration Include="Debug|ARM"> | 6 | <ProjectConfiguration Include="Debug|ARM"> |
| 7 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -98,6 +98,6 @@ | |||
| 98 | <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> | 98 | <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> |
| 99 | </PropertyGroup> | 99 | </PropertyGroup> |
| 100 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> | 100 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> |
| 101 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.20\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.20\build\WixToolset.DUtil.props'))" /> | 101 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props'))" /> |
| 102 | </Target> | 102 | </Target> |
| 103 | </Project> \ No newline at end of file | 103 | </Project> \ No newline at end of file |
