aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-06-22 14:34:24 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-06-22 14:39:10 +1000
commite4f1a4310f09e3777d035f35f4b4ca69d69f5083 (patch)
tree844df1d2d8f7815ca3fca3752a704877ad62869f /src/wixlib
parent75ec7925bb5276c21c1b948f2162c8afcd47e699 (diff)
downloadwix-e4f1a4310f09e3777d035f35f4b4ca69d69f5083.tar.gz
wix-e4f1a4310f09e3777d035f35f4b4ca69d69f5083.tar.bz2
wix-e4f1a4310f09e3777d035f35f4b4ca69d69f5083.zip
Update dependencies.
Diffstat (limited to 'src/wixlib')
-rw-r--r--src/wixlib/bal.wixproj4
-rw-r--r--src/wixlib/packages.config2
-rw-r--r--src/wixlib/wixstdba.wxs58
3 files changed, 32 insertions, 32 deletions
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index 45ca7f88..ae8559d5 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-0126\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props')" /> 4 <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\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>
@@ -57,7 +57,7 @@
57 <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> 57 <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>
58 </PropertyGroup> 58 </PropertyGroup>
59 <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'))" /> 59 <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'))" />
60 <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0126\build\WixToolset.MSBuild.props'))" /> 60 <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0137\build\WixToolset.MSBuild.props'))" />
61 </Target> 61 </Target>
62 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> 62 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
63</Project> 63</Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index 6e79c4c9..8ffe0d58 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-0126" developmentDependency="true" targetFramework="net40" /> 4 <package id="WixToolset.MSBuild" version="4.0.0-build-0137" 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/wixstdba.wxs b/src/wixlib/wixstdba.wxs
index 5c99747d..1b5e1342 100644
--- a/src/wixlib/wixstdba.wxs
+++ b/src/wixlib/wixstdba.wxs
@@ -13,11 +13,11 @@
13 <Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' /> 13 <Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' />
14 </PayloadGroup> 14 </PayloadGroup>
15 15
16 <CustomTable Id='WixStdbaInformation'> 16 <BundleCustomDataRef Id='WixStdbaInformation'>
17 <Row> 17 <BundleElement>
18 <Data Column='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</Data> 18 <BundleAttribute Id='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</BundleAttribute>
19 </Row> 19 </BundleElement>
20 </CustomTable> 20 </BundleCustomDataRef>
21 </Fragment> 21 </Fragment>
22 22
23 <!-- RTF Large License Payload Group --> 23 <!-- RTF Large License Payload Group -->
@@ -30,11 +30,11 @@
30 <Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' /> 30 <Payload Name='!(wix.WixStdbaLicenseRtfName=license.rtf)' Compressed='yes' SourceFile='!(wix.WixStdbaLicenseRtf=LoremIpsumLicense.rtf)' />
31 </PayloadGroup> 31 </PayloadGroup>
32 32
33 <CustomTable Id='WixStdbaInformation'> 33 <BundleCustomDataRef Id='WixStdbaInformation'>
34 <Row> 34 <BundleElement>
35 <Data Column='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</Data> 35 <BundleAttribute Id='LicenseFile'>!(wix.WixStdbaLicenseRtfName=license.rtf)</BundleAttribute>
36 </Row> 36 </BundleElement>
37 </CustomTable> 37 </BundleCustomDataRef>
38 </Fragment> 38 </Fragment>
39 39
40 <!-- Hyperlink License Payload Group --> 40 <!-- Hyperlink License Payload Group -->
@@ -45,11 +45,11 @@
45 <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' /> 45 <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
46 </PayloadGroup> 46 </PayloadGroup>
47 47
48 <CustomTable Id='WixStdbaInformation'> 48 <BundleCustomDataRef Id='WixStdbaInformation'>
49 <Row> 49 <BundleElement>
50 <Data Column='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</Data> 50 <BundleAttribute Id='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</BundleAttribute>
51 </Row> 51 </BundleElement>
52 </CustomTable> 52 </BundleCustomDataRef>
53 </Fragment> 53 </Fragment>
54 54
55 <!-- Hyperlink Large License Payload Group --> 55 <!-- Hyperlink Large License Payload Group -->
@@ -60,11 +60,11 @@
60 <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' /> 60 <Payload Name='logo.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogo=logo.png)' />
61 </PayloadGroup> 61 </PayloadGroup>
62 62
63 <CustomTable Id='WixStdbaInformation'> 63 <BundleCustomDataRef Id='WixStdbaInformation'>
64 <Row> 64 <BundleElement>
65 <Data Column='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</Data> 65 <BundleAttribute Id='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</BundleAttribute>
66 </Row> 66 </BundleElement>
67 </CustomTable> 67 </BundleCustomDataRef>
68 </Fragment> 68 </Fragment>
69 69
70 <!-- HyperlinkSidebar License Payload Group --> 70 <!-- HyperlinkSidebar License Payload Group -->
@@ -76,18 +76,18 @@
76 <Payload Name='logoside.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogoSide=logoside.png)' /> 76 <Payload Name='logoside.png' Compressed='yes' SourceFile='!(wix.WixStdbaLogoSide=logoside.png)' />
77 </PayloadGroup> 77 </PayloadGroup>
78 78
79 <CustomTable Id='WixStdbaInformation'> 79 <BundleCustomDataRef Id='WixStdbaInformation'>
80 <Row> 80 <BundleElement>
81 <Data Column='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</Data> 81 <BundleAttribute Id='LicenseUrl'>!(wix.WixStdbaLicenseUrl)</BundleAttribute>
82 </Row> 82 </BundleElement>
83 </CustomTable> 83 </BundleCustomDataRef>
84 </Fragment> 84 </Fragment>
85 85
86 <!-- BootstrapperApplicationData tables definition --> 86 <!-- BootstrapperApplicationData tables definition -->
87 <Fragment> 87 <Fragment>
88 <CustomTable Id='WixStdbaInformation' Unreal='yes'> 88 <BundleCustomData Id='WixStdbaInformation'>
89 <Column Id='LicenseFile' Category='Text' Type='string' Width='0' Nullable='yes' PrimaryKey='yes' /> 89 <BundleAttributeDefinition Id='LicenseFile' />
90 <Column Id='LicenseUrl' Category='Text' Type='string' Width='0' Nullable='yes' PrimaryKey='yes' /> 90 <BundleAttributeDefinition Id='LicenseUrl' />
91 </CustomTable> 91 </BundleCustomData>
92 </Fragment> 92 </Fragment>
93</Wix> 93</Wix>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-03 13:13:04 +0000