aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-04-13 20:00:13 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-04-13 20:00:13 +1000
commit9b5747e3696cc3f5f21c9a97a686b88af89be3f0 (patch)
treef36f2313c2c8017a723406ddabb2cfd7e9114b92
parent6c8434c834e86a5856a7aa5d70783b996da71c7a (diff)
downloadwix-9b5747e3696cc3f5f21c9a97a686b88af89be3f0.tar.gz
wix-9b5747e3696cc3f5f21c9a97a686b88af89be3f0.tar.bz2
wix-9b5747e3696cc3f5f21c9a97a686b88af89be3f0.zip
Update dependencies.
-rw-r--r--appveyor.yml2
-rw-r--r--src/Cpp.Build.props18
-rw-r--r--src/wixlib/directx.wixproj4
-rw-r--r--src/wixlib/packages.config2
4 files changed, 3 insertions, 23 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 522e5af3..7c686b04 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,8 +33,6 @@ skip_tags: true
33artifacts: 33artifacts:
34- path: build\Release\**\*.nupkg 34- path: build\Release\**\*.nupkg
35 name: nuget 35 name: nuget
36- path: build\Release\**\*.msi
37 name: msi
38 36
39notifications: 37notifications:
40- provider: Slack 38- provider: Slack
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 44a042c7..9b7a1bb5 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -70,12 +70,6 @@
70 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 70 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
71 </ClCompile> 71 </ClCompile>
72 </ItemDefinitionGroup> 72 </ItemDefinitionGroup>
73 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
74 <ClCompile>
75 <BasicRuntimeChecks></BasicRuntimeChecks>
76 <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
77 </ClCompile>
78 </ItemDefinitionGroup>
79 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> 73 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
80 <ClCompile> 74 <ClCompile>
81 <Optimization>MinSpace</Optimization> 75 <Optimization>MinSpace</Optimization>
@@ -89,16 +83,4 @@
89 <OptimizeReferences>true</OptimizeReferences> 83 <OptimizeReferences>true</OptimizeReferences>
90 </Link> 84 </Link>
91 </ItemDefinitionGroup> 85 </ItemDefinitionGroup>
92 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
93 <ClCompile>
94 <BasicRuntimeChecks></BasicRuntimeChecks>
95 <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
96 </ClCompile>
97 </ItemDefinitionGroup>
98 <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
99 <Link>
100 <KeyFile>$(LinkKeyFile)</KeyFile>
101 <DelaySign>$(LinkDelaySign)</DelaySign>
102 </Link>
103 </ItemDefinitionGroup>
104</Project> 86</Project>
diff --git a/src/wixlib/directx.wixproj b/src/wixlib/directx.wixproj
index 70a6b227..7f0c5472 100644
--- a/src/wixlib/directx.wixproj
+++ b/src/wixlib/directx.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-0084\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\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>{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}</ProjectGuid> 7 <ProjectGuid>{4D8DDEC7-AAAC-4A32-87D0-5992FE382ED9}</ProjectGuid>
@@ -34,7 +34,7 @@
34 <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> 34 <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>
35 </PropertyGroup> 35 </PropertyGroup>
36 <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'))" /> 36 <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'))" />
37 <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\build\WixToolset.MSBuild.props'))" /> 37 <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'))" />
38 </Target> 38 </Target>
39 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> 39 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
40</Project> 40</Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index e1b601f6..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-0084" 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