diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 18:47:38 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 21:08:31 +1000 |
commit | dea3a630b6ae10663dd6f7d855541f7f631a2b55 (patch) | |
tree | 47664cb2e475a4f4128b97f49463a28ee7d5c26e /src/Samples | |
parent | e4f1a4310f09e3777d035f35f4b4ca69d69f5083 (diff) | |
download | wix-dea3a630b6ae10663dd6f7d855541f7f631a2b55.tar.gz wix-dea3a630b6ae10663dd6f7d855541f7f631a2b55.tar.bz2 wix-dea3a630b6ae10663dd6f7d855541f7f631a2b55.zip |
Update dependencies.
Run tests before packing and don't build twice.
Diffstat (limited to 'src/Samples')
-rw-r--r-- | src/Samples/bafunctions/bafunctions.vcxproj | 10 | ||||
-rw-r--r-- | src/Samples/bafunctions/packages.config | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 92637507..d35c85c0 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj | |||
@@ -2,9 +2,9 @@ | |||
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 | 3 | ||
4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
5 | <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" /> | 5 | <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" /> |
6 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" /> | 6 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" /> |
7 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" /> | 7 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> |
8 | 8 | ||
9 | <ItemGroup Label="ProjectConfigurations"> | 9 | <ItemGroup Label="ProjectConfigurations"> |
10 | <ProjectConfiguration Include="Debug|Win32"> | 10 | <ProjectConfiguration Include="Debug|Win32"> |
@@ -20,7 +20,7 @@ | |||
20 | <PropertyGroup Label="Globals"> | 20 | <PropertyGroup Label="Globals"> |
21 | <ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid> | 21 | <ProjectGuid>{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}</ProjectGuid> |
22 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 22 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
23 | <PlatformToolset>v141</PlatformToolset> | 23 | <PlatformToolset>v142</PlatformToolset> |
24 | <CharacterSet>Unicode</CharacterSet> | 24 | <CharacterSet>Unicode</CharacterSet> |
25 | <TargetName>BAFunctions</TargetName> | 25 | <TargetName>BAFunctions</TargetName> |
26 | <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile> | 26 | <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile> |
@@ -57,9 +57,9 @@ | |||
57 | <PropertyGroup> | 57 | <PropertyGroup> |
58 | <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> | 58 | <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> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.26\build\WixToolset.BalUtil.props'))" /> | 60 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.31\build\WixToolset.BalUtil.props'))" /> |
61 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" /> | 61 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" /> |
62 | <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'))" /> | 62 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" /> |
63 | <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'))" /> | 63 | <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'))" /> |
64 | </Target> | 64 | </Target> |
65 | </Project> | 65 | </Project> |
diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 7cbb7bbe..65e7225a 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config | |||
@@ -2,6 +2,6 @@ | |||
2 | <packages> | 2 | <packages> |
3 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> | 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> |
4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" /> |
5 | <package id="WixToolset.BalUtil" version="4.0.26" targetFramework="native" /> | 5 | <package id="WixToolset.BalUtil" version="4.0.31" targetFramework="native" /> |
6 | <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" /> | 6 | <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> |
7 | </packages> \ No newline at end of file | 7 | </packages> \ No newline at end of file |