aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-01-17 18:59:49 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-01-17 18:59:49 -0600
commit62936dfa2da25f58423e6188745ae1307bb31a8f (patch)
tree7e9267e80b328f173b7d86246e5e7990390808ea /src
parentdc27031adc7f81a8bd177c890d354c79d3671f32 (diff)
downloadwix-62936dfa2da25f58423e6188745ae1307bb31a8f.tar.gz
wix-62936dfa2da25f58423e6188745ae1307bb31a8f.tar.bz2
wix-62936dfa2da25f58423e6188745ae1307bb31a8f.zip
Document how to update dependencies and use local changes.
Diffstat (limited to 'src')
-rw-r--r--src/TestData/MsiTransactionTests/BundleAv1/BundleA.props3
-rw-r--r--src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj3
-rw-r--r--src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj3
-rw-r--r--src/TestData/MsiTransactionTests/BundleBv1/BundleB.props4
-rw-r--r--src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj4
-rw-r--r--src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj4
-rw-r--r--src/WixToolsetTest.BurnE2E/PrereqBaTests.cs4
-rw-r--r--src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs2
8 files changed, 17 insertions, 10 deletions
diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
index dd824926..f831fb29 100644
--- a/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
+++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
@@ -9,7 +9,4 @@
9 <ItemGroup> 9 <ItemGroup>
10 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> 10 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
11 </ItemGroup> 11 </ItemGroup>
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
14 </ItemGroup>
15</Project> 12</Project>
diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
index 607c4ce6..3a1f603f 100644
--- a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
@@ -6,4 +6,7 @@
6 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> 6 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
7 <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> 7 <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
8 </ItemGroup> 8 </ItemGroup>
9 <ItemGroup>
10 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
11 </ItemGroup>
9</Project> \ No newline at end of file 12</Project> \ No newline at end of file
diff --git a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
index 9600f6ba..9aae9347 100644
--- a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
@@ -9,4 +9,7 @@
9 <ProjectReference Include="..\PackageCv2\PackageCv2.wixproj" /> 9 <ProjectReference Include="..\PackageCv2\PackageCv2.wixproj" />
10 <ProjectReference Include="..\PackageD\PackageD.wixproj" /> 10 <ProjectReference Include="..\PackageD\PackageD.wixproj" />
11 </ItemGroup> 11 </ItemGroup>
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
14 </ItemGroup>
12</Project> \ No newline at end of file 15</Project> \ No newline at end of file
diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props
index e9367d44..87b402e4 100644
--- a/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props
+++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props
@@ -10,8 +10,4 @@
10 <ItemGroup> 10 <ItemGroup>
11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> 11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
12 </ItemGroup> 12 </ItemGroup>
13 <ItemGroup>
14 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
15 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.57" />
16 </ItemGroup>
17</Project> 13</Project>
diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
index 508e25ee..0e145bd3 100644
--- a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
@@ -4,4 +4,8 @@
4 <ItemGroup> 4 <ItemGroup>
5 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> 5 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
6 </ItemGroup> 6 </ItemGroup>
7 <ItemGroup>
8 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
9 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.57" />
10 </ItemGroup>
7</Project> \ No newline at end of file 11</Project> \ No newline at end of file
diff --git a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
index b84052d5..ed010a7b 100644
--- a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
@@ -11,4 +11,8 @@
11 <ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" /> 11 <ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" />
12 <ProjectReference Include="..\PackageF\PackageF.wixproj" /> 12 <ProjectReference Include="..\PackageF\PackageF.wixproj" />
13 </ItemGroup> 13 </ItemGroup>
14 <ItemGroup>
15 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
16 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.57" />
17 </ItemGroup>
14</Project> \ No newline at end of file 18</Project> \ No newline at end of file
diff --git a/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
index ced2e08e..b07b3aec 100644
--- a/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
+++ b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
@@ -18,7 +18,7 @@ namespace WixToolsetTest.BurnE2E
18 /// The preqba doesn't infinitely reload itself after failing to load the managed BA. 18 /// The preqba doesn't infinitely reload itself after failing to load the managed BA.
19 /// The engine automatically uninstalls the bundle since only permanent packages were installed. 19 /// The engine automatically uninstalls the bundle since only permanent packages were installed.
20 /// </summary> 20 /// </summary>
21 [Fact] 21 [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")]
22 public void DncPreqBaDetectsInfiniteLoop() 22 public void DncPreqBaDetectsInfiniteLoop()
23 { 23 {
24 var packageA = this.CreatePackageInstaller("PackageA"); 24 var packageA = this.CreatePackageInstaller("PackageA");
@@ -49,7 +49,7 @@ namespace WixToolsetTest.BurnE2E
49 /// The preqba doesn't infinitely reload itself after failing to load the managed BA. 49 /// The preqba doesn't infinitely reload itself after failing to load the managed BA.
50 /// The engine automatically uninstalls the bundle since only permanent packages were installed. 50 /// The engine automatically uninstalls the bundle since only permanent packages were installed.
51 /// </summary> 51 /// </summary>
52 [Fact] 52 [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")]
53 public void MbaPreqBaDetectsInfiniteLoop() 53 public void MbaPreqBaDetectsInfiniteLoop()
54 { 54 {
55 var packageB = this.CreatePackageInstaller("PackageB"); 55 var packageB = this.CreatePackageInstaller("PackageB");
diff --git a/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs b/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs
index effe4418..6539db34 100644
--- a/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs
+++ b/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs
@@ -22,7 +22,7 @@ namespace WixToolsetTest.BurnE2E
22 /// install package B 22 /// install package B
23 /// unregister since no non-permanent packages should be installed or cached. 23 /// unregister since no non-permanent packages should be installed or cached.
24 /// </summary> 24 /// </summary>
25 [Fact] 25 [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6309")]
26 public void NonVitalRollbackBoundarySkipsToNextRollbackBoundary() 26 public void NonVitalRollbackBoundarySkipsToNextRollbackBoundary()
27 { 27 {
28 var packageA = this.CreatePackageInstaller("PackageA"); 28 var packageA = this.CreatePackageInstaller("PackageA");