From 055cf64660da4665ecc8724beedb2baf249e5c6d Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Sun, 14 Nov 2021 19:09:36 +0800
Subject: [PATCH 1/4] add the old api back for backporting
---
src/Avalonia.Animation/Animation.cs | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs
index 172782c5a9..90134f3cdf 100644
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@@ -353,6 +353,12 @@ namespace Avalonia.Animation
return new CompositeDisposable(subscriptions);
}
+ ///
+ public Task RunAsync(Animatable control, IClock clock = null)
+ {
+ return RunAsync(control,clock, default);
+ }
+
///
public Task RunAsync(Animatable control, IClock clock = null, CancellationToken cancellationToken = default)
{
From 3a7298c39ff5ae1328cd6c46194934257f6d4c78 Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Sun, 14 Nov 2021 19:22:53 +0800
Subject: [PATCH 2/4] formatting
---
src/Avalonia.Animation/Animation.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs
index 90134f3cdf..a4515db514 100644
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@@ -356,9 +356,9 @@ namespace Avalonia.Animation
///
public Task RunAsync(Animatable control, IClock clock = null)
{
- return RunAsync(control,clock, default);
+ return RunAsync(control, clock, default);
}
-
+
///
public Task RunAsync(Animatable control, IClock clock = null, CancellationToken cancellationToken = default)
{
From f2d4ef25385467561cd1c6562eb2e804a6cb0459 Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Mon, 22 Nov 2021 19:31:07 +0800
Subject: [PATCH 3/4] add ApiCompatBaseline.txt
---
src/Avalonia.Animation/ApiCompatBaseline.txt | 6 ------
1 file changed, 6 deletions(-)
delete mode 100644 src/Avalonia.Animation/ApiCompatBaseline.txt
diff --git a/src/Avalonia.Animation/ApiCompatBaseline.txt b/src/Avalonia.Animation/ApiCompatBaseline.txt
deleted file mode 100644
index 58cb7830e7..0000000000
--- a/src/Avalonia.Animation/ApiCompatBaseline.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Compat issues with assembly Avalonia.Animation:
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.Animation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' is present in the contract but not in the implementation.
-MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' does not exist in the implementation but it does exist in the contract.
-InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock, System.Threading.CancellationToken)' is present in the implementation but not in the contract.
-Total Issues: 4
From 8e41e2f889d329b02976cf2ac02fa8b4b6e47f80 Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Mon, 22 Nov 2021 19:32:49 +0800
Subject: [PATCH 4/4] add ApiCompat
---
src/Avalonia.Animation/ApiCompatBaseline.txt | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 src/Avalonia.Animation/ApiCompatBaseline.txt
diff --git a/src/Avalonia.Animation/ApiCompatBaseline.txt b/src/Avalonia.Animation/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..973698f872
--- /dev/null
+++ b/src/Avalonia.Animation/ApiCompatBaseline.txt
@@ -0,0 +1,5 @@
+Compat issues with assembly Avalonia.Animation:
+InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' is present in the contract but not in the implementation.
+MembersMustExist : Member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock)' does not exist in the implementation but it does exist in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public System.Threading.Tasks.Task Avalonia.Animation.IAnimation.RunAsync(Avalonia.Animation.Animatable, Avalonia.Animation.IClock, System.Threading.CancellationToken)' is present in the implementation but not in the contract.
+Total Issues: 3