diff options
author | Bob Arnson <bob@joyofsetup.com> | 2018-08-16 17:39:42 -0400 |
---|---|---|
committer | Bob Arnson <bob@joyofsetup.com> | 2018-08-16 17:39:42 -0400 |
commit | 11f33bf61ebe93b54cf0a9901f118852896a1f88 (patch) | |
tree | 96f995baaa1b76609404aced7a09361263d61399 | |
parent | 2816e91b3d9644e4573d77ec49d8db0d6de35d3c (diff) | |
download | wix-11f33bf61ebe93b54cf0a9901f118852896a1f88.tar.gz wix-11f33bf61ebe93b54cf0a9901f118852896a1f88.tar.bz2 wix-11f33bf61ebe93b54cf0a9901f118852896a1f88.zip |
Update to latest MSBuild NuGet package and Windows 10 SDK for CA
-rw-r--r-- | src/ca/vsca.vcxproj | 1 | ||||
-rw-r--r-- | src/wixlib/packages.config | 2 | ||||
-rw-r--r-- | src/wixlib/vs.wixproj | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/ca/vsca.vcxproj b/src/ca/vsca.vcxproj index c52840bf..f80b7215 100644 --- a/src/ca/vsca.vcxproj +++ b/src/ca/vsca.vcxproj | |||
@@ -24,6 +24,7 @@ | |||
24 | <CharacterSet>Unicode</CharacterSet> | 24 | <CharacterSet>Unicode</CharacterSet> |
25 | <ProjectModuleDefinitionFile>vsca.def</ProjectModuleDefinitionFile> | 25 | <ProjectModuleDefinitionFile>vsca.def</ProjectModuleDefinitionFile> |
26 | <Description>WiX Toolset VS CustomAction</Description> | 26 | <Description>WiX Toolset VS CustomAction</Description> |
27 | <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
27 | </PropertyGroup> | 28 | </PropertyGroup> |
28 | 29 | ||
29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 45e5c7b1..f3d424e1 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/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.MSBuild" version="4.0.0-build-0002" developmentDependency="true" targetFramework="net40" /> | 4 | <package id="WixToolset.MSBuild" version="4.0.0-build-0005" developmentDependency="true" targetFramework="net40" /> |
5 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |
diff --git a/src/wixlib/vs.wixproj b/src/wixlib/vs.wixproj index 3cbd18e2..f283e6ef 100644 --- a/src/wixlib/vs.wixproj +++ b/src/wixlib/vs.wixproj | |||
@@ -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" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0"> | 3 | <Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0"> |
4 | <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0002\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0002\build\WixToolset.MSBuild.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0005\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0005\build\WixToolset.MSBuild.props')" /> |
5 | <Import Project="..\FindLocalWix.props" /> | 5 | <Import Project="..\FindLocalWix.props" /> |
6 | <PropertyGroup> | 6 | <PropertyGroup> |
7 | <ProjectGuid>{14345C9D-8AF8-435A-BB1B-E067CE7EB321}</ProjectGuid> | 7 | <ProjectGuid>{14345C9D-8AF8-435A-BB1B-E067CE7EB321}</ProjectGuid> |
@@ -51,7 +51,7 @@ | |||
51 | <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> | 51 | <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> |
52 | </PropertyGroup> | 52 | </PropertyGroup> |
53 | <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'))" /> | 53 | <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'))" /> |
54 | <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0002\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0002\build\WixToolset.MSBuild.props'))" /> | 54 | <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0005\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0005\build\WixToolset.MSBuild.props'))" /> |
55 | </Target> | 55 | </Target> |
56 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> | 56 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> |
57 | </Project> \ No newline at end of file | 57 | </Project> \ No newline at end of file |