feat: Sundown .NET 6 & .NET 7 (#97)

samtrion · web-flow · commit f7046d731959 · 2024-11-17T14:13:59.000+01:00
* feat: Sundown .NET 6 &amp; .NET 7

* fix: Switched to `${{ vars.NE_DOTNET_TARGETFRAMEWORKS }}`
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -25,10 +25,7 @@ jobs:
     with:
       enableSonarQube: true
       dotnet-logging: ${{ inputs.dotnet-logging }}
-      dotnet-version: |
-        6.x
-        7.x
-        8.x
+      dotnet-version: ${{ vars.NE_DOTNET_TARGETFRAMEWORKS }}
       solution: ./Extensions.Hosting.WinForms.sln
       runs-on-build: windows-latest
       runs-on-tests: windows-latest
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,7 +10,7 @@
   <Import Project="$(DirEngineeringSettings)tests.build.props" Condition=" '$(IsTestableProject)' == 'true' " />
 
   <PropertyGroup>
-    <_TargetFrameworks>net6.0-windows;net7.0-windows;net8.0-windows</_TargetFrameworks>
+    <_TargetFrameworks>net8.0-windows;net9.0-windows</_TargetFrameworks>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -15,12 +15,10 @@
   <ItemGroup>
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-    <PackageVersion Update="Microsoft.Extensions.Hosting" Version="8.0.1" Condition=" '$(TargetFramework)' == 'net7.0-windows' " />
-    <PackageVersion Update="Microsoft.Extensions.Hosting" Version="8.0.1" Condition=" '$(TargetFramework)' == 'net6.0-windows' " />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
-    <PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" Condition=" '$(TargetFramework)' == 'net7.0-windows' " />
-    <PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" Condition=" '$(TargetFramework)' == 'net6.0-windows' " />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageVersion Update="Microsoft.Extensions.Hosting" Version="8.0.1" Condition=" '$(TargetFramework)' == 'net8.0-windows' " />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+    <PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" Condition=" '$(TargetFramework)' == 'net8.0-windows' " />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="NetEvolve.Extensions.XUnit" Version="2.3.1" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
diff --git a/src/NetEvolve.Extensions.Hosting.WinForms/IHostBuilderExtensions.cs b/src/NetEvolve.Extensions.Hosting.WinForms/IHostBuilderExtensions.cs
@@ -158,8 +158,8 @@ public static HostApplicationBuilder UseWindowsForms<TApplicationContext>(
 
         var services = contextFactory is null
             ? builder.Services.AddSingleton<ApplicationContext, TApplicationContext>()
-            : builder.Services.AddSingleton<ApplicationContext, TApplicationContext>(sp =>
-                contextFactory.Invoke(sp)
+            : builder.Services.AddSingleton<ApplicationContext, TApplicationContext>(
+                contextFactory.Invoke
             );
 
         _ = services
diff --git a/src/NetEvolve.Extensions.Hosting.WinForms/Internals/FormularProvider.cs b/src/NetEvolve.Extensions.Hosting.WinForms/Internals/FormularProvider.cs
@@ -58,7 +58,7 @@ public async ValueTask<T> GetFormularAsync<T>()
         try
         {
             return await synchronizationContext
-                .InvokeAsync(() => serviceProvider.GetRequiredService<T>())!
+                .InvokeAsync(serviceProvider.GetRequiredService<T>)!
                 .ConfigureAwait(false);
         }
         finally
diff --git a/tests/NetEvolve.Extensions.Hosting.WinForms.Tests.Architecture/ProjectArchitecture.cs b/tests/NetEvolve.Extensions.Hosting.WinForms.Tests.Architecture/ProjectArchitecture.cs
@@ -9,7 +9,7 @@ internal static class ProjectArchitecture
 {
     // TIP: load your architecture once at the start to maximize performance of your tests
     private static readonly Lazy<Architecture> _instance = new Lazy<Architecture>(
-        () => LoadArchitecture(),
+        LoadArchitecture,
         LazyThreadSafetyMode.PublicationOnly
     );
 
diff --git a/tests/NetEvolve.Extensions.Hosting.WinForms.Tests.Unit/Internals/FormularProviderTests.cs b/tests/NetEvolve.Extensions.Hosting.WinForms.Tests.Unit/Internals/FormularProviderTests.cs
@@ -43,7 +43,7 @@ public void GetFormular_InvalidForm_ThrowsInvalidOperationException()
 
         // Act / Assert
         _ = Assert.Throws<InvalidOperationException>(
-            () => formularProvider.GetFormular<TestFormNotRegistered>()
+            formularProvider.GetFormular<TestFormNotRegistered>
         );
     }
 
@@ -117,7 +117,7 @@ public void GetScopedForm_InvalidForm_ThrowsInvalidOperationException()
 
         // Act / Assert
         _ = Assert.Throws<InvalidOperationException>(
-            () => formularProvider.GetScopedForm<TestFormNotRegistered>()
+            formularProvider.GetScopedForm<TestFormNotRegistered>
         );
     }
 
@@ -272,7 +272,7 @@ public void GetMainFormular_InvalidForm_ThrowsInvalidOperationException()
         using var formularProvider = new FormularProvider(serviceProvider, synchronizationContext);
 
         // Act / Assert
-        _ = Assert.Throws<InvalidOperationException>(() => formularProvider.GetMainFormular());
+        _ = Assert.Throws<InvalidOperationException>(formularProvider.GetMainFormular);
     }
 
     [Fact]

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public async ValueTask<T> GetFormularAsync<T>()`
`58`	`58`	`try`
`59`	`59`	`{`
`60`	`60`	`return await synchronizationContext`
`61`		`- .InvokeAsync(() => serviceProvider.GetRequiredService<T>())!`
	`61`	`+ .InvokeAsync(serviceProvider.GetRequiredService<T>)!`
`62`	`62`	`.ConfigureAwait(false);`
`63`	`63`	`}`
`64`	`64`	`finally`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ internal static class ProjectArchitecture`
`9`	`9`	`{`
`10`	`10`	`// TIP: load your architecture once at the start to maximize performance of your tests`
`11`	`11`	`private static readonly Lazy<Architecture> _instance = new Lazy<Architecture>(`
`12`		`- () => LoadArchitecture(),`
	`12`	`+ LoadArchitecture,`
`13`	`13`	`LazyThreadSafetyMode.PublicationOnly`
`14`	`14`	`);`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public void GetFormular_InvalidForm_ThrowsInvalidOperationException()`
`43`	`43`
`44`	`44`	`// Act / Assert`
`45`	`45`	`_ = Assert.Throws<InvalidOperationException>(`
`46`		`- () => formularProvider.GetFormular<TestFormNotRegistered>()`
	`46`	`+ formularProvider.GetFormular<TestFormNotRegistered>`
`47`	`47`	`);`
`48`	`48`	`}`
`49`	`49`
`@@ -117,7 +117,7 @@ public void GetScopedForm_InvalidForm_ThrowsInvalidOperationException()`
`117`	`117`
`118`	`118`	`// Act / Assert`
`119`	`119`	`_ = Assert.Throws<InvalidOperationException>(`
`120`		`- () => formularProvider.GetScopedForm<TestFormNotRegistered>()`
	`120`	`+ formularProvider.GetScopedForm<TestFormNotRegistered>`
`121`	`121`	`);`
`122`	`122`	`}`
`123`	`123`
`@@ -272,7 +272,7 @@ public void GetMainFormular_InvalidForm_ThrowsInvalidOperationException()`
`272`	`272`	`using var formularProvider = new FormularProvider(serviceProvider, synchronizationContext);`
`273`	`273`
`274`	`274`	`// Act / Assert`
`275`		`- _ = Assert.Throws<InvalidOperationException>(() => formularProvider.GetMainFormular());`
	`275`	`+ _ = Assert.Throws<InvalidOperationException>(formularProvider.GetMainFormular);`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`[Fact]`