aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2018-07-13 14:15:40 -0700
committerRob Mensching <rob@firegiant.com>2018-07-13 14:15:40 -0700
commit1c3d51462cc7574b318cba2f30552de50348f803 (patch)
treef69b87250bb1da9102459a85a5e52994be26c15c
parent15de67f41ad006b195ad2c3da4a91783ee244cee (diff)
downloadwix-1c3d51462cc7574b318cba2f30552de50348f803.tar.gz
wix-1c3d51462cc7574b318cba2f30552de50348f803.tar.bz2
wix-1c3d51462cc7574b318cba2f30552de50348f803.zip
Update development dependencies
-rw-r--r--src/wixnative/packages.config4
-rw-r--r--src/wixnative/wixnative.vcxproj18
2 files changed, 11 insertions, 11 deletions
diff --git a/src/wixnative/packages.config b/src/wixnative/packages.config
index 02ee2250..20d71c08 100644
--- a/src/wixnative/packages.config
+++ b/src/wixnative/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.0.41" targetFramework="native" developmentDependency="true" /> 3 <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
4 <package id="WixToolset.DUtil" version="4.0.3" targetFramework="native" /> 4 <package id="WixToolset.DUtil" version="4.0.6" targetFramework="native" />
5</packages> \ No newline at end of file 5</packages> \ No newline at end of file
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj
index 2a4ce3d5..cfec54e4 100644
--- a/src/wixnative/wixnative.vcxproj
+++ b/src/wixnative/wixnative.vcxproj
@@ -2,7 +2,7 @@
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.DUtil.4.0.3\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props')" /> 5 <Import Project="..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" />
6 6
7 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
8 <ProjectConfiguration Include="Debug|Win32"> 8 <ProjectConfiguration Include="Debug|Win32">
@@ -40,6 +40,7 @@
40 </ImportGroup> 40 </ImportGroup>
41 41
42 <ImportGroup Label="Shared"> 42 <ImportGroup Label="Shared">
43 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
43 </ImportGroup> 44 </ImportGroup>
44 45
45 <PropertyGroup> 46 <PropertyGroup>
@@ -54,10 +55,10 @@
54 <ClCompile Include="precomp.cpp"> 55 <ClCompile Include="precomp.cpp">
55 <PrecompiledHeader>Create</PrecompiledHeader> 56 <PrecompiledHeader>Create</PrecompiledHeader>
56 </ClCompile> 57 </ClCompile>
57 <ClCompile Include="enumcab.cpp"/> 58 <ClCompile Include="enumcab.cpp" />
58 <ClCompile Include="extractcab.cpp"/> 59 <ClCompile Include="extractcab.cpp" />
59 <ClCompile Include="resetacls.cpp"/> 60 <ClCompile Include="resetacls.cpp" />
60 <ClCompile Include="smartcab.cpp"/> 61 <ClCompile Include="smartcab.cpp" />
61 </ItemGroup> 62 </ItemGroup>
62 63
63 <ItemGroup> 64 <ItemGroup>
@@ -69,12 +70,11 @@
69 </ItemGroup> 70 </ItemGroup>
70 71
71 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 72 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
72 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets')" />
73 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 73 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
74 <PropertyGroup> 74 <PropertyGroup>
75 <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> 75 <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
76 </PropertyGroup> 76 </PropertyGroup>
77 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props'))" /> 77 <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'))" />
78 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets'))" /> 78 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props'))" />
79 </Target> 79 </Target>
80</Project> 80</Project>