Merge pull request #15 from alex-oswald/dev

Fix circular dependency issue. Bump deps.
alex-oswald · Mar 29, 2022 · 1f61012 · 1f61012
2 parents ca73256 + 2e92193
commit 1f61012
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/samples/MvpSample/MvpSample.csproj b/samples/MvpSample/MvpSample.csproj
@@ -10,8 +10,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/WindowsFormsLifetime.Mvp.Generators/WindowsFormsLifetime.Mvp.Generators.csproj b/src/WindowsFormsLifetime.Mvp.Generators/WindowsFormsLifetime.Mvp.Generators.csproj
@@ -5,7 +5,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
 	</ItemGroup>
 

diff --git a/src/WindowsFormsLifetime.Mvp/WindowsFormsLifetime.Mvp.csproj b/src/WindowsFormsLifetime.Mvp/WindowsFormsLifetime.Mvp.csproj
@@ -5,7 +5,7 @@
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<PackageId>WindowsFormsLifetime.Mvp</PackageId>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<Authors>Alex Oswald</Authors>
 		<Company>Oswald Technologies, LLC</Company>
 		<Description>Model-View-Presenter extensions for WindowsFormsLifetime</Description>

diff --git a/src/WindowsFormsLifetime/FormProvider.cs b/src/WindowsFormsLifetime/FormProvider.cs
@@ -18,16 +18,13 @@ public class FormProvider : IFormProvider
     {
         private readonly SemaphoreSlim _semaphore = new(1, 1);
         private readonly IServiceProvider _serviceProvider;
-        private readonly ApplicationContext _applicationContext;
         private readonly IWindowsFormsSynchronizationContextProvider _syncContextManager;
 
         public FormProvider(
             IServiceProvider serviceProvider,
-            ApplicationContext applicationContext,
             IWindowsFormsSynchronizationContextProvider syncContextManager)
         {
             _serviceProvider = serviceProvider;
-            _applicationContext = applicationContext;
             _syncContextManager = syncContextManager;
         }
 
@@ -44,6 +41,10 @@ public async Task<T> GetFormAsync<T>()
             return form;
         }
 
-        public Task<Form> GetMainFormAsync() => Task.FromResult(_applicationContext.MainForm);
+        public Task<Form> GetMainFormAsync()
+        {
+            var applicationContext = _serviceProvider.GetService<ApplicationContext>();
+            return Task.FromResult(applicationContext.MainForm);
+        }
     }
 }
diff --git a/src/WindowsFormsLifetime/WindowsFormsLifetime.csproj b/src/WindowsFormsLifetime/WindowsFormsLifetime.csproj
@@ -5,7 +5,7 @@
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<PackageId>OswaldTechnologies.Extensions.Hosting.WindowsFormsLifetime</PackageId>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<Authors>Alex Oswald</Authors>
 		<Company>Oswald Technologies, LLC</Company>
 		<Description>.NET Core hosting infrastructure for Windows Forms.</Description>
@@ -33,7 +33,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/WindowsFormsLifetime.Tests/WindowsFormsLifetimeTests.csproj b/tests/WindowsFormsLifetime.Tests/WindowsFormsLifetimeTests.csproj
@@ -8,13 +8,13 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
 		<PackageReference Include="xunit" Version="2.4.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="3.1.0">
+		<PackageReference Include="coverlet.collector" Version="3.1.2">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>