Skip to content

Commit 55c1175

Browse files
heatonmatthewtransmax-open-sourceAarononthewebArkatufus
authored
Remove restrictions required by netstandard 1.x but available in 2.0 (#3790)
* Enable features that are now in the netstandard2.0 library set (but were missing from the 1.x library set). #3668 * Correct version numbers for Clean target #3668 * Post-merge cleanup * csproj and code cleanup * Fix Akka.Persistence.TCK outdated journal spec, original assumption was wrong. * Avoid hardwiring names, spec name isn't hardwired anymore. * Add serialization support to exceptions (at least for those in the Akka and Akka.Remote package) * Add support to wrap exceptions in custom fields for ExceptionSupport * Add spec for ExceptionSupport * Update APIApproval list * Fix flaky spec * Revert "Fix flaky spec" This reverts commit c34b2a6. * Fix flaky tests Co-authored-by: matthew <[email protected]> Co-authored-by: Aaron Stannard <[email protected]> Co-authored-by: Gregorius Soedharmo <[email protected]>
1 parent fb61262 commit 55c1175

File tree

143 files changed

+625
-675
lines changed

Some content is hidden

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

143 files changed

+625
-675
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@
2525
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
2626
</ItemGroup>
2727

28-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkTestVersion)' ">
29-
<DefineConstants>$(DefineConstants);</DefineConstants>
30-
</PropertyGroup>
31-
32-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetCoreTestVersion)' ">
33-
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
34-
</PropertyGroup>
35-
3628
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3729
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
3830
</PropertyGroup>

‎src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/AsyncWriteProxyEx.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public AsyncReplayTimeoutException(string message)
4343
{
4444
}
4545

46-
#if SERIALIZATION
4746
/// <summary>
4847
/// Initializes a new instance of the <see cref="AsyncReplayTimeoutException"/> class.
4948
/// </summary>
@@ -53,7 +52,6 @@ protected AsyncReplayTimeoutException(SerializationInfo info, StreamingContext c
5352
: base(info, context)
5453
{
5554
}
56-
#endif
5755
}
5856

5957
/// <summary>

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@
2727
<Reference Include="System.Xml.Linq" />
2828
</ItemGroup>
2929

30-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkTestVersion)' ">
31-
<DefineConstants>$(DefineConstants);SERIALIZABLE</DefineConstants>
32-
</PropertyGroup>
33-
34-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetCoreTestVersion)' ">
35-
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
36-
</PropertyGroup>
37-
3830
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3931
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
4032
</PropertyGroup>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<ProjectReference Include="..\Akka.DistributedData\Akka.DistributedData.csproj" />
1919
</ItemGroup>
2020

21-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetStandardLibVersion)' ">
22-
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
23-
</PropertyGroup>
24-
2521
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
2622
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
2723
</PropertyGroup>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
2020
</ItemGroup>
2121

22-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetCoreTestVersion)' ">
23-
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
24-
</PropertyGroup>
25-
2622
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
2723
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
2824
</PropertyGroup>

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
2020
</ItemGroup>
2121

22-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetFrameworkTestVersion)' ">
23-
<DefineConstants>$(DefineConstants);SERIALIZABLE</DefineConstants>
24-
</PropertyGroup>
25-
26-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetCoreTestVersion)' ">
27-
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
28-
</PropertyGroup>
29-
3022
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3123
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
3224
</PropertyGroup>

‎src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonLeaseSpec.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public ClusterSingletonLeaseSpec() : base(ConfigurationFactory.ParseString(@"
117117

118118
private ClusterSingletonManagerSettings NextSettings() => ClusterSingletonManagerSettings.Create(Sys).WithSingletonName(NextName());
119119

120-
private string LeaseNameFor(ClusterSingletonManagerSettings settings) => $"AkkaSpec-singleton-akka://AkkaSpec/user/{settings.SingletonName}";
120+
private string LeaseNameFor(ClusterSingletonManagerSettings settings) => $"{Sys.Name}-singleton-akka://{Sys.Name}/user/{settings.SingletonName}";
121121

122122
[Fact]
123123
public void ClusterSingleton_with_lease_should_not_start_until_lease_is_available()

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
<ProjectReference Include="..\..\..\core\Akka.Coordination\Akka.Coordination.csproj" />
1616
</ItemGroup>
1717

18-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetStandardLibVersion)' ">
19-
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
20-
</PropertyGroup>
21-
2218
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
2319
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
2420
</PropertyGroup>

‎src/contrib/cluster/Akka.Cluster.Tools/Singleton/ClusterSingletonManager.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@ public sealed class ClusterSingletonManagerIsStuckException : AkkaException
525525
/// <param name="message">The message that describes the error.</param>
526526
public ClusterSingletonManagerIsStuckException(string message) : base(message) { }
527527

528-
#if SERIALIZATION
529528
/// <summary>
530529
/// Initializes a new instance of the <see cref="ClusterSingletonManagerIsStuckException"/> class.
531530
/// </summary>
@@ -534,7 +533,6 @@ public ClusterSingletonManagerIsStuckException(string message) : base(message) {
534533
public ClusterSingletonManagerIsStuckException(SerializationInfo info, StreamingContext context) : base(info, context)
535534
{
536535
}
537-
#endif
538536
}
539537

540538
/// <summary>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
2525
</ItemGroup>
2626

27-
<PropertyGroup Condition=" '$(TargetFramework)' == '$(NetCoreTestVersion)' ">
28-
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
29-
</PropertyGroup>
30-
3127
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3228
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
3329
</PropertyGroup>

0 commit comments

Comments
 (0)