Merge pull request #3464 from rockfordlhotka/v8-version

Add net8.0 build target; remove .NET 3.1 target
MarimerLLC · Sep 29, 2023 · ffa5f22 · ffa5f22
2 parents 2cf2008 + 8cae8fd
commit ffa5f22
Show file tree

Hide file tree

Showing 40 changed files with 177 additions and 2,071 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,7 +18,7 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '7.0'
+        dotnet-version: '8.0'
         include-prerelease: True
 
     - name: Build

diff --git a/NuGet/Definition/Csla.AspNetCore.NuSpec b/NuGet/Definition/Csla.AspNetCore.NuSpec
@@ -20,30 +20,30 @@
         <dependency id="Csla" version="[4.6.3-Beta10]" />
         <dependency id="Microsoft.AspNetCore.Mvc" version="2.2.0" />
       </group>
-      <group targetFramework="netcoreapp3.1">
-        <dependency id="Csla" version="[4.6.3-Beta10]" />
-        <dependency id="Microsoft.AspNetCore.Components" version="3.1.9" />
-        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.9" />
-      </group>
       <group targetFramework="net6.0">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
         <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" />
         <dependency id="Microsoft.AspNetCore.Components.Authorization" version="6.0.8" />
       </group>
       <group targetFramework="net7.0">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
-        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0-rc.2.22472.3" />
-        <dependency id="Microsoft.AspNetCore.Components.Authorization" version="7.0.0-rc.2.22476.2" />
+        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" />
+        <dependency id="Microsoft.AspNetCore.Components.Authorization" version="7.0.11" />
+      </group>
+      <group targetFramework="net8.0">
+        <dependency id="Csla" version="[4.6.3-Beta10]" />
+        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.0-rc.1.23419.4" />
+        <dependency id="Microsoft.AspNetCore.Components.Authorization" version="8.0.0-rc.1.23421.29" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <!-- NetStandard Assembly -->
     <file src="..\..\bin\Release\netstandard2.0\**\Csla.AspNetCore.*" target="lib\netstandard2.0" />
-    <!-- NetCore3.1 Assembly -->
-    <file src="..\..\bin\Release\netcoreapp3.1\**\Csla.AspNetCore.*" target="lib\netcoreapp3.1" />
     <!-- Net6.0 Assembly -->
     <file src="..\..\bin\Release\net6.0\**\Csla.AspNetCore.*" target="lib\net6.0" />
+    <!-- Net8.0 Assembly -->
+    <file src="..\..\bin\Release\net8.0\**\Csla.AspNetCore.*" target="lib\net8.0" />
     <!-- Net7.0 Assembly -->
     <file src="..\..\bin\Release\net7.0\**\Csla.AspNetCore.*" target="lib\net7.0" />
     <!-- resources -->

diff --git a/NuGet/Definition/Csla.Blazor.NuSpec b/NuGet/Definition/Csla.Blazor.NuSpec
@@ -30,9 +30,15 @@
       </group>
       <group targetFramework="net7.0">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
-        <dependency id="Microsoft.AspNetCore.Components" version="7.0.5" />
-        <dependency id="Microsoft.AspNetCore.Components.Web" version="7.0.5" />
-        <dependency id="Microsoft.AspNetCore.Components.Authorization" version="7.0.5" />
+        <dependency id="Microsoft.AspNetCore.Components" version="7.0.11" />
+        <dependency id="Microsoft.AspNetCore.Components.Web" version="7.0.11" />
+        <dependency id="Microsoft.AspNetCore.Components.Authorization" version="7.0.11" />
+      </group>
+      <group targetFramework="net8.0">
+        <dependency id="Csla" version="[4.6.3-Beta10]" />
+        <dependency id="Microsoft.AspNetCore.Components" version="8.0.0-rc.1.23421.29" />
+        <dependency id="Microsoft.AspNetCore.Components.Web" version="8.0.0-rc.1.23421.29" />
+        <dependency id="Microsoft.AspNetCore.Components.Authorization" version="8.0.0-rc.1.23421.29" />
       </group>
     </dependencies>
   </metadata>
@@ -41,6 +47,10 @@
     <file src="..\..\bin\Release\netstandard2.1\**\Csla.Blazor.dll" target="lib\netstandard2.1" />
     <file src="..\..\bin\Release\netstandard2.1\**\Csla.Blazor.pdb" target="lib\netstandard2.1" />
     <file src="..\..\bin\Release\netstandard2.1\**\Csla.Blazor.xml" target="lib\netstandard2.1" />
+    <!-- Net8.0 Assembly -->
+    <file src="..\..\bin\Release\net8.0\**\Csla.Blazor.dll" target="lib\net8.0" />
+    <file src="..\..\bin\Release\net8.0\**\Csla.Blazor.pdb" target="lib\net8.0" />
+    <file src="..\..\bin\Release\net8.0\**\Csla.Blazor.xml" target="lib\net8.0" />
     <!-- Net7.0 Assembly -->
     <file src="..\..\bin\Release\net7.0\**\Csla.Blazor.dll" target="lib\net7.0" />
     <file src="..\..\bin\Release\net7.0\**\Csla.Blazor.pdb" target="lib\net7.0" />

diff --git a/NuGet/Definition/Csla.Blazor.WebAssembly.NuSpec b/NuGet/Definition/Csla.Blazor.WebAssembly.NuSpec
@@ -29,14 +29,22 @@
       <group targetFramework="net7.0">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
         <dependency id="Csla.Blazor" version="[4.6.3-Beta10]" />
-        <dependency id="Microsoft.AspNetCore.Components.WebAssembly" version="7.0.5" />
+        <dependency id="Microsoft.AspNetCore.Components.WebAssembly" version="7.0.11" />
+        <dependency id="System.Net.Http.Json" version="7.0.1" />
+      </group>
+      <group targetFramework="net8.0">
+        <dependency id="Csla" version="[4.6.3-Beta10]" />
+        <dependency id="Csla.Blazor" version="[4.6.3-Beta10]" />
+        <dependency id="Microsoft.AspNetCore.Components.WebAssembly" version="8.0.0-rc.1.23421.29" />
         <dependency id="System.Net.Http.Json" version="7.0.1" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <!-- NetStandard Assembly -->
     <file src="..\..\bin\Release\netstandard2.1\**\Csla.Blazor.WebAssembly.*" target="lib\netstandard2.1" />
+    <!-- Net8.0 Assembly -->
+    <file src="..\..\bin\Release\net8.0\**\Csla.Blazor.WebAssembly.*" target="lib\net8.0" />
     <!-- Net7.0 Assembly -->
     <file src="..\..\bin\Release\net7.0\**\Csla.Blazor.WebAssembly.*" target="lib\net7.0" />
     <!-- Net6.0 Assembly -->

diff --git a/NuGet/Definition/Csla.Maui.NuSpec b/NuGet/Definition/Csla.Maui.NuSpec
@@ -16,30 +16,30 @@
     <description>UI helpers for using CSLA .NET business types with Maui.</description>
     <language>en-US</language>
     <dependencies>
-      <group targetFramework="net6.0">
+      <group targetFramework="net8.0">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
       </group>
-      <group targetFramework="net6.0-android21.0">
+      <group targetFramework="net8.0-android">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
       </group>
-      <group targetFramework="net6.0-ios14.2">
+      <group targetFramework="net8.0-ios">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
       </group>
-      <group targetFramework="net6.0-maccatalyst14.0">
+      <group targetFramework="net8.0-maccatalyst">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
       </group>
-      <group targetFramework="net6.0-windows10.0.19041.0">
+      <group targetFramework="net8.0-windows10.0.19041.0">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <!-- Maui Csla.Xaml -->
-    <file src="..\..\Bin\Maui\Release\net6.0\**\Csla.Xaml.*" target="lib\net6.0"/>
-    <file src="..\..\Bin\Maui\Release\net6.0-android\**\Csla.Xaml.*" target="lib\net6.0-android21.0"/>
-    <file src="..\..\Bin\Maui\Release\net6.0-ios\**\Csla.Xaml.*" target="lib\net6.0-ios14.2"/>
-    <file src="..\..\Bin\Maui\Release\net6.0-maccatalyst\**\Csla.Xaml.*" target="lib\net6.0-maccatalyst14.0"/>
-    <file src="..\..\Bin\Maui\Release\net6.0-windows10.0.19041.0\**\Csla.Xaml.*" target="lib\net6.0-windows10.0.19041.0"/>
+    <file src="..\..\Bin\Maui\Release\net8.0\**\Csla.Xaml.*" target="lib\net8.0"/>
+    <file src="..\..\Bin\Maui\Release\net8.0-android\**\Csla.Xaml.*" target="lib\net8.0-android"/>
+    <file src="..\..\Bin\Maui\Release\net8.0-ios\**\Csla.Xaml.*" target="lib\net8.0-ios"/>
+    <file src="..\..\Bin\Maui\Release\net8.0-maccatalyst\**\Csla.Xaml.*" target="lib\net8.0-maccatalyst"/>
+    <file src="..\..\Bin\Maui\Release\net8.0-windows10.0.19041.0\**\Csla.Xaml.*" target="lib\net8.0-windows10.0.19041.0"/>
     <!-- resources -->
     <file src="..\..\Support\Logos\csla.png" target="images\" />
     <file src="..\..\Support\readme.md" target="docs\" />

diff --git a/NuGet/Definition/Csla.NuSpec b/NuGet/Definition/Csla.NuSpec
@@ -91,6 +91,16 @@
         <dependency id="System.ComponentModel.Annotations" version="5.0.0" />
         <dependency id="System.Runtime.Loader" version="4.3.0" />
       </group>
+      <group targetFramework="net8.0">
+        <dependency id="Microsoft.Extensions.Configuration" version="8.0.0-rc.1.23419.4" />
+        <dependency id="Microsoft.Extensions.Configuration.Binder" version="8.0.0-rc.1.23419.4" />
+        <dependency id="Microsoft.Extensions.DependencyInjection" version="8.0.0-rc.1.23419.4" />
+        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.0-rc.1.23419.4" />
+        <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="8.0.0-rc.1.23419.4" />
+        <dependency id="Microsoft.Extensions.Logging.Abstractions" version="8.0.0-rc.1.23419.4" />
+        <dependency id="System.ComponentModel.Annotations" version="5.0.0" />
+        <dependency id="System.Runtime.Loader" version="4.3.0" />
+      </group>
     </dependencies>
   </metadata>
   <files>
@@ -99,6 +109,11 @@
     <file src="..\..\bin\Release\netstandard2.0\**\Csla.pdb*" target="lib\netstandard2.0" />
     <file src="..\..\bin\Release\netstandard2.0\**\Csla.xml*" target="lib\netstandard2.0" />
     <file src="..\..\bin\Release\netstandard2.0\**\Csla.resources.dll*" target="lib\netstandard2.0" />
+    <!-- Net 8.0 Assembly -->
+    <file src="..\..\bin\Release\net8.0\**\Csla.dll*" target="lib\net8.0" />
+    <file src="..\..\bin\Release\net8.0\**\Csla.pdb*" target="lib\net8.0" />
+    <file src="..\..\bin\Release\net8.0\**\Csla.xml*" target="lib\net8.0" />
+    <file src="..\..\bin\Release\net8.0\**\Csla.resources.dll*" target="lib\net8.0" />
     <!-- Net 7.0 Assembly -->
     <file src="..\..\bin\Release\net7.0\**\Csla.dll*" target="lib\net7.0" />
     <file src="..\..\bin\Release\net7.0\**\Csla.pdb*" target="lib\net7.0" />

diff --git a/NuGet/Definition/Csla.Windows.Forms.NuSpec b/NuGet/Definition/Csla.Windows.Forms.NuSpec
@@ -21,26 +21,26 @@
         <dependency id="Microsoft.Extensions.Hosting" version="5.0.0" />
         <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="5.0.0" />
       </group>
-      <group targetFramework="netcoreapp3.1">
-        <dependency id="Csla" version="[4.6.3-Beta10]" />
-        <dependency id="Microsoft.Extensions.Hosting" version="5.0.0" />
-        <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="5.0.0" />
-      </group>
       <group targetFramework="net6.0-windows10.0.19041.0">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
         <dependency id="Microsoft.Extensions.Hosting" version="6.0.0" />
         <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="6.0.0" />
       </group>
       <group targetFramework="net7.0-windows10.0.19041.0">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
-        <dependency id="Microsoft.Extensions.Hosting" version="7.0.0-rc.2.22472.3" />
-        <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="7.0.0-rc.2.22472.3" />
+        <dependency id="Microsoft.Extensions.Hosting" version="7.0.1" />
+        <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="7.0.0" />
+      </group>
+      <group targetFramework="net8.0-windows">
+        <dependency id="Csla" version="[4.6.3-Beta10]" />
+        <dependency id="Microsoft.Extensions.Hosting" version="8.0.0-rc.1.23419.4" />
+        <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="8.0.0-rc.1.23419.4" />
       </group>
     </dependencies>
   </metadata>
   <files>
-     <!-- netcoreapp3.1 Assembly -->
-    <file src="..\..\bin\Release\netcoreapp3.1\**\Csla.Windows.*" target="lib\netcoreapp3.1" />
+     <!-- net8.0-windows Assembly -->
+    <file src="..\..\bin\Release\net8.0-windows\**\Csla.Windows.*" target="lib\net8.0-windows" />
      <!-- net7.0-windows10.0.19041.0 Assembly -->
     <file src="..\..\bin\Release\net7.0-windows10.0.19041.0\**\Csla.Windows.*" target="lib\net7.0-windows10.0.19041.0" />
      <!-- net6.0-windows10.0.19041.0 Assembly -->

diff --git a/NuGet/Definition/Csla.Wpf.NuSpec b/NuGet/Definition/Csla.Wpf.NuSpec
@@ -21,26 +21,26 @@
         <dependency id="Microsoft.Extensions.Hosting" version="3.1.20" />
         <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="3.1.20" />
       </group>
-      <group targetFramework="netcoreapp3.1">
-        <dependency id="Csla" version="[4.6.3-Beta10]" />
-        <dependency id="Microsoft.Extensions.Hosting" version="5.0.0" />
-        <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="5.0.0" />
-      </group>
       <group targetFramework="net6.0-windows10.0.19041.0">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
         <dependency id="Microsoft.Extensions.Hosting" version="6.0.0" />
         <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="6.0.0" />
       </group>
       <group targetFramework="net7.0-windows10.0.19041.0">
         <dependency id="Csla" version="[4.6.3-Beta10]" />
-        <dependency id="Microsoft.Extensions.Hosting" version="7.0.0-rc.2.22472.3" />
-        <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="7.0.0-rc.2.22472.3" />
+        <dependency id="Microsoft.Extensions.Hosting" version="7.0.1" />
+        <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="7.0.0" />
+      </group>
+      <group targetFramework="net8.0-windows">
+        <dependency id="Csla" version="[4.6.3-Beta10]" />
+        <dependency id="Microsoft.Extensions.Hosting" version="8.0.0-rc.1.23419.4" />
+        <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="8.0.0-rc.1.23419.4" />
       </group>
     </dependencies>
   </metadata>
   <files>
-     <!-- netcoreapp3.1 Assembly -->
-    <file src="..\..\bin\Release\netcoreapp3.1\**\Csla.Xaml.*" target="lib\netcoreapp3.1" />
+     <!-- net8.0-windows -->
+    <file src="..\..\bin\Release\net8.0-windows\**\Csla.Xaml.*" target="lib\net8.0-windows" />
      <!-- net7.0-windows10.0.19041.0 Assembly -->
     <file src="..\..\bin\Release\net7.0-windows10.0.19041.0\**\Csla.Xaml.*" target="lib\net7.0-windows10.0.19041.0" />
      <!-- net6.0-windows10.0.19041.0 Assembly -->

diff --git a/NuGet/Definition/Csla.Xamarin.NuSpec b/NuGet/Definition/Csla.Xamarin.NuSpec
diff --git a/Source/Csla.AspNetCore/Csla.AspNetCore.csproj b/Source/Csla.AspNetCore/Csla.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <AssemblyName>Csla.AspNetCore</AssemblyName>
     <RootNamespace>Csla.AspNetCore</RootNamespace>
     <PackageId>Csla.AspNetCore</PackageId>
@@ -22,13 +22,14 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0-rc.1.23421.29" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.0-rc.2.22476.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.11" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">