Use target frameworks net7 and net8, and use respective major version…

… of NuGet packages
sorensenmatias · Mar 3, 2024 · 5a5486d · 5a5486d
1 parent 510c6bd
commit 5a5486d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/Tests/Hosting/HostTests.cs b/Tests/Hosting/HostTests.cs
@@ -77,6 +77,7 @@ public void ApplicationBuilder_BasicReporting()
         duplicates.Should().Contain("ServiceProviderValidationExtensions.Tests.Hosting.HostTests+IMyService is registered 2 times");
     }
 
+#if NET8_0_OR_GREATER
     [Fact]
     public void EmptyApplicationBuilder_TriggersValidation()
     {
@@ -91,6 +92,7 @@ public void EmptyApplicationBuilder_TriggersValidation()
             .ThrowExactly<ServiceProviderValidationException>()
             .WithMessage("ServiceProvider validation failed with the following errors:\r\n\r\nService IMyService is exclusive, but is registered 2 times.");
     }
+#endif
 
     public interface IMyService
     {

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -3,18 +3,23 @@
   <PropertyGroup>
     <AssemblyName>ServiceProviderValidationExtensions.Tests</AssemblyName>
     <RootNamespace>ServiceProviderValidationExtensions.Tests</RootNamespace>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <LangVersion>11.0</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
+    </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="xunit" Version="2.7.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+        <LangVersion>11.0</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

diff --git a/...ceProviderValidationExtensions.Hosting/ServiceProviderValidationExtensions.Hosting.csproj b/...ceProviderValidationExtensions.Hosting/ServiceProviderValidationExtensions.Hosting.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ServiceProviderValidationExtensions/ServiceProviderValidationExtensions.csproj b/src/ServiceProviderValidationExtensions/ServiceProviderValidationExtensions.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Hosting/HostFullReportingTests.cs b/tests/Hosting/HostFullReportingTests.cs
@@ -18,7 +18,9 @@ void ConfigureReporting(ReportConfigurer rb)
             rb.OnDuplicateService(
                 dsc => duplicateServiceReports.Add($"{dsc.ServiceType.DisplayName} is registered {dsc.ImplementationTypes.Count} times"),
                 c => c.Except(typeof(IConfigureOptions<>))
+#if NET8_0_OR_GREATER
                     .Except(typeof(IStartupValidator))
+#endif
                     .Except(typeof(IOptionsChangeTokenSource<>))
                     .Except<ILoggerProvider>());
         }