1 files changed, 17 insertions, 24 deletions

diff --git a/src/test/BurnUnitTest/BurnUnitTest.h b/src/test/BurnUnitTest/BurnUnitTest.h
index a4ca2707..ed1d2956 100644
--- a/src/test/BurnUnitTest/BurnUnitTest.h
+++ b/src/test/BurnUnitTest/BurnUnitTest.h
@@ -13,40 +13,33 @@ namespace Test
 namespace Bootstrapper
 {
     using namespace System;
-    using namespace WixTest;
     using namespace Xunit;
 
-    public ref class BurnUnitTest : WixTestBase, IUseFixture<BurnTestFixture^>
+    [CollectionDefinition("Burn")]
+    public ref class BurnCollectionDefinition : ICollectionFixture<BurnTestFixture^>
     {
-    public:
-        BurnUnitTest()
-        {
-        }
-
-        virtual void TestInitialize() override
-        {
-            WixTestBase::TestInitialize();
-
-            HRESULT hr = S_OK;
 
-            LogInitialize(::GetModuleHandleW(NULL));
+    };
 
-            hr = LogOpen(NULL, L"BurnUnitTest", NULL, L"txt", FALSE, FALSE, NULL);
-            TestThrowOnFailure(hr, L"Failed to open log.");
-        }
-
-        virtual void TestUninitialize() override
+    [Collection("Burn")]
+    public ref class BurnUnitTest
+    {
+    public:
+        BurnUnitTest(BurnTestFixture^ fixture)
         {
-            LogUninitialize(FALSE);
-
-            WixTestBase::TestUninitialize();
+            this->testContext = fixture;
         }
 
-        virtual void SetFixture(BurnTestFixture^ fixture)
+        property BurnTestFixture^ TestContext
         {
-            // Don't care about the fixture, just need it to be created and disposed.
-            UNREFERENCED_PARAMETER(fixture);
+            BurnTestFixture^ get()
+            {
+                return this->testContext;
+            }
         }
+
+    private:
+        BurnTestFixture^ testContext;
     }; 
 }
 }