Migrate to Reqnroll v2

Romfos · May 22, 2024 · b51b955 · b51b955
1 parent d1ee450
commit b51b955
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/src/AutoTests.Framework.Components/ComponentsReqnrollHooks.cs b/src/AutoTests.Framework.Components/ComponentsReqnrollHooks.cs
@@ -1,7 +1,7 @@
 using AutoTests.Framework.Components.Application;
 using AutoTests.Framework.Components.Services;
-using BoDi;
 using Reqnroll;
+using Reqnroll.BoDi;
 
 namespace AutoTests.Framework.Components;
 

diff --git a/src/AutoTests.Framework.Components/Services/ApplicationFactory.cs b/src/AutoTests.Framework.Components/Services/ApplicationFactory.cs
@@ -1,6 +1,6 @@
 using AutoTests.Framework.Components.Application;
 using AutoTests.Framework.Components.Attributes;
-using BoDi;
+using Reqnroll.BoDi;
 using System.Collections.Concurrent;
 using System.Reflection;
 using System.Text.Json;

diff --git a/src/AutoTests.Framework.Playwright/PlaywrightHooks.cs b/src/AutoTests.Framework.Playwright/PlaywrightHooks.cs
@@ -1,6 +1,6 @@
-using BoDi;
 using Microsoft.Playwright;
 using Reqnroll;
+using Reqnroll.BoDi;
 
 namespace AutoTests.Framework.Playwright;
 
@@ -24,13 +24,13 @@ public static async Task BeforeTestRun(ObjectContainer objectContainer)
         else
         {
             playwright = await Microsoft.Playwright.Playwright.CreateAsync();
-            objectContainer.BaseContainer.RegisterInstanceAs(playwright);
+            objectContainer.RegisterInstanceAs(playwright);
         }
 
         if (!objectContainer.IsRegistered<IBrowser>())
         {
             var browser = await playwright.Chromium.LaunchAsync(browserTypeLaunchOptions);
-            objectContainer.BaseContainer.RegisterInstanceAs(browser);
+            objectContainer.RegisterInstanceAs(browser);
         }
     }
 

diff --git a/src/AutoTests.Framework.Tests/AutoTests.Framework.Tests.csproj b/src/AutoTests.Framework.Tests/AutoTests.Framework.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="MSTest" Version="3.3.1" />
-    <PackageReference Include="Reqnroll.MsTest" Version="1.0.1" />
+    <PackageReference Include="Reqnroll.MsTest" Version="2.0.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 

diff --git a/src/AutoTests.Framework.sln b/src/AutoTests.Framework.sln
@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33110.190
@@ -68,3 +67,4 @@ Global
 		SolutionGuid = {8CC06E25-60A1-41E5-9BA3-4BCF6254BC1C}
 	EndGlobalSection
 EndGlobal
+bal
diff --git a/src/AutoTests.Framework/AutoTests.Framework.csproj b/src/AutoTests.Framework/AutoTests.Framework.csproj
@@ -2,7 +2,7 @@
   <Import Project="../Package.props" />
 
   <ItemGroup>
-    <PackageReference Include="Reqnroll" Version="1.0.1" />
+    <PackageReference Include="Reqnroll" Version="2.0.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.9.2" />
   </ItemGroup>
 

diff --git a/src/AutoTests.Framework/Data/DataReqnrollHooks.cs b/src/AutoTests.Framework/Data/DataReqnrollHooks.cs
@@ -1,5 +1,5 @@
-using BoDi;
 using Reqnroll;
+using Reqnroll.BoDi;
 
 namespace AutoTests.Framework.Data;
 
@@ -12,6 +12,6 @@ public static void BeforeTestRun(ITestRunnerManager testRunnerManager, ObjectCon
         var dataLoader = objectContainer.Resolve<DataLoader>();
         var data = dataLoader.Load(testRunnerManager.BindingAssemblies);
         var dataService = new DataService(data);
-        objectContainer.BaseContainer.RegisterInstanceAs(dataService);
+        objectContainer.RegisterInstanceAs(dataService);
     }
 }
diff --git a/src/AutoTests.Framework/Expressions/ExpressionReqnrollHooks.cs b/src/AutoTests.Framework/Expressions/ExpressionReqnrollHooks.cs
@@ -1,5 +1,5 @@
-using BoDi;
 using Reqnroll;
+using Reqnroll.BoDi;
 
 namespace AutoTests.Framework.Expressions;
 
@@ -15,6 +15,6 @@ public ArgumentExpression TransformExpression(string text)
     [BeforeTestRun(Order = int.MinValue)]
     public static void BeforeTestRun(ObjectContainer objectContainer)
     {
-        objectContainer.BaseContainer.RegisterTypeAs<RoslynCSharpExpressionService, IExpressionService>();
+        objectContainer.RegisterTypeAs<RoslynCSharpExpressionService, IExpressionService>();
     }
 }
diff --git a/src/Bootstrap.Tests/Bootstrap.Tests.csproj b/src/Bootstrap.Tests/Bootstrap.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="MSTest" Version="3.3.1" />
-    <PackageReference Include="Reqnroll.MsTest" Version="1.0.1" />
+    <PackageReference Include="Reqnroll.MsTest" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>