Skip to content

Commit 8481623

Browse files
AarononthewebAaronontheweb
authored
use .NET Standard 2.0 and later as only build target (#3944)
* close #3851 - use .NET Standard 2.0 and later as future build target * importing System.Configuration.ConfigurationManager fix * don't reference ValueTuple directly on Mono * modernized and updated API approver
1 parent 41ff337 commit 8481623

File tree

43 files changed

+954
-1842
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+954
-1842
lines changed

‎src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AssemblyTitle>Akka.Cluster.Sharding</AssemblyTitle>
66
<Description>Sharded actors with managed lifecycle for Akka.NET cluster</Description>
77
<VersionSuffix>beta</VersionSuffix>
8-
<TargetFrameworks>$(NetFrameworkLibVersion);$(NetStandardLibVersion)</TargetFrameworks>
8+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
99
<PackageTags>$(AkkaPackageTags);network;cluster;sharding</PackageTags>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
</PropertyGroup>

‎src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<AssemblyTitle>Akka.Cluster.Tools</AssemblyTitle>
66
<Description>Distributed publish/subscribe, client and singleton support for Akka.NET cluster</Description>
7-
<TargetFrameworks>$(NetFrameworkLibVersion);$(NetStandardLibVersion)</TargetFrameworks>
7+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
88
<PackageTags>$(AkkaPackageTags);network;cluster</PackageTags>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
</PropertyGroup>

‎src/contrib/cluster/Akka.DistributedData.LightningDB/Akka.DistributedData.LightningDB.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AssemblyTitle>Akka.DistributedData.LightningDB</AssemblyTitle>
66
<Description>Replicated data using CRDT structures</Description>
77
<VersionSuffix>beta</VersionSuffix>
8-
<TargetFrameworks>$(NetFrameworkLibVersion);$(NetStandardLibVersion)</TargetFrameworks>
8+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
99
<PackageTags>$(AkkaPackageTags);network;cluster;crdt;replication;lightningdb;lmdb</PackageTags>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>

‎src/contrib/cluster/Akka.DistributedData/Akka.DistributedData.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AssemblyTitle>Akka.DistributedData</AssemblyTitle>
66
<Description>Replicated data using CRDT structures</Description>
77
<VersionSuffix>beta</VersionSuffix>
8-
<TargetFrameworks>$(NetFrameworkLibVersion);$(NetStandardLibVersion)</TargetFrameworks>
8+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
99
<PackageTags>$(AkkaPackageTags);network;cluster;crdt;replication</PackageTags>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
</PropertyGroup>

‎src/contrib/dependencyinjection/Akka.DI.Core/Akka.DI.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<AssemblyTitle>Akka.DI.Core</AssemblyTitle>
66
<Description>Dependency injection support for Akka.NET</Description>
7-
<TargetFrameworks>$(NetFrameworkLibVersion);$(NetStandardLibVersion)</TargetFrameworks>
7+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
88
<PackageTags>$(AkkaPackageTags);dependency injection</PackageTags>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>

‎src/contrib/dependencyinjection/Akka.DI.TestKit/Akka.DI.TestKit.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
<PropertyGroup>
55
<AssemblyTitle>Akka.DI.TestKit</AssemblyTitle>
66
<Description>Dependency Injection (DI) TestKit support for Akka.NET</Description>
7-
<TargetFrameworks>net452;$(NetStandardLibVersion)</TargetFrameworks>
7+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
88
<PackageTags>$(AkkaPackageTags);dependency injection;testkit</PackageTags>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
1110
</PropertyGroup>
1211

1312
<ItemGroup>

‎src/contrib/persistence/Akka.Persistence.Query.Sql/Akka.Persistence.Query.Sql.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<AssemblyTitle>Akka.Persistence.Query.Sql</AssemblyTitle>
66
<Description>Akka.NET streams support for ADO.NET Persistence middleware.</Description>
7-
<TargetFrameworks>$(NetFrameworkLibVersion);$(NetStandardLibVersion)</TargetFrameworks>
7+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
88
<PackageTags>$(AkkaPackageTags);persistence;eventsource;sql;reactive;streams</PackageTags>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>

‎src/contrib/persistence/Akka.Persistence.Sql.Common/Akka.Persistence.Sql.Common.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<AssemblyTitle>Akka.Persistence.Sql.Common</AssemblyTitle>
66
<Description>Akka.NET Persistence ADO.NET middleware</Description>
7-
<TargetFrameworks>$(NetFrameworkLibVersion);$(NetStandardLibVersion)</TargetFrameworks>
7+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
88
<PackageTags>$(AkkaPackageTags);persistence;eventsource;sql</PackageTags>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
</PropertyGroup>

‎src/contrib/persistence/Akka.Persistence.Sql.TestKit/Akka.Persistence.Sql.TestKit.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<AssemblyTitle>Akka.Persistence.Sql.TestKit</AssemblyTitle>
66
<Description>Akka.NET TestKit for SQL-based ADO.NET Persistence middleware</Description>
7-
<TargetFrameworks>$(NetFrameworkLibVersion);$(NetStandardLibVersion)</TargetFrameworks>
7+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
88
<PackageTags>$(AkkaPackageTags);persistence;testkit;eventsource;sql;reactive;streams</PackageTags>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
</PropertyGroup>

‎src/contrib/serializers/Akka.Serialization.Hyperion/Akka.Serialization.Hyperion.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AssemblyTitle>Akka.Serialization.Hyperion</AssemblyTitle>
55
<Description>Hyperion serializer for Akka.NET</Description>
66
<VersionSuffix>beta</VersionSuffix>
7-
<TargetFrameworks>$(NetFrameworkLibVersion);$(NetStandardLibVersion)</TargetFrameworks>
7+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
88
<PackageTags>$(AkkaPackageTags);hyperion;serializer;serialize</PackageTags>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
</PropertyGroup>

‎src/contrib/serializers/Akka.Serialization.TestKit/Akka.Serialization.TestKit.csproj

+1-10
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,12 @@
55
<AssemblyTitle>Akka.Serialization.TestKit</AssemblyTitle>
66
<Description>Serialization TestKit for Akka.NET</Description>
77
<VersionSuffix>beta</VersionSuffix>
8-
<TargetFrameworks>net452;$(NetCoreTestVersion)</TargetFrameworks>
8+
<TargetFrameworks>$(NetFrameworkTestVersion);$(NetCoreTestVersion)</TargetFrameworks>
99
<PackageTags>$(AkkaPackageTags);hyperion;serializer;serialize;testkit</PackageTags>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
1414
<ProjectReference Include="..\..\..\core\Akka.Tests.Shared.Internals\Akka.Tests.Shared.Internals.csproj" />
1515
</ItemGroup>
16-
17-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
18-
<DefineConstants>$(DefineConstants);SERIALIZATION</DefineConstants>
19-
</PropertyGroup>
20-
21-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
22-
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
23-
</PropertyGroup>
24-
2516
</Project>

‎src/contrib/testkits/Akka.TestKit.Xunit/Akka.TestKit.Xunit.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<AssemblyTitle>Akka.TestKit.Xunit</AssemblyTitle>
66
<Description>TestKit for writing tests for Akka.NET using xUnit.</Description>
7-
<TargetFrameworks>$(NetFrameworkLibVersion);$(NetStandardLibVersion)</TargetFrameworks>
7+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
88
<PackageTags>$(AkkaPackageTags);testkit;xunit</PackageTags>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>

‎src/contrib/testkits/Akka.TestKit.Xunit2/Akka.TestKit.Xunit2.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<AssemblyTitle>Akka.TestKit.Xunit2</AssemblyTitle>
66
<Description>TestKit for writing tests for Akka.NET using xUnit.</Description>
7-
<TargetFrameworks>$(NetFrameworkLibVersion);$(NetStandardLibVersion)</TargetFrameworks>
7+
<TargetFrameworks>$(NetStandardLibVersion)</TargetFrameworks>
88
<PackageTags>$(AkkaPackageTags);testkit;xunit</PackageTags>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>

‎src/core/Akka.API.Tests/Akka.API.Tests.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
44+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
4545
<PackageReference Include="xunit" Version="$(XunitVersion)" />
4646
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
47-
<PackageReference Include="ApiApprover" Version="3.0.1" />
48-
<PackageReference Include="ApprovalTests" Version="3.0.10" />
49-
<PackageReference Include="ApprovalUtilities" Version="3.0.10" />
50-
<PackageReference Include="Mono.Cecil" Version="0.9.6.4" />
47+
<PackageReference Include="ApiApprover" Version="9.3.0" />
48+
</ItemGroup>
49+
50+
<ItemGroup>
51+
<Folder Include="App_Packages\" />
5152
</ItemGroup>
5253

5354
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

‎src/core/Akka.API.Tests/App_Packages/ApiApprover.3.0.1/PublicApiApprover.cs

-50
This file was deleted.

0 commit comments

Comments
 (0)