aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-02-04 21:38:19 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-02-04 22:50:08 -0600
commitc01cfd807219d3ea96ad171cdbe5dd9d4a4aced0 (patch)
tree861d4ec0726786ed6d7058b2387501c347dacfec /src/test
parent4a74136e7bf4d861299accdf3302fdeb6df410f8 (diff)
downloadwix-c01cfd807219d3ea96ad171cdbe5dd9d4a4aced0.tar.gz
wix-c01cfd807219d3ea96ad171cdbe5dd9d4a4aced0.tar.bz2
wix-c01cfd807219d3ea96ad171cdbe5dd9d4a4aced0.zip
Update dependencies.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs2
-rw-r--r--src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs2
-rw-r--r--src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs2
-rw-r--r--src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs2
-rw-r--r--src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs2
-rw-r--r--src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs2
-rw-r--r--src/test/examples/FullFramework2Bundle/Bundle.wxs2
-rw-r--r--src/test/examples/FullFramework4Bundle/Bundle.wxs2
-rw-r--r--src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs2
-rw-r--r--src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs2
-rw-r--r--src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs2
-rw-r--r--src/test/examples/TestEngine/Example.TestEngine.vcxproj8
-rw-r--r--src/test/examples/TestEngine/packages.config4
-rw-r--r--src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs2
14 files changed, 18 insertions, 18 deletions
diff --git a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
index 8c613acc..ba1aefba 100644
--- a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
@@ -6,7 +6,7 @@
6 <bal:WixManagedBootstrapperApplicationHost /> 6 <bal:WixManagedBootstrapperApplicationHost />
7 </BootstrapperApplication> 7 </BootstrapperApplication>
8 <Chain> 8 <Chain>
9 <ExePackage Permanent="yes" DetectCondition="no" SourceFile="runtimes\win-x86\native\wixnative.exe" /> 9 <ExePackage Permanent="yes" DetectCondition="none" SourceFile="runtimes\win-x86\native\wixnative.exe" />
10 </Chain> 10 </Chain>
11 </Bundle> 11 </Bundle>
12</Wix> 12</Wix>
diff --git a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs
index a647945d..91380c69 100644
--- a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs
@@ -7,7 +7,7 @@
7 </BootstrapperApplication> 7 </BootstrapperApplication>
8 <Variable Name="Test1" bal:Overridable="yes" /> 8 <Variable Name="Test1" bal:Overridable="yes" />
9 <Chain> 9 <Chain>
10 <ExePackage Permanent="yes" DetectCondition="no" SourceFile="runtimes\win-x86\native\wixnative.exe" /> 10 <ExePackage Permanent="yes" DetectCondition="none" SourceFile="runtimes\win-x86\native\wixnative.exe" />
11 </Chain> 11 </Chain>
12 </Bundle> 12 </Bundle>
13</Wix> 13</Wix>
diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
index 1ca2e7ae..c17b53ff 100644
--- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
+++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
@@ -6,7 +6,7 @@
6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> 6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
7 </BootstrapperApplication> 7 </BootstrapperApplication>
8 <Chain> 8 <Chain>
9 <ExePackage Permanent="yes" DetectCondition="no" SourceFile="runtimes\win-x86\native\wixnative.exe" /> 9 <ExePackage Permanent="yes" DetectCondition="none" SourceFile="runtimes\win-x86\native\wixnative.exe" />
10 </Chain> 10 </Chain>
11 </Bundle> 11 </Bundle>
12</Wix> 12</Wix>
diff --git a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
index 2bea6d38..7d4c644f 100644
--- a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -10,7 +10,7 @@
10 <bal:WixDotNetCoreBootstrapperApplicationHost /> 10 <bal:WixDotNetCoreBootstrapperApplicationHost />
11 </BootstrapperApplication> 11 </BootstrapperApplication>
12 <Chain> 12 <Chain>
13 <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" /> 13 <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
14 </Chain> 14 </Chain>
15 </Bundle> 15 </Bundle>
16</Wix> 16</Wix>
diff --git a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
index 4e4eb105..e3e04231 100644
--- a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
+++ b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
@@ -5,7 +5,7 @@
5 <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.scd" /> 5 <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.scd" />
6 </BootstrapperApplication> 6 </BootstrapperApplication>
7 <Chain> 7 <Chain>
8 <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" /> 8 <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
9 </Chain> 9 </Chain>
10 </Bundle> 10 </Bundle>
11</Wix> 11</Wix>
diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
index 0bcd7755..f7042d51 100644
--- a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+++ b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -5,7 +5,7 @@
5 <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.trimmedscd" /> 5 <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.trimmedscd" />
6 </BootstrapperApplication> 6 </BootstrapperApplication>
7 <Chain> 7 <Chain>
8 <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" /> 8 <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
9 </Chain> 9 </Chain>
10 </Bundle> 10 </Bundle>
11</Wix> 11</Wix>
diff --git a/src/test/examples/FullFramework2Bundle/Bundle.wxs b/src/test/examples/FullFramework2Bundle/Bundle.wxs
index d0acd0e4..4f065eb0 100644
--- a/src/test/examples/FullFramework2Bundle/Bundle.wxs
+++ b/src/test/examples/FullFramework2Bundle/Bundle.wxs
@@ -8,7 +8,7 @@
8 <bal:WixManagedBootstrapperApplicationHost /> 8 <bal:WixManagedBootstrapperApplicationHost />
9 </BootstrapperApplication> 9 </BootstrapperApplication>
10 <Chain> 10 <Chain>
11 <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" /> 11 <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
12 </Chain> 12 </Chain>
13 </Bundle> 13 </Bundle>
14</Wix> 14</Wix>
diff --git a/src/test/examples/FullFramework4Bundle/Bundle.wxs b/src/test/examples/FullFramework4Bundle/Bundle.wxs
index 8cb5b431..62b27bc1 100644
--- a/src/test/examples/FullFramework4Bundle/Bundle.wxs
+++ b/src/test/examples/FullFramework4Bundle/Bundle.wxs
@@ -8,7 +8,7 @@
8 <bal:WixManagedBootstrapperApplicationHost /> 8 <bal:WixManagedBootstrapperApplicationHost />
9 </BootstrapperApplication> 9 </BootstrapperApplication>
10 <Chain> 10 <Chain>
11 <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" /> 11 <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
12 </Chain> 12 </Chain>
13 </Bundle> 13 </Bundle>
14</Wix> 14</Wix>
diff --git a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
index 72c576b4..2fc603fb 100644
--- a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -10,7 +10,7 @@
10 <bal:WixDotNetCoreBootstrapperApplicationHost /> 10 <bal:WixDotNetCoreBootstrapperApplicationHost />
11 </BootstrapperApplication> 11 </BootstrapperApplication>
12 <Chain> 12 <Chain>
13 <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" /> 13 <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
14 </Chain> 14 </Chain>
15 </Bundle> 15 </Bundle>
16</Wix> 16</Wix>
diff --git a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
index 5aa10f01..da0ae01f 100644
--- a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
+++ b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
@@ -5,7 +5,7 @@
5 <PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" /> 5 <PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" />
6 </BootstrapperApplication> 6 </BootstrapperApplication>
7 <Chain> 7 <Chain>
8 <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" /> 8 <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
9 </Chain> 9 </Chain>
10 </Bundle> 10 </Bundle>
11</Wix> 11</Wix>
diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
index a9cf1ac7..a2110e21 100644
--- a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+++ b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -5,7 +5,7 @@
5 <PayloadGroupRef Id="publish.Example.LatestCoreMBA.trimmedscd" /> 5 <PayloadGroupRef Id="publish.Example.LatestCoreMBA.trimmedscd" />
6 </BootstrapperApplication> 6 </BootstrapperApplication>
7 <Chain> 7 <Chain>
8 <ExePackage SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" /> 8 <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" PerMachine="yes" />
9 </Chain> 9 </Chain>
10 </Bundle> 10 </Bundle>
11</Wix> 11</Wix>
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
index c75c37ef..29865fee 100644
--- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj
+++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
@@ -1,8 +1,8 @@
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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4 <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" /> 4 <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" />
5 <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" /> 5 <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" />
6 <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" /> 6 <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" />
7 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
8 <ProjectConfiguration Include="Debug|ARM64"> 8 <ProjectConfiguration Include="Debug|ARM64">
@@ -76,8 +76,8 @@
76 <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> 76 <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>
77 </PropertyGroup> 77 </PropertyGroup>
78 <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> 78 <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
79 <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props'))" /> 79 <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props'))" />
80 <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props'))" /> 80 <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props'))" />
81 <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" /> 81 <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" />
82 </Target> 82 </Target>
83</Project> \ No newline at end of file 83</Project> \ No newline at end of file
diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config
index 08a0433c..4bf755e6 100644
--- a/src/test/examples/TestEngine/packages.config
+++ b/src/test/examples/TestEngine/packages.config
@@ -1,7 +1,7 @@
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="3.3.37" targetFramework="native" developmentDependency="true" /> 3 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
4 <package id="WixToolset.BootstrapperCore.Native" version="4.0.64" targetFramework="native" /> 4 <package id="WixToolset.BootstrapperCore.Native" version="4.0.75" targetFramework="native" />
5 <package id="WixToolset.BalUtil" version="4.0.46" targetFramework="native" /> 5 <package id="WixToolset.BalUtil" version="4.0.48" targetFramework="native" />
6 <package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" /> 6 <package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" />
7</packages> \ No newline at end of file 7</packages> \ No newline at end of file
diff --git a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
index 266a8ecc..9d5b7c13 100644
--- a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -10,7 +10,7 @@
10 <bal:WixDotNetCoreBootstrapperApplicationHost /> 10 <bal:WixDotNetCoreBootstrapperApplicationHost />
11 </BootstrapperApplication> 11 </BootstrapperApplication>
12 <Chain> 12 <Chain>
13 <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" /> 13 <ExePackage Permanent="yes" SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
14 </Chain> 14 </Chain>
15 </Bundle> 15 </Bundle>
16</Wix> 16</Wix>