Skip to content

Commit

Permalink
feat: .NET 8 preview support
Browse files Browse the repository at this point in the history
  • Loading branch information
alexyakunin committed Aug 9, 2023
1 parent d3d005a commit 47b102d
Show file tree
Hide file tree
Showing 43 changed files with 162 additions and 113 deletions.
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<!-- Defaults for .csproj -->
<OutputType>Library</OutputType>
<LangVersion>latest</LangVersion>
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand All @@ -45,7 +45,7 @@
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
<!-- NU5048: The 'PackageIconUrl'/'iconUrl' element is deprecated -->
<!-- NU5105: The package version uses SemVer 2.0.0 or components of SemVer 1.0.0 that are not supported on legacy clients -->
<!-- NETSDK1138: The target framework 'net5.0' is out of support. -->
<!-- NETSDK1138: The target framework 'net5.0' is out of support. -->
<NoWarn>$(NoWarn);NU5048;NU5105;NETSDK1138</NoWarn>
<WarningsAsErrors>true</WarningsAsErrors>
</PropertyGroup>
Expand Down
29 changes: 19 additions & 10 deletions Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,47 +6,56 @@

<PropertyGroup>
<!-- Core packages -->
<AspNetCoreVersion>7.*</AspNetCoreVersion>
<AspNetCoreVersion>8.0.0-preview.*</AspNetCoreVersion>
<AspNetCoreVersion7>7.*</AspNetCoreVersion7>
<AspNetCoreVersion6>6.*</AspNetCoreVersion6>
<AspNetCoreVersion5>5.*</AspNetCoreVersion5>
<AspNetCoreVersion3>3.*</AspNetCoreVersion3>
<BlazorVersion>$(AspNetCoreVersion)</BlazorVersion>
<BlazorVersion7>$(AspNetCoreVersion7)</BlazorVersion7>
<BlazorVersion6>$(AspNetCoreVersion6)</BlazorVersion6>
<BlazorVersion5>$(AspNetCoreVersion5)</BlazorVersion5>
<BlazorVersion3>$(AspNetCoreVersion3)</BlazorVersion3>
<SystemXxxVersion>$(AspNetCoreVersion)</SystemXxxVersion>
<SystemXxxVersion7>$(AspNetCoreVersion7)</SystemXxxVersion7>
<SystemXxxVersion6>$(AspNetCoreVersion6)</SystemXxxVersion6>
<SystemXxxVersion5>$(AspNetCoreVersion5)</SystemXxxVersion5>
<MicrosoftExtensionsVersion>$(AspNetCoreVersion)</MicrosoftExtensionsVersion>
<MicrosoftExtensionsVersion7>$(AspNetCoreVersion7)</MicrosoftExtensionsVersion7>
<MicrosoftExtensionsVersion6>$(AspNetCoreVersion6)</MicrosoftExtensionsVersion6>
<CSharpVersion>4.4.*</CSharpVersion>
<!-- EF Core -->
<EntityFrameworkCoreVersion>7.*</EntityFrameworkCoreVersion>
<EntityFrameworkCoreVersion>$(AspNetCoreVersion)</EntityFrameworkCoreVersion>
<EntityFrameworkCoreVersion7>$(AspNetCoreVersion7)</EntityFrameworkCoreVersion7>
<EntityFrameworkCoreVersion6>$(AspNetCoreVersion6)</EntityFrameworkCoreVersion6>
<EntityFrameworkCoreVersion5>$(AspNetCoreVersion5)</EntityFrameworkCoreVersion5>
<EntityFrameworkCoreVersion3>$(AspNetCoreVersion3)</EntityFrameworkCoreVersion3>
<EntityFrameworkCoreNpgsqlVersion>7.*</EntityFrameworkCoreNpgsqlVersion>
<EntityFrameworkCoreNpgsqlVersion>$(EntityFrameworkCoreVersion)</EntityFrameworkCoreNpgsqlVersion>
<EntityFrameworkCoreNpgsqlVersion7>$(EntityFrameworkCoreVersion7)</EntityFrameworkCoreNpgsqlVersion7>
<EntityFrameworkCoreNpgsqlVersion6>$(EntityFrameworkCoreVersion6)</EntityFrameworkCoreNpgsqlVersion6>
<EntityFrameworkCoreNpgsqlVersion5>$(EntityFrameworkCoreVersion5)</EntityFrameworkCoreNpgsqlVersion5>
<EntityFrameworkCoreNpgsqlVersion3>$(EntityFrameworkCoreVersion3)</EntityFrameworkCoreNpgsqlVersion3>
<MySqlConnectorVersion>2.2.*</MySqlConnectorVersion>
<MySqlConnectorVersion6>2.1.*</MySqlConnectorVersion6>
<MySqlConnectorVersion5>$(MySqlConnectorVersion6)</MySqlConnectorVersion5>
<MySqlConnectorVersion3>0.*</MySqlConnectorVersion3>
<EntityFrameworkCoreMySqlVersion>7.0.*</EntityFrameworkCoreMySqlVersion>
<EntityFrameworkCoreMySqlVersion6>$(AspNetCoreVersion6)</EntityFrameworkCoreMySqlVersion6>
<EntityFrameworkCoreMySqlVersion5>$(AspNetCoreVersion5)</EntityFrameworkCoreMySqlVersion5>
<EntityFrameworkCoreMySqlVersion3>$(AspNetCoreVersion3)</EntityFrameworkCoreMySqlVersion3>
<EntityFrameworkCoreMySqlVersion>$(EntityFrameworkCoreVersion7)</EntityFrameworkCoreMySqlVersion>
<EntityFrameworkCoreMySqlVersion7>$(EntityFrameworkCoreVersion7)</EntityFrameworkCoreMySqlVersion7>
<EntityFrameworkCoreMySqlVersion6>$(EntityFrameworkCoreVersion6)</EntityFrameworkCoreMySqlVersion6>
<EntityFrameworkCoreMySqlVersion5>$(EntityFrameworkCoreVersion5)</EntityFrameworkCoreMySqlVersion5>
<EntityFrameworkCoreMySqlVersion3>$(EntityFrameworkCoreVersion3)</EntityFrameworkCoreMySqlVersion3>
<!-- Serialization -->
<AspNetCoreNewtonsoftJsonVersion>$(AspNetCoreVersion)</AspNetCoreNewtonsoftJsonVersion>
<AspNetCoreNewtonsoftJsonVersion7>$(AspNetCoreVersion7)</AspNetCoreNewtonsoftJsonVersion7>
<AspNetCoreNewtonsoftJsonVersion6>$(AspNetCoreVersion6)</AspNetCoreNewtonsoftJsonVersion6>
<NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
<MemoryPackVersion>1.9.*</MemoryPackVersion>
<MessagePackVersion>2.5.*</MessagePackVersion>
<!-- Other -->
<RestEaseVersion>1.6.*</RestEaseVersion>
<!-- Testing -->
<AspNetCoreMvcTestingVersion>$(AspNetCoreVersion6)</AspNetCoreMvcTestingVersion>
<AspNetCoreMvcTestingVersion>$(AspNetCoreVersion)</AspNetCoreMvcTestingVersion>
<AspNetCoreMvcTestingVersion7>$(AspNetCoreVersion7)</AspNetCoreMvcTestingVersion7>
<AspNetCoreMvcTestingVersion6>$(AspNetCoreVersion6)</AspNetCoreMvcTestingVersion6>
<AspNetCoreMvcTestingVersion5>$(AspNetCoreVersion5)</AspNetCoreMvcTestingVersion5>
<AspNetCoreMvcTestingVersion3>$(AspNetCoreVersion3)</AspNetCoreMvcTestingVersion3>
Expand All @@ -57,7 +66,7 @@
</PropertyGroup>

<ItemGroup Label="Package Versions">
<PackageReference Update="AspNet.Security.OAuth.GitHub" Version="$(AspNetCoreVersion)" />
<PackageReference Update="AspNet.Security.OAuth.GitHub" Version="$(AspNetCoreVersion7)" />
<PackageReference Update="Blazorise" Version="$(BlazoriseVersion)" />
<PackageReference Update="Blazorise.Bootstrap" Version="$(BlazoriseVersion)" />
<PackageReference Update="Blazorise.DataGrid" Version="$(BlazoriseVersion)" />
Expand All @@ -66,7 +75,6 @@
<PackageReference Update="Bullseye" Version="4.2.*" />
<PackageReference Update="CliWrap" Version="3.6.*" />
<PackageReference Update="DataAnnotationsValidatorNetStandard" Version="1.0.*" />
<PackageReference Update="EFCore.CheckConstraints" Version="$(EntityFrameworkCoreVersion)" />
<PackageReference Update="Enums.NET" Version="4.0.*" />
<PackageReference Update="MemoryPack" Version="$(MemoryPackVersion)" />
<PackageReference Update="MemoryPack.Core" Version="$(MemoryPackVersion)" />
Expand Down Expand Up @@ -125,6 +133,7 @@
<PackageReference Update="System.IO.Abstractions" Version="19.2.29" />
<PackageReference Update="System.Linq.Async" Version="$(SystemXxxVersion6)" />
<PackageReference Update="System.Net.Http.Json" Version="$(SystemXxxVersion)" />
<PackageReference Update="System.Net.Http" Version="4.3.*" />
<PackageReference Update="System.Net.WebSockets" Version="4.3.*" />
<PackageReference Update="System.Net.WebSockets.Client" Version="4.3.*" />
<PackageReference Update="System.Reactive" Version="6.0.*" />
Expand Down
4 changes: 2 additions & 2 deletions Stl.Fusion.sln
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{91471F20-7
docs\TaskList-AY.md = docs\TaskList-AY.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniRpcApp", "samples\MiniRpcApp\MiniRpcApp.csproj", "{99131CAD-DDC3-4B1A-ABB8-63E0FF32B03E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MiniRpc", "samples\MiniRpc\MiniRpc.csproj", "{99131CAD-DDC3-4B1A-ABB8-63E0FF32B03E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiServerRpcApp", "samples\MultiServerRpcApp\MultiServerRpcApp.csproj", "{DDD38FE8-3105-44E6-9128-921B0713FF64}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiServerRpc", "samples\MultiServerRpc\MultiServerRpc.csproj", "{DDD38FE8-3105-44E6-9128-921B0713FF64}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
5 changes: 4 additions & 1 deletion samples/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="latest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup>
<BaseIntermediateOutputPath>$(SolutionDir)artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath>$(SolutionDir)artifacts\samples\$(MSBuildProjectName)</OutputPath>
<IsPackable>false</IsPackable>
<IsPublishable>false</IsPublishable>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>preview</LangVersion>
</PropertyGroup>

</Project>
9 changes: 7 additions & 2 deletions samples/HelloCart/HelloCart.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<LangVersion>preview</LangVersion>
<AssemblyName>Samples.HelloCart</AssemblyName>
<RootNamespace>Samples.HelloCart</RootNamespace>
</PropertyGroup>
Expand All @@ -21,4 +22,8 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Stl.Generators\Stl.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>
<ItemGroup>
<_ContentIncludedByDefault Remove="obj\project.packagespec.json" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<AssemblyName>Samples.MultiServerRpcApp</AssemblyName>
<RootNamespace>Samples.MultiServerRpcApp</RootNamespace>
<LangVersion>preview</LangVersion>
<AssemblyName>Samples.MiniRpc</AssemblyName>
<RootNamespace>Samples.MiniRpc</RootNamespace>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,4 +19,5 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Stl.Generators\Stl.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Samples.MiniRpcApp;
using Samples.MiniRpc;
using Stl.CommandR;
using Stl.Fusion;
using Stl.Fusion.Server;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Stl.CommandR.Configuration;
using Stl.Fusion;

namespace Samples.MiniRpcApp;
namespace Samples.MiniRpc;

public interface IChat : IComputeService
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<AssemblyName>Samples.MiniRpcApp</AssemblyName>
<RootNamespace>Samples.MiniRpcApp</RootNamespace>
<LangVersion>preview</LangVersion>
<AssemblyName>Samples.MultiServerRpc</AssemblyName>
<RootNamespace>Samples.MultiServerRpc</RootNamespace>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,4 +19,5 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Stl.Generators\Stl.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Microsoft.Toolkit.HighPerformance;
using Samples.MultiServerRpcApp;
using Samples.MultiServerRpc;
using Stl.CommandR;
using Stl.Fusion;
using Stl.Fusion.Server;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Stl.Text;
using static System.Console;

namespace Samples.MultiServerRpcApp;
namespace Samples.MultiServerRpc;

public record ServerId(Symbol Id); // Used just to display the message with Server ID

Expand Down
2 changes: 1 addition & 1 deletion src/Stl.CommandR/Stl.CommandR.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<PackageTags>servicetitan stl stl_fusion commandr</PackageTags>
<Description>Stl.CommandR - a MediatR-like library <!--
-->created to simplify CQRS implementations even further.<!--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
<RazorLangVersion>3.0</RazorLangVersion>
<PackageTags>servicetitan stl stl_fusion blazor authentication</PackageTags>
<Description>Blazor authentication-related components of Stl.Fusion - <!--
Expand Down
8 changes: 7 additions & 1 deletion src/Stl.Fusion.Blazor/Stl.Fusion.Blazor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
<RazorLangVersion>3.0</RazorLangVersion>
<PackageTags>servicetitan stl stl_fusion blazor</PackageTags>
<Description>Blazor components of Stl.Fusion - <!--
Expand All @@ -27,6 +27,12 @@
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net7'))">
<PackageReference Include="Microsoft.AspNetCore.Components" VersionOverride="$(BlazorVersion7)" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" VersionOverride="$(BlazorVersion7)" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" VersionOverride="$(BlazorVersion7)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" VersionOverride="$(BlazorVersion7)" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
<PackageReference Include="Microsoft.AspNetCore.Components" VersionOverride="$(BlazorVersion6)" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" VersionOverride="$(BlazorVersion6)" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<PackageTags>servicetitan stl stl_fusion</PackageTags>
<Description>Stl.Fusion.EntityFramework.Npgsql - <!--
-->Fusion services utilizing EF Core and Npgsql (PostgreSQL EF Core provider).</Description>
Expand All @@ -10,6 +10,10 @@
<ItemGroup>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net7'))">
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" VersionOverride="$(EntityFrameworkCoreNpgsqlVersion7)" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" VersionOverride="$(EntityFrameworkCoreNpgsqlVersion6)" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<PackageTags>servicetitan stl stl_fusion</PackageTags>
<Description>Stl.Fusion.EntityFramework.Redis - <!--
-->Fusion services utilizing EF Core and Redis.</Description>
Expand Down
11 changes: 7 additions & 4 deletions src/Stl.Fusion.EntityFramework/Stl.Fusion.EntityFramework.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<PackageTags>servicetitan stl stl_fusion</PackageTags>
<Description>Stl.Fusion.EntityFramework - Fusion services utilizing EF Core.</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Ulid" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
<PackageReference Include="Ulid" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net7'))">
<PackageReference Include="Microsoft.EntityFrameworkCore" VersionOverride="$(EntityFrameworkCoreVersion7)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" VersionOverride="$(EntityFrameworkCoreVersion7)" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
<PackageReference Include="Microsoft.EntityFrameworkCore" VersionOverride="$(EntityFrameworkCoreVersion6)" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<PackageTags>servicetitan stl stl_fusion client</PackageTags>
<Description>Client-side components of Stl.Fusion - <!--
-->a new implementation of "computed observables" <!--
Expand Down
2 changes: 1 addition & 1 deletion src/Stl.Fusion.Ext.Services/Stl.Fusion.Ext.Services.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0</TargetFrameworks>
<PackageTags>servicetitan stl stl_fusion client</PackageTags>
<Description>Client-side components of Stl.Fusion - <!--
-->a new implementation of "computed observables" <!--
Expand Down
1 change: 1 addition & 0 deletions src/Stl.Fusion.Server.NetFx/JsonifyErrorsAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Net;
using System.Net.Http;
using System.Web.Http.Filters;

namespace Stl.Fusion.Server;
Expand Down
11 changes: 2 additions & 9 deletions src/Stl.Fusion.Server.NetFx/Stl.Fusion.Server.NetFx.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;net471;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;net48;net471</TargetFrameworks>
<RootNamespace>Stl.Fusion.Server</RootNamespace>
<AssemblyName>Stl.Fusion.Server.NetFx</AssemblyName>
<PackageTags>servicetitan stl stl_fusion server netfx</PackageTags>
Expand All @@ -13,15 +13,8 @@
<NoWarn>$(NoWarn);NU1701</NoWarn>
</PropertyGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net7'))">
<PackageReference Include="Microsoft.AspNet.WebApi.Core" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Owin" />
<PackageReference Include="Owin" />
</ItemGroup>
<ItemGroup Condition="!$(TargetFramework.StartsWith('net7'))">
<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Core" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" VersionOverride="$(MicrosoftExtensionsVersion6)" />
<PackageReference Include="Microsoft.Owin" />
<PackageReference Include="Owin" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Stl.Fusion.Server.NetFx/TextMediaTypeFormatter.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Net.Http;
using System.Net.Http.Formatting;
using System.Net.Http.Headers;

Expand Down
1 change: 1 addition & 0 deletions src/Stl.Fusion.Server.NetFx/UseDefaultSessionAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Net.Http;
using System.Web.Http.Controllers;
using System.Web.Http.Filters;
using Stl.Fusion.Authentication;
Expand Down
Loading

0 comments on commit 47b102d

Please sign in to comment.