Skip to content

Commit

Permalink
added .NET 6 dual targeting to all assemblies (#5926)
Browse files Browse the repository at this point in the history
* added .NET 6 dual targeting to all assemblies

have not added and .NET 6-specific code yet, just added support for it in the build system

* adding verify files per-runtime

* added all .NET 6 files

* moved files to their own folder

* added all Verified files
  • Loading branch information
Aaronontheweb authored May 10, 2022
1 parent 6963557 commit e89287f
Show file tree
Hide file tree
Showing 83 changed files with 48,352 additions and 453 deletions.
1 change: 1 addition & 0 deletions src/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<NetTestVersion>net6.0</NetTestVersion>
<NetFrameworkTestVersion>net471</NetFrameworkTestVersion>
<NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
<NetLibVersion>net6.0</NetLibVersion>
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<FsCheckVersion>2.16.4</FsCheckVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
The member nodes of the cluster can collect system health metrics and publish that to other cluster nodes
and to the registered subscribers on the system event bus with the help of Cluster Metrics Extension.
</Description>
<TargetFramework>$(NetStandardLibVersion)</TargetFramework>
<TargetFrameworks>$(NetStandardLibVersion);$(NetLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);network;cluster;sharding</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public NodeMetrics Sample()

try
{
TimeSpan measureStartTime;
TimeSpan measureStartTime = TimeSpan.Zero;
TimeSpan measureEndTime;
ImmutableDictionary<int, TimeSpan> currentCpuTimings;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
<Import Project="..\..\..\common.props"/>

<PropertyGroup>
<AssemblyTitle>Akka.Cluster.Sharding</AssemblyTitle>
<Description>Sharded actors with managed lifecycle for Akka.NET cluster</Description>
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);network;cluster;sharding</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup>
<AssemblyTitle>Akka.Cluster.Sharding</AssemblyTitle>
<Description>Sharded actors with managed lifecycle for Akka.NET cluster</Description>
<TargetFrameworks>$(NetStandardLibVersion);$(NetLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);network;cluster;sharding</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="reference.conf" />
<ProjectReference Include="..\..\..\core\Akka.Coordination\Akka.Coordination.csproj" />
<ProjectReference Include="..\..\..\core\Akka.Persistence\Akka.Persistence.csproj" />
<ProjectReference Include="..\Akka.Cluster.Tools\Akka.Cluster.Tools.csproj" />
<ProjectReference Include="..\Akka.DistributedData.LightningDB\Akka.DistributedData.LightningDB.csproj" />
<ProjectReference Include="..\Akka.DistributedData\Akka.DistributedData.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="reference.conf"/>
<ProjectReference Include="..\..\..\core\Akka.Coordination\Akka.Coordination.csproj"/>
<ProjectReference Include="..\..\..\core\Akka.Persistence\Akka.Persistence.csproj"/>
<ProjectReference Include="..\Akka.Cluster.Tools\Akka.Cluster.Tools.csproj"/>
<ProjectReference Include="..\Akka.DistributedData.LightningDB\Akka.DistributedData.LightningDB.csproj"/>
<ProjectReference Include="..\Akka.DistributedData\Akka.DistributedData.csproj"/>
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>

</Project>
32 changes: 16 additions & 16 deletions src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
<Import Project="..\..\..\common.props"/>

<PropertyGroup>
<AssemblyTitle>Akka.Cluster.Tools</AssemblyTitle>
<Description>Distributed publish/subscribe, client and singleton support for Akka.NET cluster</Description>
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);network;cluster</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup>
<AssemblyTitle>Akka.Cluster.Tools</AssemblyTitle>
<Description>Distributed publish/subscribe, client and singleton support for Akka.NET cluster</Description>
<TargetFrameworks>$(NetStandardLibVersion);$(NetLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);network;cluster</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="Client\reference.conf;PublishSubscribe\reference.conf;Singleton\reference.conf" />
<ProjectReference Include="..\..\..\core\Akka.Cluster\Akka.Cluster.csproj" />
<ProjectReference Include="..\..\..\core\Akka.Coordination\Akka.Coordination.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Client\reference.conf;PublishSubscribe\reference.conf;Singleton\reference.conf"/>
<ProjectReference Include="..\..\..\core\Akka.Cluster\Akka.Cluster.csproj"/>
<ProjectReference Include="..\..\..\core\Akka.Coordination\Akka.Coordination.csproj"/>
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
<Import Project="..\..\..\common.props"/>

<PropertyGroup>
<AssemblyTitle>Akka.DistributedData.LightningDB</AssemblyTitle>
<Description>Replicated data using CRDT structures</Description>
<TargetFramework>$(NetStandardLibVersion)</TargetFramework>
<PackageTags>$(AkkaPackageTags);network;cluster;crdt;replication;lightningdb;lmdb</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup>
<AssemblyTitle>Akka.DistributedData.LightningDB</AssemblyTitle>
<Description>Replicated data using CRDT structures</Description>
<TargetFrameworks>$(NetStandardLibVersion);$(NetLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);network;cluster;crdt;replication;lightningdb;lmdb</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="reference.conf" />
<ProjectReference Include="..\Akka.DistributedData\Akka.DistributedData.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="reference.conf"/>
<ProjectReference Include="..\Akka.DistributedData\Akka.DistributedData.csproj"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="LightningDB" Version="0.14.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="LightningDB" Version="0.14.0"/>
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
<Import Project="..\..\..\common.props"/>

<PropertyGroup>
<AssemblyTitle>Akka.DistributedData</AssemblyTitle>
<Description>Replicated data using CRDT structures</Description>
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);network;cluster;crdt;replication</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup>
<AssemblyTitle>Akka.DistributedData</AssemblyTitle>
<Description>Replicated data using CRDT structures</Description>
<TargetFrameworks>$(NetStandardLibVersion);$(NetLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);network;cluster;crdt;replication</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="reference.conf" />
<ProjectReference Include="..\..\..\core\Akka.Cluster\Akka.Cluster.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="reference.conf"/>
<ProjectReference Include="..\..\..\core\Akka.Cluster\Akka.Cluster.csproj"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Hyperion" Version="$(HyperionVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Hyperion" Version="$(HyperionVersion)"/>
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PropertyGroup>
<AssemblyTitle>Akka.DependencyInjection</AssemblyTitle>
<Description>Dependency injection support for Akka.NET</Description>
<TargetFramework>$(NetStandardLibVersion)</TargetFramework>
<TargetFrameworks>$(NetStandardLibVersion);$(NetLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);dependency injection</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageProjectUrl>https://getakka.net/articles/actors/dependency-injection.html</PackageProjectUrl>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
<Import Project="..\..\..\common.props"/>

<PropertyGroup>
<AssemblyTitle>Akka.Persistence.Query.Sql</AssemblyTitle>
<Description>Akka.NET streams support for ADO.NET Persistence middleware.</Description>
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);persistence;eventsource;sql;reactive;streams</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup>
<AssemblyTitle>Akka.Persistence.Query.Sql</AssemblyTitle>
<Description>Akka.NET streams support for ADO.NET Persistence middleware.</Description>
<TargetFrameworks>$(NetStandardLibVersion);$(NetLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);persistence;eventsource;sql;reactive;streams</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="reference.conf" />
<ProjectReference Include="..\..\..\core\Akka.Persistence\Akka.Persistence.csproj" />
<ProjectReference Include="..\..\..\core\Akka.Persistence.Query\Akka.Persistence.Query.csproj" />
<ProjectReference Include="..\Akka.Persistence.Sql.Common\Akka.Persistence.Sql.Common.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="reference.conf"/>
<ProjectReference Include="..\..\..\core\Akka.Persistence\Akka.Persistence.csproj"/>
<ProjectReference Include="..\..\..\core\Akka.Persistence.Query\Akka.Persistence.Query.csproj"/>
<ProjectReference Include="..\Akka.Persistence.Sql.Common\Akka.Persistence.Sql.Common.csproj"/>
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
<Import Project="..\..\..\common.props"/>

<PropertyGroup>
<AssemblyTitle>Akka.Persistence.Sql.Common</AssemblyTitle>
<Description>Akka.NET Persistence ADO.NET middleware</Description>
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);persistence;eventsource;sql</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup>
<AssemblyTitle>Akka.Persistence.Sql.Common</AssemblyTitle>
<Description>Akka.NET Persistence ADO.NET middleware</Description>
<TargetFrameworks>$(NetStandardLibVersion);$(NetLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);persistence;eventsource;sql</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(ConfigurationManagerVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(ConfigurationManagerVersion)"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\core\Akka.Persistence\Akka.Persistence.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\Akka.Persistence\Akka.Persistence.csproj"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Data.Common" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.Common" Version="4.3.0"/>
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
<Import Project="..\..\..\common.props"/>

<PropertyGroup>
<AssemblyTitle>Akka.Persistence.Sqlite</AssemblyTitle>
<Description>Akka.NET Persistence journal and snapshot store backed by SQLite.</Description>
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);persistence;eventsource;sql;sqlite</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup>
<AssemblyTitle>Akka.Persistence.Sqlite</AssemblyTitle>
<Description>Akka.NET Persistence journal and snapshot store backed by SQLite.</Description>
<TargetFrameworks>$(NetStandardLibVersion);$(NetLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);persistence;eventsource;sql;sqlite</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="sqlite.conf" />
<ProjectReference Include="..\..\..\core\Akka.Persistence\Akka.Persistence.csproj" />
<ProjectReference Include="..\Akka.Persistence.Sql.Common\Akka.Persistence.Sql.Common.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="sqlite.conf"/>
<ProjectReference Include="..\..\..\core\Akka.Persistence\Akka.Persistence.csproj"/>
<ProjectReference Include="..\Akka.Persistence.Sql.Common\Akka.Persistence.Sql.Common.csproj"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Data.SQLite" Version="6.0.4" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SQLite" Version="6.0.4"/>
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
<PropertyGroup>
<AssemblyTitle>Akka.Serialization.Hyperion</AssemblyTitle>
<Description>Hyperion serializer for Akka.NET</Description>
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);hyperion;serializer;serialize</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="reference.conf" />
<PackageReference Include="Hyperion" Version="$(HyperionVersion)" />
<ProjectReference Include="..\..\..\core\Akka\Akka.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardLibVersion)' ">
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkLibVersion)' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<Import Project="..\..\..\common.props"/>
<PropertyGroup>
<AssemblyTitle>Akka.Serialization.Hyperion</AssemblyTitle>
<Description>Hyperion serializer for Akka.NET</Description>
<TargetFrameworks>$(NetStandardLibVersion);$(NetLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);hyperion;serializer;serialize</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="reference.conf"/>
<PackageReference Include="Hyperion" Version="$(HyperionVersion)"/>
<ProjectReference Include="..\..\..\core\Akka\Akka.csproj"/>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardLibVersion)' ">
<PackageReference Include="System.Reflection" Version="4.3.0"/>
<PackageReference Include="System.Runtime" Version="4.3.1"/>
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
</Project>
Loading

0 comments on commit e89287f

Please sign in to comment.