From 47724ab546a84e77b4699bc28aa4e4ad7901253f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 1 Jan 2021 21:35:51 -0600 Subject: Try to make it easier to add new kinds of tests. --- .../BasicFunctionality/BundleA/BundleA.wixproj | 12 ------------ src/TestData/BasicFunctionality/BundleA/BundleA.wxi | 21 --------------------- src/TestData/BasicFunctionality/BundleA/BundleA.wxs | 11 ----------- .../BasicFunctionality/PackageA/PackageA.wixproj | 10 ---------- .../BasicFunctionalityTests/BundleA/BundleA.wixproj | 12 ++++++++++++ .../BasicFunctionalityTests/BundleA/BundleA.wxi | 21 +++++++++++++++++++++ .../BasicFunctionalityTests/BundleA/BundleA.wxs | 11 +++++++++++ .../PackageA/PackageA.wixproj | 10 ++++++++++ src/TestData/MsiTransaction/BundleAv1/BundleA.wxi | 21 --------------------- .../MsiTransaction/BundleAv1/BundleAv1.wixproj | 15 --------------- src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs | 14 -------------- .../MsiTransaction/BundleAv2/BundleAv2.wixproj | 16 ---------------- src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs | 14 -------------- src/TestData/MsiTransaction/BundleBv1/BundleB.wxi | 17 ----------------- .../MsiTransaction/BundleBv1/BundleBv1.wixproj | 14 -------------- src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs | 12 ------------ .../MsiTransaction/BundleBv2/BundleBv2.wixproj | 18 ------------------ src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs | 15 --------------- .../MsiTransaction/PackageA/PackageA.wixproj | 10 ---------- .../MsiTransaction/PackageBv1/PackageB.props | 9 --------- .../MsiTransaction/PackageBv1/PackageBv1.wixproj | 7 ------- .../MsiTransaction/PackageBv2/PackageBv2.wixproj | 7 ------- .../MsiTransaction/PackageCv1/PackageC.props | 9 --------- .../MsiTransaction/PackageCv1/PackageCv1.wixproj | 7 ------- .../MsiTransaction/PackageCv2/PackageCv2.wixproj | 7 ------- .../MsiTransaction/PackageD/PackageD.wixproj | 9 --------- .../MsiTransaction/PackageF/PackageF.wixproj | 12 ------------ .../MsiTransactionTests/BundleAv1/BundleA.wxi | 21 +++++++++++++++++++++ .../MsiTransactionTests/BundleAv1/BundleAv1.wixproj | 15 +++++++++++++++ .../MsiTransactionTests/BundleAv1/BundleAv1.wxs | 14 ++++++++++++++ .../MsiTransactionTests/BundleAv2/BundleAv2.wixproj | 16 ++++++++++++++++ .../MsiTransactionTests/BundleAv2/BundleAv2.wxs | 14 ++++++++++++++ .../MsiTransactionTests/BundleBv1/BundleB.wxi | 17 +++++++++++++++++ .../MsiTransactionTests/BundleBv1/BundleBv1.wixproj | 14 ++++++++++++++ .../MsiTransactionTests/BundleBv1/BundleBv1.wxs | 12 ++++++++++++ .../MsiTransactionTests/BundleBv2/BundleBv2.wixproj | 18 ++++++++++++++++++ .../MsiTransactionTests/BundleBv2/BundleBv2.wxs | 15 +++++++++++++++ .../MsiTransactionTests/PackageA/PackageA.wixproj | 10 ++++++++++ .../MsiTransactionTests/PackageBv1/PackageB.props | 9 +++++++++ .../PackageBv1/PackageBv1.wixproj | 7 +++++++ .../PackageBv2/PackageBv2.wixproj | 7 +++++++ .../MsiTransactionTests/PackageCv1/PackageC.props | 9 +++++++++ .../PackageCv1/PackageCv1.wixproj | 7 +++++++ .../PackageCv2/PackageCv2.wixproj | 7 +++++++ .../MsiTransactionTests/PackageD/PackageD.wixproj | 9 +++++++++ .../MsiTransactionTests/PackageF/PackageF.wixproj | 12 ++++++++++++ src/TestData/PrereqBa/BundleA/BundleA.wixproj | 16 ---------------- src/TestData/PrereqBa/BundleA/BundleA.wxi | 17 ----------------- src/TestData/PrereqBa/BundleA/BundleA.wxs | 21 --------------------- .../PrereqBa/BundleA/bad.runtimeconfig.json | 10 ---------- src/TestData/PrereqBa/BundleB/BundleB.wixproj | 16 ---------------- src/TestData/PrereqBa/BundleB/BundleB.wxi | 17 ----------------- src/TestData/PrereqBa/BundleB/BundleB.wxs | 20 -------------------- src/TestData/PrereqBa/BundleB/bad.config | 17 ----------------- src/TestData/PrereqBa/PackageA/PackageA.wixproj | 9 --------- src/TestData/PrereqBa/PackageB/PackageB.wixproj | 9 --------- src/TestData/PrereqBa/PackageF/PackageF.wixproj | 12 ------------ src/TestData/PrereqBaTests/BundleA/BundleA.wixproj | 16 ++++++++++++++++ src/TestData/PrereqBaTests/BundleA/BundleA.wxi | 17 +++++++++++++++++ src/TestData/PrereqBaTests/BundleA/BundleA.wxs | 21 +++++++++++++++++++++ .../PrereqBaTests/BundleA/bad.runtimeconfig.json | 10 ++++++++++ src/TestData/PrereqBaTests/BundleB/BundleB.wixproj | 16 ++++++++++++++++ src/TestData/PrereqBaTests/BundleB/BundleB.wxi | 17 +++++++++++++++++ src/TestData/PrereqBaTests/BundleB/BundleB.wxs | 20 ++++++++++++++++++++ src/TestData/PrereqBaTests/BundleB/bad.config | 17 +++++++++++++++++ .../PrereqBaTests/PackageA/PackageA.wixproj | 9 +++++++++ .../PrereqBaTests/PackageB/PackageB.wixproj | 9 +++++++++ .../PrereqBaTests/PackageF/PackageF.wixproj | 12 ++++++++++++ .../RollbackBoundary/BundleA/BundleA.wixproj | 15 --------------- src/TestData/RollbackBoundary/BundleA/BundleA.wxi | 21 --------------------- src/TestData/RollbackBoundary/BundleA/BundleA.wxs | 16 ---------------- .../RollbackBoundary/PackageA/PackageA.wixproj | 9 --------- .../RollbackBoundary/PackageB/PackageB.wixproj | 9 --------- .../RollbackBoundary/PackageC/PackageC.wixproj | 9 --------- .../RollbackBoundary/PackageF/PackageF.wixproj | 12 ------------ .../RollbackBoundaryTests/BundleA/BundleA.wixproj | 15 +++++++++++++++ .../RollbackBoundaryTests/BundleA/BundleA.wxi | 21 +++++++++++++++++++++ .../RollbackBoundaryTests/BundleA/BundleA.wxs | 16 ++++++++++++++++ .../RollbackBoundaryTests/PackageA/PackageA.wixproj | 9 +++++++++ .../RollbackBoundaryTests/PackageB/PackageB.wixproj | 9 +++++++++ .../RollbackBoundaryTests/PackageC/PackageC.wixproj | 9 +++++++++ .../RollbackBoundaryTests/PackageF/PackageF.wixproj | 12 ++++++++++++ .../TestBA/TestBAWixlib/testbawixlib.wixproj | 4 ++-- src/Wix.Build.props | 2 +- .../BasicFunctionalityTests.cs | 2 +- src/WixToolsetTest.BurnE2E/BurnE2ETests.cs | 2 +- src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs | 2 +- src/WixToolsetTest.BurnE2E/PrereqBaTests.cs | 2 +- src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs | 2 +- src/WixToolsetTest.BurnE2E/WixTestBase.cs | 6 ++---- src/WixToolsetTest.BurnE2E/WixTestContext.cs | 11 +++++++---- 91 files changed, 559 insertions(+), 558 deletions(-) delete mode 100644 src/TestData/BasicFunctionality/BundleA/BundleA.wixproj delete mode 100644 src/TestData/BasicFunctionality/BundleA/BundleA.wxi delete mode 100644 src/TestData/BasicFunctionality/BundleA/BundleA.wxs delete mode 100644 src/TestData/BasicFunctionality/PackageA/PackageA.wixproj create mode 100644 src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj create mode 100644 src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi create mode 100644 src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs create mode 100644 src/TestData/BasicFunctionalityTests/PackageA/PackageA.wixproj delete mode 100644 src/TestData/MsiTransaction/BundleAv1/BundleA.wxi delete mode 100644 src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj delete mode 100644 src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs delete mode 100644 src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj delete mode 100644 src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs delete mode 100644 src/TestData/MsiTransaction/BundleBv1/BundleB.wxi delete mode 100644 src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj delete mode 100644 src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs delete mode 100644 src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj delete mode 100644 src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs delete mode 100644 src/TestData/MsiTransaction/PackageA/PackageA.wixproj delete mode 100644 src/TestData/MsiTransaction/PackageBv1/PackageB.props delete mode 100644 src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj delete mode 100644 src/TestData/MsiTransaction/PackageBv2/PackageBv2.wixproj delete mode 100644 src/TestData/MsiTransaction/PackageCv1/PackageC.props delete mode 100644 src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj delete mode 100644 src/TestData/MsiTransaction/PackageCv2/PackageCv2.wixproj delete mode 100644 src/TestData/MsiTransaction/PackageD/PackageD.wixproj delete mode 100644 src/TestData/MsiTransaction/PackageF/PackageF.wixproj create mode 100644 src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi create mode 100644 src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj create mode 100644 src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs create mode 100644 src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj create mode 100644 src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs create mode 100644 src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi create mode 100644 src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj create mode 100644 src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs create mode 100644 src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj create mode 100644 src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs create mode 100644 src/TestData/MsiTransactionTests/PackageA/PackageA.wixproj create mode 100644 src/TestData/MsiTransactionTests/PackageBv1/PackageB.props create mode 100644 src/TestData/MsiTransactionTests/PackageBv1/PackageBv1.wixproj create mode 100644 src/TestData/MsiTransactionTests/PackageBv2/PackageBv2.wixproj create mode 100644 src/TestData/MsiTransactionTests/PackageCv1/PackageC.props create mode 100644 src/TestData/MsiTransactionTests/PackageCv1/PackageCv1.wixproj create mode 100644 src/TestData/MsiTransactionTests/PackageCv2/PackageCv2.wixproj create mode 100644 src/TestData/MsiTransactionTests/PackageD/PackageD.wixproj create mode 100644 src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj delete mode 100644 src/TestData/PrereqBa/BundleA/BundleA.wixproj delete mode 100644 src/TestData/PrereqBa/BundleA/BundleA.wxi delete mode 100644 src/TestData/PrereqBa/BundleA/BundleA.wxs delete mode 100644 src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json delete mode 100644 src/TestData/PrereqBa/BundleB/BundleB.wixproj delete mode 100644 src/TestData/PrereqBa/BundleB/BundleB.wxi delete mode 100644 src/TestData/PrereqBa/BundleB/BundleB.wxs delete mode 100644 src/TestData/PrereqBa/BundleB/bad.config delete mode 100644 src/TestData/PrereqBa/PackageA/PackageA.wixproj delete mode 100644 src/TestData/PrereqBa/PackageB/PackageB.wixproj delete mode 100644 src/TestData/PrereqBa/PackageF/PackageF.wixproj create mode 100644 src/TestData/PrereqBaTests/BundleA/BundleA.wixproj create mode 100644 src/TestData/PrereqBaTests/BundleA/BundleA.wxi create mode 100644 src/TestData/PrereqBaTests/BundleA/BundleA.wxs create mode 100644 src/TestData/PrereqBaTests/BundleA/bad.runtimeconfig.json create mode 100644 src/TestData/PrereqBaTests/BundleB/BundleB.wixproj create mode 100644 src/TestData/PrereqBaTests/BundleB/BundleB.wxi create mode 100644 src/TestData/PrereqBaTests/BundleB/BundleB.wxs create mode 100644 src/TestData/PrereqBaTests/BundleB/bad.config create mode 100644 src/TestData/PrereqBaTests/PackageA/PackageA.wixproj create mode 100644 src/TestData/PrereqBaTests/PackageB/PackageB.wixproj create mode 100644 src/TestData/PrereqBaTests/PackageF/PackageF.wixproj delete mode 100644 src/TestData/RollbackBoundary/BundleA/BundleA.wixproj delete mode 100644 src/TestData/RollbackBoundary/BundleA/BundleA.wxi delete mode 100644 src/TestData/RollbackBoundary/BundleA/BundleA.wxs delete mode 100644 src/TestData/RollbackBoundary/PackageA/PackageA.wixproj delete mode 100644 src/TestData/RollbackBoundary/PackageB/PackageB.wixproj delete mode 100644 src/TestData/RollbackBoundary/PackageC/PackageC.wixproj delete mode 100644 src/TestData/RollbackBoundary/PackageF/PackageF.wixproj create mode 100644 src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj create mode 100644 src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi create mode 100644 src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs create mode 100644 src/TestData/RollbackBoundaryTests/PackageA/PackageA.wixproj create mode 100644 src/TestData/RollbackBoundaryTests/PackageB/PackageB.wixproj create mode 100644 src/TestData/RollbackBoundaryTests/PackageC/PackageC.wixproj create mode 100644 src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj (limited to 'src') diff --git a/src/TestData/BasicFunctionality/BundleA/BundleA.wixproj b/src/TestData/BasicFunctionality/BundleA/BundleA.wixproj deleted file mode 100644 index 45127b23..00000000 --- a/src/TestData/BasicFunctionality/BundleA/BundleA.wixproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - Bundle - - - - - - - - \ No newline at end of file diff --git a/src/TestData/BasicFunctionality/BundleA/BundleA.wxi b/src/TestData/BasicFunctionality/BundleA/BundleA.wxi deleted file mode 100644 index 0bad694e..00000000 --- a/src/TestData/BasicFunctionality/BundleA/BundleA.wxi +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/TestData/BasicFunctionality/BundleA/BundleA.wxs b/src/TestData/BasicFunctionality/BundleA/BundleA.wxs deleted file mode 100644 index 0506f05a..00000000 --- a/src/TestData/BasicFunctionality/BundleA/BundleA.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/TestData/BasicFunctionality/PackageA/PackageA.wixproj b/src/TestData/BasicFunctionality/PackageA/PackageA.wixproj deleted file mode 100644 index 9943717c..00000000 --- a/src/TestData/BasicFunctionality/PackageA/PackageA.wixproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - a - {7FD50F1B-D134-4365-923C-DFA160F74738} - - - - - \ No newline at end of file diff --git a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj new file mode 100644 index 00000000..45127b23 --- /dev/null +++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj @@ -0,0 +1,12 @@ + + + + Bundle + + + + + + + + \ No newline at end of file diff --git a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi new file mode 100644 index 00000000..0bad694e --- /dev/null +++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs new file mode 100644 index 00000000..0506f05a --- /dev/null +++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/TestData/BasicFunctionalityTests/PackageA/PackageA.wixproj b/src/TestData/BasicFunctionalityTests/PackageA/PackageA.wixproj new file mode 100644 index 00000000..9943717c --- /dev/null +++ b/src/TestData/BasicFunctionalityTests/PackageA/PackageA.wixproj @@ -0,0 +1,10 @@ + + + + a + {7FD50F1B-D134-4365-923C-DFA160F74738} + + + + + \ No newline at end of file diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi b/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi deleted file mode 100644 index ef01c2e9..00000000 --- a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj deleted file mode 100644 index 4e92a102..00000000 --- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - Bundle - 1151 - - - - - - - - - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs deleted file mode 100644 index f8355aa6..00000000 --- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj deleted file mode 100644 index 7d1a42c5..00000000 --- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - Bundle - 1151 - 2.0.0.0 - - - - - - - - - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs deleted file mode 100644 index 11360c22..00000000 --- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi b/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi deleted file mode 100644 index 943b8b48..00000000 --- a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj deleted file mode 100644 index 3cf361d2..00000000 --- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - Bundle - - - - - - - - - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs deleted file mode 100644 index 1a24f53e..00000000 --- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj deleted file mode 100644 index 7162dea2..00000000 --- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - Bundle - 1151 - 2.0.0.0 - - - - - - - - - - - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs deleted file mode 100644 index 33665860..00000000 --- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/TestData/MsiTransaction/PackageA/PackageA.wixproj b/src/TestData/MsiTransaction/PackageA/PackageA.wixproj deleted file mode 100644 index 2ef7c05e..00000000 --- a/src/TestData/MsiTransaction/PackageA/PackageA.wixproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - a - {7772FCDF-5FDB-497D-B5DF-C6D17D667976} - - - - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/PackageBv1/PackageB.props b/src/TestData/MsiTransaction/PackageBv1/PackageB.props deleted file mode 100644 index decdfb6a..00000000 --- a/src/TestData/MsiTransaction/PackageBv1/PackageB.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - {EAFC0C6B-626E-415C-8132-536FBD19F49B} - - - - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj b/src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj deleted file mode 100644 index 6dc1e4d8..00000000 --- a/src/TestData/MsiTransaction/PackageBv1/PackageBv1.wixproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - bv1 - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/PackageBv2/PackageBv2.wixproj b/src/TestData/MsiTransaction/PackageBv2/PackageBv2.wixproj deleted file mode 100644 index 126d0f53..00000000 --- a/src/TestData/MsiTransaction/PackageBv2/PackageBv2.wixproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 2.0.0.0 - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/PackageCv1/PackageC.props b/src/TestData/MsiTransaction/PackageCv1/PackageC.props deleted file mode 100644 index b3d057bd..00000000 --- a/src/TestData/MsiTransaction/PackageCv1/PackageC.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - {A18BDC12-DAEC-43EE-87D1-31B2C2BC6269} - - - - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj b/src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj deleted file mode 100644 index 617e61c3..00000000 --- a/src/TestData/MsiTransaction/PackageCv1/PackageCv1.wixproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - cv1 - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/PackageCv2/PackageCv2.wixproj b/src/TestData/MsiTransaction/PackageCv2/PackageCv2.wixproj deleted file mode 100644 index 640ad21d..00000000 --- a/src/TestData/MsiTransaction/PackageCv2/PackageCv2.wixproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 2.0.0.0 - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/PackageD/PackageD.wixproj b/src/TestData/MsiTransaction/PackageD/PackageD.wixproj deleted file mode 100644 index 1df5da24..00000000 --- a/src/TestData/MsiTransaction/PackageD/PackageD.wixproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - {78B072D5-1C23-4895-9C4C-1B52E3C80621} - - - - - \ No newline at end of file diff --git a/src/TestData/MsiTransaction/PackageF/PackageF.wixproj b/src/TestData/MsiTransaction/PackageF/PackageF.wixproj deleted file mode 100644 index 46def2c5..00000000 --- a/src/TestData/MsiTransaction/PackageF/PackageF.wixproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - {3D59F8F2-8AC5-403E-B6F7-453870DE7063} - - - - - - - - \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi new file mode 100644 index 00000000..ef01c2e9 --- /dev/null +++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj new file mode 100644 index 00000000..4e92a102 --- /dev/null +++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj @@ -0,0 +1,15 @@ + + + + Bundle + 1151 + + + + + + + + + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs new file mode 100644 index 00000000..f8355aa6 --- /dev/null +++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj new file mode 100644 index 00000000..7d1a42c5 --- /dev/null +++ b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj @@ -0,0 +1,16 @@ + + + + Bundle + 1151 + 2.0.0.0 + + + + + + + + + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs new file mode 100644 index 00000000..11360c22 --- /dev/null +++ b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi new file mode 100644 index 00000000..943b8b48 --- /dev/null +++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj new file mode 100644 index 00000000..3cf361d2 --- /dev/null +++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj @@ -0,0 +1,14 @@ + + + + Bundle + + + + + + + + + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs new file mode 100644 index 00000000..1a24f53e --- /dev/null +++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj new file mode 100644 index 00000000..7162dea2 --- /dev/null +++ b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj @@ -0,0 +1,18 @@ + + + + Bundle + 1151 + 2.0.0.0 + + + + + + + + + + + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs new file mode 100644 index 00000000..33665860 --- /dev/null +++ b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/TestData/MsiTransactionTests/PackageA/PackageA.wixproj b/src/TestData/MsiTransactionTests/PackageA/PackageA.wixproj new file mode 100644 index 00000000..2ef7c05e --- /dev/null +++ b/src/TestData/MsiTransactionTests/PackageA/PackageA.wixproj @@ -0,0 +1,10 @@ + + + + a + {7772FCDF-5FDB-497D-B5DF-C6D17D667976} + + + + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/PackageBv1/PackageB.props b/src/TestData/MsiTransactionTests/PackageBv1/PackageB.props new file mode 100644 index 00000000..decdfb6a --- /dev/null +++ b/src/TestData/MsiTransactionTests/PackageBv1/PackageB.props @@ -0,0 +1,9 @@ + + + + {EAFC0C6B-626E-415C-8132-536FBD19F49B} + + + + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/PackageBv1/PackageBv1.wixproj b/src/TestData/MsiTransactionTests/PackageBv1/PackageBv1.wixproj new file mode 100644 index 00000000..6dc1e4d8 --- /dev/null +++ b/src/TestData/MsiTransactionTests/PackageBv1/PackageBv1.wixproj @@ -0,0 +1,7 @@ + + + + + bv1 + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/PackageBv2/PackageBv2.wixproj b/src/TestData/MsiTransactionTests/PackageBv2/PackageBv2.wixproj new file mode 100644 index 00000000..126d0f53 --- /dev/null +++ b/src/TestData/MsiTransactionTests/PackageBv2/PackageBv2.wixproj @@ -0,0 +1,7 @@ + + + + + 2.0.0.0 + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/PackageCv1/PackageC.props b/src/TestData/MsiTransactionTests/PackageCv1/PackageC.props new file mode 100644 index 00000000..b3d057bd --- /dev/null +++ b/src/TestData/MsiTransactionTests/PackageCv1/PackageC.props @@ -0,0 +1,9 @@ + + + + {A18BDC12-DAEC-43EE-87D1-31B2C2BC6269} + + + + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/PackageCv1/PackageCv1.wixproj b/src/TestData/MsiTransactionTests/PackageCv1/PackageCv1.wixproj new file mode 100644 index 00000000..617e61c3 --- /dev/null +++ b/src/TestData/MsiTransactionTests/PackageCv1/PackageCv1.wixproj @@ -0,0 +1,7 @@ + + + + + cv1 + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/PackageCv2/PackageCv2.wixproj b/src/TestData/MsiTransactionTests/PackageCv2/PackageCv2.wixproj new file mode 100644 index 00000000..640ad21d --- /dev/null +++ b/src/TestData/MsiTransactionTests/PackageCv2/PackageCv2.wixproj @@ -0,0 +1,7 @@ + + + + + 2.0.0.0 + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/PackageD/PackageD.wixproj b/src/TestData/MsiTransactionTests/PackageD/PackageD.wixproj new file mode 100644 index 00000000..1df5da24 --- /dev/null +++ b/src/TestData/MsiTransactionTests/PackageD/PackageD.wixproj @@ -0,0 +1,9 @@ + + + + {78B072D5-1C23-4895-9C4C-1B52E3C80621} + + + + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj b/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj new file mode 100644 index 00000000..46def2c5 --- /dev/null +++ b/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj @@ -0,0 +1,12 @@ + + + + {3D59F8F2-8AC5-403E-B6F7-453870DE7063} + + + + + + + + \ No newline at end of file diff --git a/src/TestData/PrereqBa/BundleA/BundleA.wixproj b/src/TestData/PrereqBa/BundleA/BundleA.wixproj deleted file mode 100644 index ab4c0499..00000000 --- a/src/TestData/PrereqBa/BundleA/BundleA.wixproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - Bundle - - - - - - - - - - - - \ No newline at end of file diff --git a/src/TestData/PrereqBa/BundleA/BundleA.wxi b/src/TestData/PrereqBa/BundleA/BundleA.wxi deleted file mode 100644 index 23623ffb..00000000 --- a/src/TestData/PrereqBa/BundleA/BundleA.wxi +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/TestData/PrereqBa/BundleA/BundleA.wxs b/src/TestData/PrereqBa/BundleA/BundleA.wxs deleted file mode 100644 index 53139834..00000000 --- a/src/TestData/PrereqBa/BundleA/BundleA.wxs +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json b/src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json deleted file mode 100644 index 07a1a830..00000000 --- a/src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "net5.5", - "rollForward": "Disable", - "framework": { - "name": "Microsoft.WindowsDesktop.App", - "version": "5.5.0" - } - } -} \ No newline at end of file diff --git a/src/TestData/PrereqBa/BundleB/BundleB.wixproj b/src/TestData/PrereqBa/BundleB/BundleB.wixproj deleted file mode 100644 index 7d4d1ebd..00000000 --- a/src/TestData/PrereqBa/BundleB/BundleB.wixproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - Bundle - - - - - - - - - - - - \ No newline at end of file diff --git a/src/TestData/PrereqBa/BundleB/BundleB.wxi b/src/TestData/PrereqBa/BundleB/BundleB.wxi deleted file mode 100644 index 6bfeb213..00000000 --- a/src/TestData/PrereqBa/BundleB/BundleB.wxi +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/TestData/PrereqBa/BundleB/BundleB.wxs b/src/TestData/PrereqBa/BundleB/BundleB.wxs deleted file mode 100644 index 57d8a552..00000000 --- a/src/TestData/PrereqBa/BundleB/BundleB.wxs +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/src/TestData/PrereqBa/BundleB/bad.config b/src/TestData/PrereqBa/BundleB/bad.config deleted file mode 100644 index 1512e59a..00000000 --- a/src/TestData/PrereqBa/BundleB/bad.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - -
- - - - - - - - - diff --git a/src/TestData/PrereqBa/PackageA/PackageA.wixproj b/src/TestData/PrereqBa/PackageA/PackageA.wixproj deleted file mode 100644 index d46982fa..00000000 --- a/src/TestData/PrereqBa/PackageA/PackageA.wixproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - {A13BFF68-61DF-4015-9AD1-03854B5E0212} - - - - - \ No newline at end of file diff --git a/src/TestData/PrereqBa/PackageB/PackageB.wixproj b/src/TestData/PrereqBa/PackageB/PackageB.wixproj deleted file mode 100644 index d5edf338..00000000 --- a/src/TestData/PrereqBa/PackageB/PackageB.wixproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - {3DD4621A-F7AB-4548-89A8-6DCB0A9BC954} - - - - - \ No newline at end of file diff --git a/src/TestData/PrereqBa/PackageF/PackageF.wixproj b/src/TestData/PrereqBa/PackageF/PackageF.wixproj deleted file mode 100644 index 3d52e939..00000000 --- a/src/TestData/PrereqBa/PackageF/PackageF.wixproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - {7DEEE928-CD7F-49AD-8000-2ED6339D8A78} - - - - - - - - \ No newline at end of file diff --git a/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj new file mode 100644 index 00000000..56f4b11e --- /dev/null +++ b/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj @@ -0,0 +1,16 @@ + + + + Bundle + + + + + + + + + + + + \ No newline at end of file diff --git a/src/TestData/PrereqBaTests/BundleA/BundleA.wxi b/src/TestData/PrereqBaTests/BundleA/BundleA.wxi new file mode 100644 index 00000000..23623ffb --- /dev/null +++ b/src/TestData/PrereqBaTests/BundleA/BundleA.wxi @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/TestData/PrereqBaTests/BundleA/BundleA.wxs b/src/TestData/PrereqBaTests/BundleA/BundleA.wxs new file mode 100644 index 00000000..53139834 --- /dev/null +++ b/src/TestData/PrereqBaTests/BundleA/BundleA.wxs @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/TestData/PrereqBaTests/BundleA/bad.runtimeconfig.json b/src/TestData/PrereqBaTests/BundleA/bad.runtimeconfig.json new file mode 100644 index 00000000..07a1a830 --- /dev/null +++ b/src/TestData/PrereqBaTests/BundleA/bad.runtimeconfig.json @@ -0,0 +1,10 @@ +{ + "runtimeOptions": { + "tfm": "net5.5", + "rollForward": "Disable", + "framework": { + "name": "Microsoft.WindowsDesktop.App", + "version": "5.5.0" + } + } +} \ No newline at end of file diff --git a/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj b/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj new file mode 100644 index 00000000..420c2a0c --- /dev/null +++ b/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj @@ -0,0 +1,16 @@ + + + + Bundle + + + + + + + + + + + + \ No newline at end of file diff --git a/src/TestData/PrereqBaTests/BundleB/BundleB.wxi b/src/TestData/PrereqBaTests/BundleB/BundleB.wxi new file mode 100644 index 00000000..6bfeb213 --- /dev/null +++ b/src/TestData/PrereqBaTests/BundleB/BundleB.wxi @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/TestData/PrereqBaTests/BundleB/BundleB.wxs b/src/TestData/PrereqBaTests/BundleB/BundleB.wxs new file mode 100644 index 00000000..57d8a552 --- /dev/null +++ b/src/TestData/PrereqBaTests/BundleB/BundleB.wxs @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/TestData/PrereqBaTests/BundleB/bad.config b/src/TestData/PrereqBaTests/BundleB/bad.config new file mode 100644 index 00000000..1512e59a --- /dev/null +++ b/src/TestData/PrereqBaTests/BundleB/bad.config @@ -0,0 +1,17 @@ + + + + + + + +
+ + + + + + + + + diff --git a/src/TestData/PrereqBaTests/PackageA/PackageA.wixproj b/src/TestData/PrereqBaTests/PackageA/PackageA.wixproj new file mode 100644 index 00000000..d46982fa --- /dev/null +++ b/src/TestData/PrereqBaTests/PackageA/PackageA.wixproj @@ -0,0 +1,9 @@ + + + + {A13BFF68-61DF-4015-9AD1-03854B5E0212} + + + + + \ No newline at end of file diff --git a/src/TestData/PrereqBaTests/PackageB/PackageB.wixproj b/src/TestData/PrereqBaTests/PackageB/PackageB.wixproj new file mode 100644 index 00000000..d5edf338 --- /dev/null +++ b/src/TestData/PrereqBaTests/PackageB/PackageB.wixproj @@ -0,0 +1,9 @@ + + + + {3DD4621A-F7AB-4548-89A8-6DCB0A9BC954} + + + + + \ No newline at end of file diff --git a/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj b/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj new file mode 100644 index 00000000..3d52e939 --- /dev/null +++ b/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj @@ -0,0 +1,12 @@ + + + + {7DEEE928-CD7F-49AD-8000-2ED6339D8A78} + + + + + + + + \ No newline at end of file diff --git a/src/TestData/RollbackBoundary/BundleA/BundleA.wixproj b/src/TestData/RollbackBoundary/BundleA/BundleA.wixproj deleted file mode 100644 index 96f7aa31..00000000 --- a/src/TestData/RollbackBoundary/BundleA/BundleA.wixproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - Bundle - - - - - - - - - - - \ No newline at end of file diff --git a/src/TestData/RollbackBoundary/BundleA/BundleA.wxi b/src/TestData/RollbackBoundary/BundleA/BundleA.wxi deleted file mode 100644 index 145073b5..00000000 --- a/src/TestData/RollbackBoundary/BundleA/BundleA.wxi +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/TestData/RollbackBoundary/BundleA/BundleA.wxs b/src/TestData/RollbackBoundary/BundleA/BundleA.wxs deleted file mode 100644 index 251b1863..00000000 --- a/src/TestData/RollbackBoundary/BundleA/BundleA.wxs +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/TestData/RollbackBoundary/PackageA/PackageA.wixproj b/src/TestData/RollbackBoundary/PackageA/PackageA.wixproj deleted file mode 100644 index 25d9e279..00000000 --- a/src/TestData/RollbackBoundary/PackageA/PackageA.wixproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - {14A06CEA-CC9E-478F-AD20-5C9624827090} - - - - - \ No newline at end of file diff --git a/src/TestData/RollbackBoundary/PackageB/PackageB.wixproj b/src/TestData/RollbackBoundary/PackageB/PackageB.wixproj deleted file mode 100644 index 2dc4f3a6..00000000 --- a/src/TestData/RollbackBoundary/PackageB/PackageB.wixproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - {C0B6E75E-4378-4589-B3C5-A23FFA39F59B} - - - - - \ No newline at end of file diff --git a/src/TestData/RollbackBoundary/PackageC/PackageC.wixproj b/src/TestData/RollbackBoundary/PackageC/PackageC.wixproj deleted file mode 100644 index a4b5134b..00000000 --- a/src/TestData/RollbackBoundary/PackageC/PackageC.wixproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - {1C977E8F-4E79-4E3B-A5B1-C4B0BE774041} - - - - - \ No newline at end of file diff --git a/src/TestData/RollbackBoundary/PackageF/PackageF.wixproj b/src/TestData/RollbackBoundary/PackageF/PackageF.wixproj deleted file mode 100644 index d51fab1f..00000000 --- a/src/TestData/RollbackBoundary/PackageF/PackageF.wixproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - {E348D377-E5E7-44B0-897E-5DC8D401BF80} - - - - - - - - \ No newline at end of file diff --git a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj new file mode 100644 index 00000000..96f7aa31 --- /dev/null +++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj @@ -0,0 +1,15 @@ + + + + Bundle + + + + + + + + + + + \ No newline at end of file diff --git a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi new file mode 100644 index 00000000..145073b5 --- /dev/null +++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs new file mode 100644 index 00000000..251b1863 --- /dev/null +++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/TestData/RollbackBoundaryTests/PackageA/PackageA.wixproj b/src/TestData/RollbackBoundaryTests/PackageA/PackageA.wixproj new file mode 100644 index 00000000..25d9e279 --- /dev/null +++ b/src/TestData/RollbackBoundaryTests/PackageA/PackageA.wixproj @@ -0,0 +1,9 @@ + + + + {14A06CEA-CC9E-478F-AD20-5C9624827090} + + + + + \ No newline at end of file diff --git a/src/TestData/RollbackBoundaryTests/PackageB/PackageB.wixproj b/src/TestData/RollbackBoundaryTests/PackageB/PackageB.wixproj new file mode 100644 index 00000000..2dc4f3a6 --- /dev/null +++ b/src/TestData/RollbackBoundaryTests/PackageB/PackageB.wixproj @@ -0,0 +1,9 @@ + + + + {C0B6E75E-4378-4589-B3C5-A23FFA39F59B} + + + + + \ No newline at end of file diff --git a/src/TestData/RollbackBoundaryTests/PackageC/PackageC.wixproj b/src/TestData/RollbackBoundaryTests/PackageC/PackageC.wixproj new file mode 100644 index 00000000..a4b5134b --- /dev/null +++ b/src/TestData/RollbackBoundaryTests/PackageC/PackageC.wixproj @@ -0,0 +1,9 @@ + + + + {1C977E8F-4E79-4E3B-A5B1-C4B0BE774041} + + + + + \ No newline at end of file diff --git a/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj b/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj new file mode 100644 index 00000000..d51fab1f --- /dev/null +++ b/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj @@ -0,0 +1,12 @@ + + + + {E348D377-E5E7-44B0-897E-5DC8D401BF80} + + + + + + + + \ No newline at end of file diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj index 7dd1798c..4988b571 100644 --- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj +++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj @@ -6,8 +6,8 @@ en-us - - + + diff --git a/src/Wix.Build.props b/src/Wix.Build.props index 3f3aaf8f..61fdc815 100644 --- a/src/Wix.Build.props +++ b/src/Wix.Build.props @@ -3,6 +3,6 @@ $([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory))))) $(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\ - $(OutputPath)$(TestGroupName)\ + $(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\ diff --git a/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs b/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs index 4982d733..edd8536b 100644 --- a/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs +++ b/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs @@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E public class BasicFunctionalityTests : BurnE2ETests { - public BasicFunctionalityTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "BasicFunctionality") { } + public BasicFunctionalityTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { } [Fact] public void CanInstallAndUninstallSimpleBundle() diff --git a/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs b/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs index 7643cc64..55353277 100644 --- a/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs +++ b/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs @@ -10,7 +10,7 @@ namespace WixToolsetTest.BurnE2E [Collection("BurnE2E")] public abstract class BurnE2ETests : WixTestBase, IDisposable { - protected BurnE2ETests(ITestOutputHelper testOutputHelper, string testGroupName) : base(testOutputHelper, testGroupName) { } + protected BurnE2ETests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { } private Queue Installers { get; } = new Queue(); diff --git a/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs b/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs index 53ed1fd2..6d8f1536 100644 --- a/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs +++ b/src/WixToolsetTest.BurnE2E/MsiTransactionTests.cs @@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E public class MsiTransactionTests : BurnE2ETests { - public MsiTransactionTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "MsiTransaction") { } + public MsiTransactionTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { } [Fact] public void CanUpgradeBundleWithMsiTransaction() diff --git a/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs index c10736b1..ced2e08e 100644 --- a/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs +++ b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs @@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E public class PrereqBaTests : BurnE2ETests { - public PrereqBaTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "PrereqBa") { } + public PrereqBaTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { } /// /// This bundle purposely provides a .runtimeconfig.json file that requires a version of .NET Core that doesn't exist, diff --git a/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs b/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs index 1ae81b49..effe4418 100644 --- a/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs +++ b/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs @@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E public class RollbackBoundaryTests : BurnE2ETests { - public RollbackBoundaryTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "RollbackBoundary") { } + public RollbackBoundaryTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { } /// /// Installs 1 bundle: diff --git a/src/WixToolsetTest.BurnE2E/WixTestBase.cs b/src/WixToolsetTest.BurnE2E/WixTestBase.cs index a7fd752f..650b0681 100644 --- a/src/WixToolsetTest.BurnE2E/WixTestBase.cs +++ b/src/WixToolsetTest.BurnE2E/WixTestBase.cs @@ -2,15 +2,13 @@ namespace WixToolsetTest.BurnE2E { - using System; - using System.IO; using Xunit.Abstractions; public abstract class WixTestBase { - protected WixTestBase(ITestOutputHelper testOutputHelper, string testGroupName) + protected WixTestBase(ITestOutputHelper testOutputHelper) { - this.TestContext = new WixTestContext(testOutputHelper, testGroupName); + this.TestContext = new WixTestContext(testOutputHelper); } /// diff --git a/src/WixToolsetTest.BurnE2E/WixTestContext.cs b/src/WixToolsetTest.BurnE2E/WixTestContext.cs index 97856089..5620c6a7 100644 --- a/src/WixToolsetTest.BurnE2E/WixTestContext.cs +++ b/src/WixToolsetTest.BurnE2E/WixTestContext.cs @@ -4,6 +4,7 @@ namespace WixToolsetTest.BurnE2E { using System; using System.IO; + using System.Linq; using System.Reflection; using Microsoft.Win32; using WixBuildTools.TestSupport; @@ -11,15 +12,17 @@ namespace WixToolsetTest.BurnE2E public class WixTestContext { - static readonly string RootDataPath = Path.GetFullPath(TestData.Get("..")); + static readonly string RootDataPath = Path.GetFullPath(TestData.Get("TestData")); - public WixTestContext(ITestOutputHelper testOutputHelper, string testGroupName) + public WixTestContext(ITestOutputHelper testOutputHelper) { var test = GetTest(testOutputHelper); + var splitClassName = test.TestCase.TestMethod.TestClass.Class.Name.Split('.'); - this.TestDataFolder = Path.Combine(RootDataPath, testGroupName); - this.TestGroupName = testGroupName; + this.TestGroupName = splitClassName.Last(); this.TestName = test.TestCase.TestMethod.Method.Name; + + this.TestDataFolder = Path.Combine(RootDataPath, this.TestGroupName); } public string TestDataFolder { get; } -- cgit v1.2.3-55-g6feb