Merge pull request #158 from ChrisPulman/RetireNet7

Housekeeping Retire Net 7
reactivemarbles · May 17, 2024 · c72e58f · c72e58f
2 parents 522846d + d62024c
commit c72e58f
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 47 deletions.
diff --git a/build/Build.cs b/build/Build.cs
@@ -49,15 +49,14 @@ partial class Build : NukeBuild
 
     Target Clean => _ => _
         .Before(Restore)
-        .Executes(async () =>
+        .Executes(() =>
         {
             if (IsLocalBuild)
             {
                 return;
             }
 
             PackagesDirectory.CreateOrCleanDirectory();
-            await this.InstallDotNetSdk("6.x.x", "7.x.x", "8.x.x");
         });
 
     Target Restore => _ => _

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>$(NoWarn);CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006</NoWarn>
     <IsPackable>false</IsPackable>

diff --git a/...tityFrameworkCore.Sqlite/CP.Extensions.Hosting.Identity.EntityFrameworkCore.Sqlite.csproj b/...tityFrameworkCore.Sqlite/CP.Extensions.Hosting.Identity.EntityFrameworkCore.Sqlite.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -21,21 +21,11 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net7')) ">
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.19" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.19" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.19" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.19">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net8')) ">
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...y.EntityFrameworkCore/CP.Extensions.Hosting.Identity.EntityFrameworkCore.SqlServer.csproj b/...y.EntityFrameworkCore/CP.Extensions.Hosting.Identity.EntityFrameworkCore.SqlServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -21,21 +21,11 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net7')) ">
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.19" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.19" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.19" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.19">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net8')) ">
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/CP.Extensions.Hosting.MainUIThread/CP.Extensions.Hosting.MainUIThread.csproj b/src/CP.Extensions.Hosting.MainUIThread/CP.Extensions.Hosting.MainUIThread.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows;net8.0-windows</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/CP.Extensions.Hosting.PluginService/CP.Extensions.Hosting.PluginService.csproj b/src/CP.Extensions.Hosting.PluginService/CP.Extensions.Hosting.PluginService.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows;net8.0-windows</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/CP.Extensions.Hosting.Plugins/CP.Extensions.Hosting.Plugins.csproj b/src/CP.Extensions.Hosting.Plugins/CP.Extensions.Hosting.Plugins.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;net6.0;net8.0</TargetFrameworks>
     <NoWarn>$(NoWarn);IDE0058;CA1822</NoWarn>
     <PackageDescription>This extension adds plug-in support to generic host based applications.</PackageDescription>
   </PropertyGroup>

diff --git a/...P.Extensions.Hosting.ReactiveUI.WinForms/CP.Extensions.Hosting.ReactiveUI.WinForms.csproj b/...P.Extensions.Hosting.ReactiveUI.WinForms/CP.Extensions.Hosting.ReactiveUI.WinForms.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <!--ReactiveUI only supports windows 10.0.17763 plus-->
-    <TargetFrameworks>net462;net6.0-windows10.0.17763;net7.0-windows10.0.17763;net8.0-windows10.0.17763</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows10.0.17763;net8.0-windows10.0.17763</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <PackageDescription>This extension adds ReactiveUI support to generic host based dotnet core 6.0 / 7.0 WinForms applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc, together with this reactive MVVM framework.</PackageDescription>
+    <PackageDescription>This extension adds ReactiveUI support to generic host based dotnet core 6.0 / 8.0 WinForms applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc, together with this reactive MVVM framework.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/CP.Extensions.Hosting.ReactiveUI.WinUI/CP.Extensions.Hosting.ReactiveUI.WinUI.csproj b/src/CP.Extensions.Hosting.ReactiveUI.WinUI/CP.Extensions.Hosting.ReactiveUI.WinUI.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <!--ReactiveUI only supports windows 10.0.19041 plus-->
-    <TargetFrameworks>net6.0-windows10.0.19041;net7.0-windows10.0.19041;net8.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows10.0.19041;net8.0-windows10.0.19041</TargetFrameworks>
     <UseWinUI>True</UseWinUI>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);NETSDK1206</NoWarn>
     <RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
-    <PackageDescription>This extension adds ReactiveUI support to generic host based dotnet core 6.0 / 7.0 / 8.0 WinUI applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc, together with this reactive MVVM framework.</PackageDescription>
+    <PackageDescription>This extension adds ReactiveUI support to generic host based dotnet core 6.0 / 8.0 WinUI applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc, together with this reactive MVVM framework.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/CP.Extensions.Hosting.ReactiveUI.Wpf/CP.Extensions.Hosting.ReactiveUI.Wpf.csproj b/src/CP.Extensions.Hosting.ReactiveUI.Wpf/CP.Extensions.Hosting.ReactiveUI.Wpf.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <!--ReactiveUI only supports windows 10.0.17763 plus-->
-    <TargetFrameworks>net462;net6.0-windows10.0.17763;net7.0-windows10.0.17763;net8.0-windows10.0.17763</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows10.0.17763;net8.0-windows10.0.17763</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <PackageDescription>This extension adds ReactiveUI support to generic host based dotnet core 6.0 / 7.0 WPF applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc, together with this reactive MVVM framework.</PackageDescription>
+    <PackageDescription>This extension adds ReactiveUI support to generic host based dotnet core 6.0 / 8.0 WPF applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc, together with this reactive MVVM framework.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/CP.Extensions.Hosting.SingleInstance/CP.Extensions.Hosting.SingleInstance.csproj b/src/CP.Extensions.Hosting.SingleInstance/CP.Extensions.Hosting.SingleInstance.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;net6.0;net8.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CA1812</NoWarn>
   </PropertyGroup>
 

diff --git a/src/CP.Extensions.Hosting.WinForms/CP.Extensions.Hosting.WinForms.csproj b/src/CP.Extensions.Hosting.WinForms/CP.Extensions.Hosting.WinForms.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows;net8.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <PackageDescription>This extension adds WinForms support to generic host based applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc.</PackageDescription>

diff --git a/src/CP.Extensions.Hosting.WinUI/CP.Extensions.Hosting.WinUI.csproj b/src/CP.Extensions.Hosting.WinUI/CP.Extensions.Hosting.WinUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows10.0.17763;net7.0-windows10.0.17763;net8.0-windows10.0.17763</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows10.0.17763;net8.0-windows10.0.17763</TargetFrameworks>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
     <PackageDescription>This extension adds WinUI support to generic host applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc.</PackageDescription>

diff --git a/src/CP.Extensions.Hosting.Wpf/CP.Extensions.Hosting.Wpf.csproj b/src/CP.Extensions.Hosting.Wpf/CP.Extensions.Hosting.Wpf.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows;net8.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <PackageDescription>This extension adds WPF support to generic host applications. With this you can enhance your application with a UI, and use all the services provided by the generic host like DI, logging etc.</PackageDescription>
   </PropertyGroup>

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "1.4",
+    "version": "1.5",
     "publicReleaseRefSpec": [
         "^refs/heads/main$",
         "^refs/heads/master$",