Skip to content

Commit

Permalink
COH-31183 Coherence .NET client should target both .NET 6 and .NET 8
Browse files Browse the repository at this point in the history
[git-p4: depot-paths = "//dev/main.net/": change = 112151]
  • Loading branch information
vasac committed Oct 25, 2024
1 parent c82339e commit 138d686
Show file tree
Hide file tree
Showing 22 changed files with 75 additions and 1,895 deletions.
3 changes: 2 additions & 1 deletion src/Coherence.SessionStore/Coherence.SessionStore.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<RootNamespace>Tangosol</RootNamespace>
Expand All @@ -13,6 +13,7 @@
<Product>Oracle Coherence SessionStore</Product>
<AssemblyVersion>14.1.2.0</AssemblyVersion>
<FileVersion>14.1.2.0</FileVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
Expand Down
21 changes: 15 additions & 6 deletions src/Coherence/Coherence.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<RootNamespace>Tangosol</RootNamespace>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>162, 618, 675</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<!-- Strong name configuration -->
Expand Down Expand Up @@ -42,10 +43,10 @@
<PackageIconUrl>https://raw.githubusercontent.com/oracle/coherence-dotnet-extend-client/main/assets/coherence-logo.png</PackageIconUrl>
<PackageIcon>coherence-logo.png</PackageIcon>
<PackageDescription>
This is a .NET 6 implementation of Oracle Coherence .NET Extend Client.
Implementation of Oracle Coherence .NET Extend Client.
</PackageDescription>
<PackageReleaseNotes>
For release notes, please visit https://github.com/oracle/coherence-dotnet-extend-client/releases/tag/$(Version)-core/.
For release notes, please visit https://github.com/oracle/coherence-dotnet-extend-client/releases/tag/$(Version)/.
</PackageReleaseNotes>
<PackageTags>IMDG;Scalable;Distributed;DB;Cache;Microservices</PackageTags>
<Authors>Oracle</Authors>
Expand All @@ -56,25 +57,33 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>DEBUG;TRACE</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors />
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<OutputPath>bin\Debug</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DefineConstants />
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<OutputPath>bin\Release</OutputPath>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Common.Logging" Version="3.4.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
<None Remove="Config\cache-config.xsd" />
<None Remove="Config\coherence-cache-config.xml" />
Expand Down
70 changes: 0 additions & 70 deletions src/Coherence/IO/BinarySerializer.cs

This file was deleted.

Loading

0 comments on commit 138d686

Please sign in to comment.