diff options
author | Rob Mensching <rob@firegiant.com> | 2018-01-01 23:05:17 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2018-01-01 23:05:17 -0800 |
commit | 3f5a5717ac1ea7232d65122af22ba2a09032486b (patch) | |
tree | e8a8d7f63ddf011e230b0d6611d3b30245e79f01 /src | |
parent | 60d7baefb4e87bf0ddaae58a653faee0be0429f6 (diff) | |
download | wix-3f5a5717ac1ea7232d65122af22ba2a09032486b.tar.gz wix-3f5a5717ac1ea7232d65122af22ba2a09032486b.tar.bz2 wix-3f5a5717ac1ea7232d65122af22ba2a09032486b.zip |
Update to fixes in latest Util.wixext
Diffstat (limited to 'src')
-rw-r--r-- | src/wixlib/netfx.wixproj | 4 | ||||
-rw-r--r-- | src/wixlib/packages.config | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj index 8a734c84..dd33150d 100644 --- a/src/wixlib/netfx.wixproj +++ b/src/wixlib/netfx.wixproj | |||
@@ -45,9 +45,9 @@ | |||
45 | <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> | 45 | <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> |
46 | </PropertyGroup> | 46 | </PropertyGroup> |
47 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets'))" /> | 47 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets'))" /> |
48 | <Error Condition="!Exists('..\..\packages\WixToolset.Util.wixext.4.0.1\build\WixToolset.Util.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Util.wixext.4.0.1\build\WixToolset.Util.wixext.targets'))" /> | ||
49 | <Error Condition="!Exists('..\..\packages\WixToolset.Core.InternalPackage.4.0.64\build\WixToolset.Core.InternalPackage.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Core.InternalPackage.4.0.64\build\WixToolset.Core.InternalPackage.props'))" /> | 48 | <Error Condition="!Exists('..\..\packages\WixToolset.Core.InternalPackage.4.0.64\build\WixToolset.Core.InternalPackage.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Core.InternalPackage.4.0.64\build\WixToolset.Core.InternalPackage.props'))" /> |
49 | <Error Condition="!Exists('..\..\packages\WixToolset.Util.wixext.4.0.3\build\WixToolset.Util.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Util.wixext.4.0.3\build\WixToolset.Util.wixext.targets'))" /> | ||
50 | </Target> | 50 | </Target> |
51 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets')" /> | 51 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets')" /> |
52 | <Import Project="..\..\packages\WixToolset.Util.wixext.4.0.1\build\WixToolset.Util.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Util.wixext.4.0.1\build\WixToolset.Util.wixext.targets')" /> | 52 | <Import Project="..\..\packages\WixToolset.Util.wixext.4.0.3\build\WixToolset.Util.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Util.wixext.4.0.3\build\WixToolset.Util.wixext.targets')" /> |
53 | </Project> \ No newline at end of file | 53 | </Project> \ No newline at end of file |
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index ba130574..c2f8d8f7 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config | |||
@@ -2,5 +2,5 @@ | |||
2 | <packages> | 2 | <packages> |
3 | <package id="Nerdbank.GitVersioning" version="2.1.7" developmentDependency="true" targetFramework="net40" /> | 3 | <package id="Nerdbank.GitVersioning" version="2.1.7" developmentDependency="true" targetFramework="net40" /> |
4 | <package id="WixToolset.Core.InternalPackage" version="4.0.64" targetFramework="net40" developmentDependency="true" /> | 4 | <package id="WixToolset.Core.InternalPackage" version="4.0.64" targetFramework="net40" developmentDependency="true" /> |
5 | <package id="WixToolset.Util.wixext" version="4.0.1" targetFramework="net40" /> | 5 | <package id="WixToolset.Util.wixext" version="4.0.3" targetFramework="net40" /> |
6 | </packages> \ No newline at end of file | 6 | </packages> \ No newline at end of file |