Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for .NET 8 #3550

Merged
merged 2 commits into from
Nov 13, 2023
Merged

Updates for .NET 8 #3550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b122ae
Update for CSLA 8
rockfordlhotka Nov 7, 2023
d869fd1
#3374 Update NuGet package definitions
rockfordlhotka Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NuGet/Build All.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ try
$originalBackground = $host.UI.RawUI.BackgroundColor
$originalForeground = $host.UI.RawUI.ForegroundColor
$originalLocation = Get-Location
$packages = @("Csla", "Csla.Maui", "Csla.Blazor", "Csla.Blazor.WebAssembly", "Csla.Channels.Grpc", "Csla.Channels.RabbitMq", "Csla.Data.SqlClient", "Csla.Data.SqlClientFx", "Csla.Uwp", "Csla.AspNetCore", "Csla.Web.Mvc", "Csla.Web", "Csla.Windows.Forms", "Csla.Wpf", "Csla.Xamarin", "Csla.Templates")
$packages = @("Csla", "Csla.Maui", "Csla.Blazor", "Csla.Blazor.WebAssembly", "Csla.Channels.Grpc", "Csla.Channels.RabbitMq", "Csla.Data.SqlClient", "Csla.Data.SqlClientFx", "Csla.Uwp", "Csla.AspNetCore", "Csla.Web.Mvc", "Csla.Web", "Csla.Windows.Forms", "Csla.Wpf", "Csla.Templates")

$host.UI.RawUI.BackgroundColor = [System.ConsoleColor]::Black
$host.UI.RawUI.ForegroundColor = [System.ConsoleColor]::White
Expand Down
2 changes: 1 addition & 1 deletion NuGet/Clean All.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ try
$originalBackground = $host.UI.RawUI.BackgroundColor
$originalForeground = $host.UI.RawUI.ForegroundColor
$originalLocation = Get-Location
$packages = @("Csla", "Csla.Maui", "Csla.Blazor", "Csla.Blazor.WebAssembly", "Csla.Channels.Grpc", "Csla.Channels.RabbitMq", "Csla.Data.SqlClient", "Csla.Data.SqlClientFx", "Csla.Uwp", "Csla.AspNetCore", "Csla.Web.Mvc", "Csla.Web", "Csla.Windows.Forms", "Csla.Wpf", "Csla.Xamarin", "Csla.Templates")
$packages = @("Csla", "Csla.Maui", "Csla.Blazor", "Csla.Blazor.WebAssembly", "Csla.Channels.Grpc", "Csla.Channels.RabbitMq", "Csla.Data.SqlClient", "Csla.Data.SqlClientFx", "Csla.Uwp", "Csla.AspNetCore", "Csla.Web.Mvc", "Csla.Web", "Csla.Windows.Forms", "Csla.Wpf", "Csla.Templates")

$host.UI.RawUI.BackgroundColor = [System.ConsoleColor]::Black
$host.UI.RawUI.ForegroundColor = [System.ConsoleColor]::White
Expand Down
18 changes: 7 additions & 11 deletions NuGet/Definition/Csla.Maui.NuSpec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,25 @@
<description>UI helpers for using CSLA .NET business types with Maui.</description>
<language>en-US</language>
<dependencies>
<group targetFramework="net8.0">
<group targetFramework="net8.0-android34.0">
<dependency id="Csla" version="[4.6.3-Beta10]" />
</group>
<group targetFramework="net8.0-android">
<group targetFramework="net8.0-ios17.0">
<dependency id="Csla" version="[4.6.3-Beta10]" />
</group>
<group targetFramework="net8.0-ios">
<group targetFramework="net8.0-maccatalyst17.0">
<dependency id="Csla" version="[4.6.3-Beta10]" />
</group>
<group targetFramework="net8.0-maccatalyst">
<dependency id="Csla" version="[4.6.3-Beta10]" />
</group>
<group targetFramework="net8.0-windows10.0.19041.0">
<group targetFramework="net8.0-windows10.0.19041">
<dependency id="Csla" version="[4.6.3-Beta10]" />
</group>
</dependencies>
</metadata>
<files>
<!-- Maui Csla.Xaml -->
<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-android\**\Csla.Xaml.*" target="lib\net8.0-android34.0"/>
<file src="..\..\Bin\Maui\Release\net8.0-ios\**\Csla.Xaml.*" target="lib\net8.0-ios17.0"/>
<file src="..\..\Bin\Maui\Release\net8.0-maccatalyst\**\Csla.Xaml.*" target="lib\net8.0-maccatalyst17.0"/>
<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\" />
Expand Down
4 changes: 2 additions & 2 deletions NuGet/Definition/Csla.Windows.Forms.NuSpec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<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">
<group targetFramework="net8.0-windows10.0.19041">
<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" />
Expand All @@ -40,7 +40,7 @@
</metadata>
<files>
<!-- net8.0-windows Assembly -->
<file src="..\..\bin\Release\net8.0-windows\**\Csla.Windows.*" target="lib\net8.0-windows" />
<file src="..\..\bin\Release\net8.0-windows\**\Csla.Windows.*" target="lib\net8.0-windows10.0.19041.0" />
<!-- 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 -->
Expand Down
8 changes: 4 additions & 4 deletions NuGet/Definition/Csla.Wpf.NuSpec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
<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">
<group targetFramework="net8.0-windows10.0.19041">
<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" />
<dependency id="Microsoft.Extensions.Hosting" version="8.0.0-rc.2.23479.6" />
<dependency id="Microsoft.Extensions.Hosting.Abstractions" version="8.0.0-rc.2.23479.6" />
</group>
</dependencies>
</metadata>
<files>
<!-- net8.0-windows -->
<file src="..\..\bin\Release\net8.0-windows\**\Csla.Xaml.*" target="lib\net8.0-windows" />
<file src="..\..\bin\Release\net8.0-windows\**\Csla.Xaml.*" target="lib\net8.0-windows10.0.19041.0" />
<!-- 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 -->
Expand Down
Binary file modified NuGet/Tools/NuGet.exe
View file
Open in desktop
Binary file not shown.
54 changes: 4 additions & 50 deletions Source/Csla.Xaml.Maui/Csla.Xaml.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->

<!-- Note for MacCatalyst:
The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
When specifying both architectures, use the plural <RuntimeIdentifiers> instead of the singular <RuntimeIdentifer>.
The Mac App Store will NOT accept apps with ONLY maccatalyst-arm64 indicated;
either BOTH runtimes must be indicated or ONLY macatalyst-x64. -->
<!-- ex. <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->

<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -26,58 +19,19 @@
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-rc.2.23479.6" />
</ItemGroup>

<!-- Build Properties must be defined within these property groups to ensure successful publishing
to the Mac App Store. See: https://aka.ms/maui-publish-app-store#define-build-properties-in-your-project-file -->
<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Debug'">
<CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Debug.plist</CodesignEntitlements>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.Contains('-maccatalyst')) and '$(Configuration)' == 'Release'">
<CodesignEntitlements>Platforms/MacCatalyst/Entitlements.Release.plist</CodesignEntitlements>
<UseHardenedRuntime>true</UseHardenedRuntime>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-windows10.0.19041.0|AnyCPU'">
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-maccatalyst|AnyCPU'">
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android|AnyCPU'">
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-windows10.0.19041.0|AnyCPU'">
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-maccatalyst|AnyCPU'">
<PropertyGroup>
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Csla\Csla.csproj" />
</ItemGroup>

Expand Down
27 changes: 13 additions & 14 deletions releasenotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
# CSLA 7 releases
# CSLA 8 releases

CSLA 7 is a substantial update to CSLA .NET, adding support for .NET 7 and other enhancements.
CSLA 8 is a substantial update to CSLA .NET, adding support for .NET 8 and other enhancements.

## CSLA .NET version 7.0.0 release
## CSLA .NET version 8.0.0 release

CSLA .NET version 7.0.0 adds support for .NET 7 and other enhancements.
CSLA .NET version 8.0.0 adds support for .NET 8 and other enhancements.

* [#2858](https://github.com/MarimerLLC/csla/issues/2858) Add support for .NET 7
* [#3043](https://github.com/MarimerLLC/csla/issues/3043) Modernize data portal authentication
* [#3286](https://github.com/MarimerLLC/csla/issues/3286) Add ManageObjectLifetime to Blazor ViewModel type
* [#3374](https://github.com/MarimerLLC/csla/issues/3374) Add support for .NET 8
* [#3371](https://github.com/MarimerLLC/csla/issues/3371) Remove support for Xamarin
* [#3463](https://github.com/MarimerLLC/csla/issues/3463) Remove .NET Core 3.1 code
* [#3491](https://github.com/MarimerLLC/csla/issues/3491) LocalProxy, HttpClient are kept alive in the root container (ServiceProvider), which causes a Memory Leak
* [#3481](https://github.com/MarimerLLC/csla/issues/3481) GraphMerge loses child objects

* Numerous updates to dependencies

### Change List

* [Changes in this release](https://github.com/MarimerLLC/csla/issues?q=project%3Amarimerllc%2F7+is%3Aclosed+)
* [Changes in this release](https://github.com/MarimerLLC/csla/issues?q=is%3Aclosed+project%3Amarimerllc%2F9+)

### Contributors

* @bboney
* @danielmartind
* @ka-fim
* @lovror
* @TanguyIngels
* @rockfordlhotka
* @russblair
* @ryanaw83
* @TheCakeMonster

Thank you all so much for your support!