Skip to content

Commit 3ff671e

Browse files
AarononthewebAaronontheweb
authored
Merge pull request #7761 from Aaronontheweb/v1.6-merge
[v1.6] flip `dev` to `v1.6`
2 parents 1f14b74 + 69cddac commit 3ff671e

Some content is hidden

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

45 files changed

+770
-4356
lines changed

‎src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.DotNet.verified.txt‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,23 +1565,32 @@ namespace Akka.Actor
15651565
}
15661566
}
15671567
public delegate bool Receive(object message);
1568+
[System.Runtime.CompilerServices.NullableAttribute(0)]
15681569
public abstract class ReceiveActor : Akka.Actor.UntypedActor, Akka.Actor.Internal.IInitializableActor
15691570
{
15701571
protected ReceiveActor() { }
15711572
protected void Become(System.Action configure) { }
15721573
protected void BecomeStacked(System.Action configure) { }
15731574
protected virtual void OnReceive(object message) { }
1574-
protected void Receive<T>(System.Action<T> handler, System.Predicate<T> shouldHandle = null) { }
1575-
protected void Receive<T>(System.Predicate<T> shouldHandle, System.Action<T> handler) { }
1576-
protected void Receive(System.Type messageType, System.Action<object> handler, System.Predicate<object> shouldHandle = null) { }
1575+
protected void Receive<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Action<T> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
1576+
2,
1577+
1})] System.Predicate<T> shouldHandle = null) { }
1578+
protected void Receive<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Predicate<T> shouldHandle, System.Action<T> handler) { }
1579+
protected void Receive(System.Type messageType, System.Action<object> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
1580+
2,
1581+
1})] System.Predicate<object> shouldHandle = null) { }
15771582
protected void Receive(System.Type messageType, System.Predicate<object> shouldHandle, System.Action<object> handler) { }
1578-
protected void Receive<T>(System.Func<T, bool> handler) { }
1583+
protected void Receive<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Func<T, bool> handler) { }
15791584
protected void Receive(System.Type messageType, System.Func<object, bool> handler) { }
15801585
protected void ReceiveAny(System.Action<object> handler) { }
15811586
protected void ReceiveAnyAsync(System.Func<object, System.Threading.Tasks.Task> handler) { }
1582-
protected void ReceiveAsync<T>(System.Func<T, System.Threading.Tasks.Task> handler, System.Predicate<T> shouldHandle = null) { }
1583-
protected void ReceiveAsync<T>(System.Predicate<T> shouldHandle, System.Func<T, System.Threading.Tasks.Task> handler) { }
1584-
protected void ReceiveAsync(System.Type messageType, System.Func<object, System.Threading.Tasks.Task> handler, System.Predicate<object> shouldHandle = null) { }
1587+
protected void ReceiveAsync<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Func<T, System.Threading.Tasks.Task> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
1588+
2,
1589+
1})] System.Predicate<T> shouldHandle = null) { }
1590+
protected void ReceiveAsync<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Predicate<T> shouldHandle, System.Func<T, System.Threading.Tasks.Task> handler) { }
1591+
protected void ReceiveAsync(System.Type messageType, System.Func<object, System.Threading.Tasks.Task> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
1592+
2,
1593+
1})] System.Predicate<object> shouldHandle = null) { }
15851594
protected void ReceiveAsync(System.Type messageType, System.Predicate<object> shouldHandle, System.Func<object, System.Threading.Tasks.Task> handler) { }
15861595
}
15871596
public class ReceiveTimeout : Akka.Actor.IPossiblyHarmful
@@ -2323,26 +2332,12 @@ namespace Akka.Configuration
23232332
public static Akka.Configuration.Config FromResource(string resourceName, object instanceInAssembly) { }
23242333
public static Akka.Configuration.Config FromResource<TAssembly>(string resourceName) { }
23252334
public static Akka.Configuration.Config FromResource(string resourceName, System.Reflection.Assembly assembly) { }
2326-
public static Akka.Configuration.Config Load() { }
23272335
public static Akka.Configuration.Config ParseString(string hocon, System.Func<string, Akka.Configuration.Hocon.HoconRoot> includeCallback) { }
23282336
public static Akka.Configuration.Config ParseString(string hocon) { }
23292337
}
23302338
}
23312339
namespace Akka.Configuration.Hocon
23322340
{
2333-
public class AkkaConfigurationSection : System.Configuration.ConfigurationSection
2334-
{
2335-
public AkkaConfigurationSection() { }
2336-
public Akka.Configuration.Config AkkaConfig { get; }
2337-
[System.Configuration.ConfigurationPropertyAttribute("hocon", IsRequired=true)]
2338-
public Akka.Configuration.Hocon.HoconConfigurationElement Hocon { get; set; }
2339-
}
2340-
public abstract class CDataConfigurationElement : System.Configuration.ConfigurationElement
2341-
{
2342-
protected const string ContentPropertyName = "content";
2343-
protected CDataConfigurationElement() { }
2344-
protected override void DeserializeElement(System.Xml.XmlReader reader, bool serializeCollectionKey) { }
2345-
}
23462341
public class HoconArray : System.Collections.Generic.List<Akka.Configuration.Hocon.HoconValue>, Akka.Configuration.Hocon.IHoconElement
23472342
{
23482343
public HoconArray() { }
@@ -2352,12 +2347,6 @@ namespace Akka.Configuration.Hocon
23522347
public bool IsString() { }
23532348
public override string ToString() { }
23542349
}
2355-
public class HoconConfigurationElement : Akka.Configuration.Hocon.CDataConfigurationElement
2356-
{
2357-
public HoconConfigurationElement() { }
2358-
[System.Configuration.ConfigurationPropertyAttribute("content", IsKey=true, IsRequired=true)]
2359-
public string Content { get; set; }
2360-
}
23612350
public class HoconLiteral : Akka.Configuration.Hocon.IHoconElement
23622351
{
23632352
public HoconLiteral() { }

‎src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.Net.verified.txt‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,23 +1563,32 @@ namespace Akka.Actor
15631563
}
15641564
}
15651565
public delegate bool Receive(object message);
1566+
[System.Runtime.CompilerServices.NullableAttribute(0)]
15661567
public abstract class ReceiveActor : Akka.Actor.UntypedActor, Akka.Actor.Internal.IInitializableActor
15671568
{
15681569
protected ReceiveActor() { }
15691570
protected void Become(System.Action configure) { }
15701571
protected void BecomeStacked(System.Action configure) { }
15711572
protected virtual void OnReceive(object message) { }
1572-
protected void Receive<T>(System.Action<T> handler, System.Predicate<T> shouldHandle = null) { }
1573-
protected void Receive<T>(System.Predicate<T> shouldHandle, System.Action<T> handler) { }
1574-
protected void Receive(System.Type messageType, System.Action<object> handler, System.Predicate<object> shouldHandle = null) { }
1573+
protected void Receive<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Action<T> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
1574+
2,
1575+
1})] System.Predicate<T> shouldHandle = null) { }
1576+
protected void Receive<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Predicate<T> shouldHandle, System.Action<T> handler) { }
1577+
protected void Receive(System.Type messageType, System.Action<object> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
1578+
2,
1579+
1})] System.Predicate<object> shouldHandle = null) { }
15751580
protected void Receive(System.Type messageType, System.Predicate<object> shouldHandle, System.Action<object> handler) { }
1576-
protected void Receive<T>(System.Func<T, bool> handler) { }
1581+
protected void Receive<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Func<T, bool> handler) { }
15771582
protected void Receive(System.Type messageType, System.Func<object, bool> handler) { }
15781583
protected void ReceiveAny(System.Action<object> handler) { }
15791584
protected void ReceiveAnyAsync(System.Func<object, System.Threading.Tasks.Task> handler) { }
1580-
protected void ReceiveAsync<T>(System.Func<T, System.Threading.Tasks.Task> handler, System.Predicate<T> shouldHandle = null) { }
1581-
protected void ReceiveAsync<T>(System.Predicate<T> shouldHandle, System.Func<T, System.Threading.Tasks.Task> handler) { }
1582-
protected void ReceiveAsync(System.Type messageType, System.Func<object, System.Threading.Tasks.Task> handler, System.Predicate<object> shouldHandle = null) { }
1585+
protected void ReceiveAsync<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Func<T, System.Threading.Tasks.Task> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
1586+
2,
1587+
1})] System.Predicate<T> shouldHandle = null) { }
1588+
protected void ReceiveAsync<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Predicate<T> shouldHandle, System.Func<T, System.Threading.Tasks.Task> handler) { }
1589+
protected void ReceiveAsync(System.Type messageType, System.Func<object, System.Threading.Tasks.Task> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
1590+
2,
1591+
1})] System.Predicate<object> shouldHandle = null) { }
15831592
protected void ReceiveAsync(System.Type messageType, System.Predicate<object> shouldHandle, System.Func<object, System.Threading.Tasks.Task> handler) { }
15841593
}
15851594
public class ReceiveTimeout : Akka.Actor.IPossiblyHarmful

‎src/core/Akka.API.Tests/verify/CoreAPISpec.ApprovePersistence.DotNet.verified.txt‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ namespace Akka.Persistence
205205
public DiscardConfigurator() { }
206206
public Akka.Persistence.IStashOverflowStrategy Create(Akka.Configuration.Config config) { }
207207
}
208+
[System.Runtime.CompilerServices.NullableAttribute(0)]
208209
public class DiscardToDeadLetterStrategy : Akka.Persistence.IStashOverflowStrategy
209210
{
210211
public static Akka.Persistence.DiscardToDeadLetterStrategy Instance { get; }
@@ -444,34 +445,48 @@ namespace Akka.Persistence
444445
protected PersistentActor() { }
445446
protected override bool Receive(object message) { }
446447
}
448+
[System.Runtime.CompilerServices.NullableAttribute(0)]
447449
public abstract class ReceivePersistentActor : Akka.Persistence.UntypedPersistentActor, Akka.Actor.Internal.IInitializableActor
448450
{
449451
protected ReceivePersistentActor() { }
450452
protected void Become(System.Action configure) { }
451453
protected void BecomeStacked(System.Action configure) { }
452-
protected void Command<T>(System.Action<T> handler, System.Predicate<T> shouldHandle = null) { }
453-
protected void Command<T>(System.Predicate<T> shouldHandle, System.Action<T> handler) { }
454-
protected void Command(System.Type messageType, System.Action<object> handler, System.Predicate<object> shouldHandle = null) { }
454+
protected void Command<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Action<T> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
455+
2,
456+
1})] System.Predicate<T> shouldHandle = null) { }
457+
protected void Command<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Predicate<T> shouldHandle, System.Action<T> handler) { }
458+
protected void Command(System.Type messageType, System.Action<object> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
459+
2,
460+
1})] System.Predicate<object> shouldHandle = null) { }
455461
protected void Command(System.Type messageType, System.Predicate<object> shouldHandle, System.Action<object> handler) { }
456-
protected void Command<T>(System.Func<T, bool> handler) { }
462+
protected void Command<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Func<T, bool> handler) { }
457463
protected void Command(System.Type messageType, System.Func<object, bool> handler) { }
458464
protected void Command(System.Action<object> handler) { }
459465
protected void CommandAny(System.Action<object> handler) { }
460466
protected void CommandAnyAsync(System.Func<object, System.Threading.Tasks.Task> handler) { }
461-
protected void CommandAsync<T>(System.Func<T, System.Threading.Tasks.Task> handler, System.Predicate<T> shouldHandle = null) { }
462-
protected void CommandAsync<T>(System.Predicate<T> shouldHandle, System.Func<T, System.Threading.Tasks.Task> handler) { }
463-
protected void CommandAsync(System.Type messageType, System.Func<object, System.Threading.Tasks.Task> handler, System.Predicate<object> shouldHandle = null) { }
467+
protected void CommandAsync<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Func<T, System.Threading.Tasks.Task> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
468+
2,
469+
1})] System.Predicate<T> shouldHandle = null) { }
470+
protected void CommandAsync<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Predicate<T> shouldHandle, System.Func<T, System.Threading.Tasks.Task> handler) { }
471+
protected void CommandAsync(System.Type messageType, System.Func<object, System.Threading.Tasks.Task> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
472+
2,
473+
1})] System.Predicate<object> shouldHandle = null) { }
464474
protected void CommandAsync(System.Type messageType, System.Predicate<object> shouldHandle, System.Func<object, System.Threading.Tasks.Task> handler) { }
465475
protected virtual void OnCommand(object message) { }
466476
protected virtual void OnRecover(object message) { }
467-
protected void Recover<T>(System.Action<T> handler, System.Predicate<T> shouldHandle = null) { }
468-
protected void Recover<T>(System.Predicate<T> shouldHandle, System.Action<T> handler) { }
469-
protected void Recover(System.Type messageType, System.Action<object> handler, System.Predicate<object> shouldHandle = null) { }
477+
protected void Recover<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Action<T> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
478+
2,
479+
1})] System.Predicate<T> shouldHandle = null) { }
480+
protected void Recover<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Predicate<T> shouldHandle, System.Action<T> handler) { }
481+
protected void Recover(System.Type messageType, System.Action<object> handler, [System.Runtime.CompilerServices.NullableAttribute(new byte[] {
482+
2,
483+
1})] System.Predicate<object> shouldHandle = null) { }
470484
protected void Recover(System.Type messageType, System.Predicate<object> shouldHandle, System.Action<object> handler) { }
471-
protected void Recover<T>(System.Func<T, bool> handler) { }
485+
protected void Recover<[System.Runtime.CompilerServices.NullableAttribute(2)] T>(System.Func<T, bool> handler) { }
472486
protected void Recover(System.Type messageType, System.Func<object, bool> handler) { }
473487
protected void RecoverAny(System.Action<object> handler) { }
474488
}
489+
[System.Runtime.CompilerServices.NullableAttribute(0)]
475490
public sealed class Recovery
476491
{
477492
public Recovery() { }
@@ -486,6 +501,7 @@ namespace Akka.Persistence
486501
}
487502
public sealed class RecoveryCompleted
488503
{
504+
[System.Runtime.CompilerServices.NullableAttribute(1)]
489505
public static readonly Akka.Persistence.RecoveryCompleted Instance;
490506
public override bool Equals(object obj) { }
491507
public override int GetHashCode() { }
@@ -504,10 +520,11 @@ namespace Akka.Persistence
504520
public RecoveryTick(bool snapshot) { }
505521
public bool Snapshot { get; }
506522
}
523+
[System.Runtime.CompilerServices.NullableAttribute(0)]
507524
public sealed class RecoveryTimedOutException : Akka.Actor.AkkaException
508525
{
509526
public RecoveryTimedOutException() { }
510-
public RecoveryTimedOutException(string message, System.Exception cause = null) { }
527+
public RecoveryTimedOutException(string message, [System.Runtime.CompilerServices.NullableAttribute(2)] System.Exception cause = null) { }
511528
public RecoveryTimedOutException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
512529
}
513530
public sealed class ReplayMessages : Akka.Actor.INoSerializationVerificationNeeded, Akka.Persistence.IJournalMessage, Akka.Persistence.IJournalRequest, Akka.Persistence.IPersistenceMessage, System.IEquatable<Akka.Persistence.ReplayMessages>
@@ -541,6 +558,7 @@ namespace Akka.Persistence
541558
public override int GetHashCode() { }
542559
public override string ToString() { }
543560
}
561+
[System.Runtime.CompilerServices.NullableAttribute(0)]
544562
public sealed class ReplyToStrategy : Akka.Persistence.IStashOverflowStrategy
545563
{
546564
public ReplyToStrategy(object response) { }
@@ -638,6 +656,7 @@ namespace Akka.Persistence
638656
public ThrowExceptionConfigurator() { }
639657
public Akka.Persistence.IStashOverflowStrategy Create(Akka.Configuration.Config config) { }
640658
}
659+
[System.Runtime.CompilerServices.NullableAttribute(0)]
641660
public class ThrowOverflowExceptionStrategy : Akka.Persistence.IStashOverflowStrategy
642661
{
643662
public static Akka.Persistence.ThrowOverflowExceptionStrategy Instance { get; }
@@ -662,6 +681,7 @@ namespace Akka.Persistence
662681
public override int GetHashCode() { }
663682
public override string ToString() { }
664683
}
684+
[System.Runtime.CompilerServices.NullableAttribute(0)]
665685
public abstract class UntypedPersistentActor : Akka.Persistence.Eventsourced
666686
{
667687
protected UntypedPersistentActor() { }

0 commit comments

Comments
 (0)