Skip to content

Commit 138d686

Browse files
committed
COH-31183 Coherence .NET client should target both .NET 6 and .NET 8
[git-p4: depot-paths = "//dev/main.net/": change = 112151]
1 parent c82339e commit 138d686

22 files changed

+75
-1895
lines changed

src/Coherence.SessionStore/Coherence.SessionStore.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>disable</Nullable>
77
<RootNamespace>Tangosol</RootNamespace>
@@ -13,6 +13,7 @@
1313
<Product>Oracle Coherence SessionStore</Product>
1414
<AssemblyVersion>14.1.2.0</AssemblyVersion>
1515
<FileVersion>14.1.2.0</FileVersion>
16+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1617
</PropertyGroup>
1718

1819
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Coherence/Coherence.csproj

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
55
<RootNamespace>Tangosol</RootNamespace>
66
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
77
<ErrorReport>prompt</ErrorReport>
88
<WarningLevel>4</WarningLevel>
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1010
<NoWarn>162, 618, 675</NoWarn>
11+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1112
</PropertyGroup>
1213

1314
<!-- Strong name configuration -->
@@ -42,10 +43,10 @@
4243
<PackageIconUrl>https://raw.githubusercontent.com/oracle/coherence-dotnet-extend-client/main/assets/coherence-logo.png</PackageIconUrl>
4344
<PackageIcon>coherence-logo.png</PackageIcon>
4445
<PackageDescription>
45-
This is a .NET 6 implementation of Oracle Coherence .NET Extend Client.
46+
Implementation of Oracle Coherence .NET Extend Client.
4647
</PackageDescription>
4748
<PackageReleaseNotes>
48-
For release notes, please visit https://github.com/oracle/coherence-dotnet-extend-client/releases/tag/$(Version)-core/.
49+
For release notes, please visit https://github.com/oracle/coherence-dotnet-extend-client/releases/tag/$(Version)/.
4950
</PackageReleaseNotes>
5051
<PackageTags>IMDG;Scalable;Distributed;DB;Cache;Microservices</PackageTags>
5152
<Authors>Oracle</Authors>
@@ -56,25 +57,33 @@
5657
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
5758
</PropertyGroup>
5859

59-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
60+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
6061
<DefineConstants>DEBUG;TRACE</DefineConstants>
6162
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6263
<WarningsAsErrors />
6364
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6465
<OutputPath>bin\Debug</OutputPath>
6566
</PropertyGroup>
66-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
67+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
6768
<DefineConstants />
6869
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6970
<OutputPath>bin\Release</OutputPath>
7071
</PropertyGroup>
7172

7273
<ItemGroup>
7374
<PackageReference Include="Common.Logging" Version="3.4.1" />
74-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
75+
</ItemGroup>
76+
77+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
78+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
7579
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
7680
</ItemGroup>
7781

82+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
83+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
84+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
85+
</ItemGroup>
86+
7887
<ItemGroup>
7988
<None Remove="Config\cache-config.xsd" />
8089
<None Remove="Config\coherence-cache-config.xml" />

src/Coherence/IO/BinarySerializer.cs

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)