aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-04-13 20:22:17 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-04-13 20:22:17 +1000
commit0e6972aecab5eeef12f6209949d8a0b67a4b7d2a (patch)
tree59985de8d07d861c3a77cc5de71de0526ec91736
parent18752ee7da742d0219e7b882315e03ad888f5725 (diff)
downloadwix-0e6972aecab5eeef12f6209949d8a0b67a4b7d2a.tar.gz
wix-0e6972aecab5eeef12f6209949d8a0b67a4b7d2a.tar.bz2
wix-0e6972aecab5eeef12f6209949d8a0b67a4b7d2a.zip
Update dependencies.
-rw-r--r--src/Cpp.Build.props16
-rw-r--r--src/wixlib/bal.wixproj4
-rw-r--r--src/wixlib/packages.config2
3 files changed, 3 insertions, 19 deletions
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 864f0fcd..9b7a1bb5 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -11,10 +11,6 @@
11 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> 11 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
12 <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> 12 <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
13 </PropertyGroup> 13 </PropertyGroup>
14
15 <PropertyGroup Condition=" '$(CLRSupport)'=='true' ">
16 <DisableSpecificCompilerWarnings>4564;4691</DisableSpecificCompilerWarnings>
17 </PropertyGroup>
18 14
19 <ItemDefinitionGroup> 15 <ItemDefinitionGroup>
20 <ClCompile> 16 <ClCompile>
@@ -74,12 +70,6 @@
74 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 70 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
75 </ClCompile> 71 </ClCompile>
76 </ItemDefinitionGroup> 72 </ItemDefinitionGroup>
77 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
78 <ClCompile>
79 <BasicRuntimeChecks></BasicRuntimeChecks>
80 <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
81 </ClCompile>
82 </ItemDefinitionGroup>
83 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> 73 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
84 <ClCompile> 74 <ClCompile>
85 <Optimization>MinSpace</Optimization> 75 <Optimization>MinSpace</Optimization>
@@ -93,10 +83,4 @@
93 <OptimizeReferences>true</OptimizeReferences> 83 <OptimizeReferences>true</OptimizeReferences>
94 </Link> 84 </Link>
95 </ItemDefinitionGroup> 85 </ItemDefinitionGroup>
96 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
97 <ClCompile>
98 <BasicRuntimeChecks></BasicRuntimeChecks>
99 <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
100 </ClCompile>
101 </ItemDefinitionGroup>
102</Project> 86</Project>
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index 2e6217cc..51268803 100644
--- a/src/wixlib/bal.wixproj
+++ b/src/wixlib/bal.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-0083\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props')" /> 4 <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" />
5 <Import Project="..\FindLocalWix.props" /> 5 <Import Project="..\FindLocalWix.props" />
6 <PropertyGroup> 6 <PropertyGroup>
7 <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid> 7 <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
@@ -59,7 +59,7 @@
59 <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 <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>
60 </PropertyGroup> 60 </PropertyGroup>
61 <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'))" /> 61 <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'))" />
62 <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props'))" /> 62 <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props'))" />
63 </Target> 63 </Target>
64 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> 64 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
65</Project> 65</Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index d73f4d3a..1e5a9850 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-0083" developmentDependency="true" targetFramework="net40" /> 4 <package id="WixToolset.MSBuild" version="4.0.0-build-0086" developmentDependency="true" targetFramework="net40" />
5</packages> \ No newline at end of file 5</packages> \ No newline at end of file