diff --git a/DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj b/DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj
index d3f02f833..4ba92430f 100644
--- a/DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj
+++ b/DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj
@@ -65,7 +65,7 @@
-
+
@@ -74,8 +74,8 @@
-
-
+
+
diff --git a/DeviceTests/DeviceTests.Shared/Clipboard_Tests.cs b/DeviceTests/DeviceTests.Shared/Clipboard_Tests.cs
index 0bfac6b0e..83ae4dd8e 100644
--- a/DeviceTests/DeviceTests.Shared/Clipboard_Tests.cs
+++ b/DeviceTests/DeviceTests.Shared/Clipboard_Tests.cs
@@ -13,10 +13,7 @@ public Task Set_Clipboard_Values(string text)
{
return Utils.OnMainThread(async () =>
{
- Clipboard.SetText(text);
-
- await Task.Delay(100);
-
+ await Clipboard.SetTextAsync(text);
Assert.True(Clipboard.HasText);
});
}
@@ -28,7 +25,7 @@ public Task Get_Clipboard_Values(string text)
{
return Utils.OnMainThread(async () =>
{
- Clipboard.SetText(text);
+ await Clipboard.SetTextAsync(text);
var clipText = await Clipboard.GetTextAsync();
Assert.NotNull(clipText);
diff --git a/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj b/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
index 56267a795..2ad635c8e 100644
--- a/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
+++ b/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
@@ -29,17 +29,17 @@
pdbonly
-
+
-
-
+
+
-
+
Windows Mobile Extensions for the UWP
diff --git a/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj b/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj
index 0c64d715e..47eec6b4f 100644
--- a/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj
+++ b/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj
@@ -127,9 +127,9 @@
-
-
-
+
+
+
diff --git a/DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj b/DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj
index bd81986ae..27923203a 100644
--- a/DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj
+++ b/DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj
@@ -110,9 +110,9 @@
-
-
-
+
+
+
diff --git a/Samples/Samples.Android/Samples.Android.csproj b/Samples/Samples.Android/Samples.Android.csproj
index b3bf5896d..fb630c60f 100644
--- a/Samples/Samples.Android/Samples.Android.csproj
+++ b/Samples/Samples.Android/Samples.Android.csproj
@@ -86,7 +86,7 @@
1.10.0
-
+
diff --git a/Samples/Samples.UWP/Samples.UWP.csproj b/Samples/Samples.UWP/Samples.UWP.csproj
index 891d03dc1..5bda58f75 100644
--- a/Samples/Samples.UWP/Samples.UWP.csproj
+++ b/Samples/Samples.UWP/Samples.UWP.csproj
@@ -138,7 +138,7 @@
1.10.0
-
+
diff --git a/Samples/Samples.iOS/Samples.iOS.csproj b/Samples/Samples.iOS/Samples.iOS.csproj
index f0d2a0d26..7221ab237 100644
--- a/Samples/Samples.iOS/Samples.iOS.csproj
+++ b/Samples/Samples.iOS/Samples.iOS.csproj
@@ -110,7 +110,7 @@
1.10.0
-
+
diff --git a/Samples/Samples/Samples.csproj b/Samples/Samples/Samples.csproj
index 7f9d31395..ed3c1829a 100644
--- a/Samples/Samples/Samples.csproj
+++ b/Samples/Samples/Samples.csproj
@@ -23,7 +23,7 @@
-
+
diff --git a/Samples/Samples/ViewModel/ClipboardViewModel.cs b/Samples/Samples/ViewModel/ClipboardViewModel.cs
index d619148d5..73dc02a0e 100644
--- a/Samples/Samples/ViewModel/ClipboardViewModel.cs
+++ b/Samples/Samples/ViewModel/ClipboardViewModel.cs
@@ -24,7 +24,7 @@ public string FieldValue
set => SetProperty(ref fieldValue, value);
}
- void OnCopy() => Clipboard.SetText(FieldValue);
+ async void OnCopy() => await Clipboard.SetTextAsync(FieldValue);
async void OnPaste()
{
diff --git a/Tests/Clipboard_Tests.cs b/Tests/Clipboard_Tests.cs
index 80ded8c41..bbca653c7 100644
--- a/Tests/Clipboard_Tests.cs
+++ b/Tests/Clipboard_Tests.cs
@@ -7,21 +7,15 @@ namespace Tests
public class Clipboard_Tests
{
[Fact]
- public void Clipboard_SetText_Fail_On_NetStandard()
- {
- Assert.Throws(() => Clipboard.SetText("Text"));
- }
+ public async Task Clipboard_SetText_Fail_On_NetStandard() =>
+ await Assert.ThrowsAsync(() => Clipboard.SetTextAsync("Text"));
[Fact]
- public void Clipboard_HasText_Fail_On_NetStandard()
- {
+ public void Clipboard_HasText_Fail_On_NetStandard() =>
Assert.Throws(() => Clipboard.HasText);
- }
[Fact]
- public async Task Clipboard_GetText_Fail_On_NetStandard()
- {
+ public async Task Clipboard_GetText_Fail_On_NetStandard() =>
await Assert.ThrowsAsync(() => Clipboard.GetTextAsync());
- }
}
}
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 01460134a..d312b16f0 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -9,8 +9,11 @@
-
-
+
+
+ all
+ runtime; build; native; contentfiles; analyzers
+
diff --git a/Xamarin.Essentials/Clipboard/Clipboard.android.cs b/Xamarin.Essentials/Clipboard/Clipboard.android.cs
index 2540d7e98..7d8acecb7 100644
--- a/Xamarin.Essentials/Clipboard/Clipboard.android.cs
+++ b/Xamarin.Essentials/Clipboard/Clipboard.android.cs
@@ -5,8 +5,11 @@ namespace Xamarin.Essentials
{
public static partial class Clipboard
{
- static void PlatformSetText(string text)
- => Platform.ClipboardManager.PrimaryClip = ClipData.NewPlainText("Text", text);
+ static Task PlatformSetTextAsync(string text)
+ {
+ Platform.ClipboardManager.PrimaryClip = ClipData.NewPlainText("Text", text);
+ return Task.CompletedTask;
+ }
static bool PlatformHasText
=> Platform.ClipboardManager.HasPrimaryClip;
diff --git a/Xamarin.Essentials/Clipboard/Clipboard.ios.cs b/Xamarin.Essentials/Clipboard/Clipboard.ios.cs
index ed5a77c26..569021e47 100644
--- a/Xamarin.Essentials/Clipboard/Clipboard.ios.cs
+++ b/Xamarin.Essentials/Clipboard/Clipboard.ios.cs
@@ -5,8 +5,11 @@ namespace Xamarin.Essentials
{
public static partial class Clipboard
{
- static void PlatformSetText(string text)
- => UIPasteboard.General.String = text;
+ static Task PlatformSetTextAsync(string text)
+ {
+ UIPasteboard.General.String = text;
+ return Task.CompletedTask;
+ }
static bool PlatformHasText
=> UIPasteboard.General.HasStrings;
diff --git a/Xamarin.Essentials/Clipboard/Clipboard.netstandard.cs b/Xamarin.Essentials/Clipboard/Clipboard.netstandard.cs
index 2965fb456..7c2d4cd6c 100644
--- a/Xamarin.Essentials/Clipboard/Clipboard.netstandard.cs
+++ b/Xamarin.Essentials/Clipboard/Clipboard.netstandard.cs
@@ -4,7 +4,7 @@ namespace Xamarin.Essentials
{
public static partial class Clipboard
{
- static void PlatformSetText(string text)
+ static Task PlatformSetTextAsync(string text)
=> throw new NotImplementedInReferenceAssemblyException();
static bool PlatformHasText
diff --git a/Xamarin.Essentials/Clipboard/Clipboard.shared.cs b/Xamarin.Essentials/Clipboard/Clipboard.shared.cs
index 20ac4d25f..a490949de 100644
--- a/Xamarin.Essentials/Clipboard/Clipboard.shared.cs
+++ b/Xamarin.Essentials/Clipboard/Clipboard.shared.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
namespace Xamarin.Essentials
{
public static partial class Clipboard
{
- public static void SetText(string text)
- => PlatformSetText(text);
+ public static Task SetTextAsync(string text)
+ => PlatformSetTextAsync(text);
public static bool HasText
=> PlatformHasText;
diff --git a/Xamarin.Essentials/Clipboard/Clipboard.uwp.cs b/Xamarin.Essentials/Clipboard/Clipboard.uwp.cs
index 5730fbca2..9678a3476 100644
--- a/Xamarin.Essentials/Clipboard/Clipboard.uwp.cs
+++ b/Xamarin.Essentials/Clipboard/Clipboard.uwp.cs
@@ -2,25 +2,26 @@
using System.Threading.Tasks;
using Windows.ApplicationModel.DataTransfer;
-using static Windows.ApplicationModel.DataTransfer.Clipboard;
+using WindowsClipboard = Windows.ApplicationModel.DataTransfer.Clipboard;
namespace Xamarin.Essentials
{
public static partial class Clipboard
{
- static void PlatformSetText(string text)
+ static Task PlatformSetTextAsync(string text)
{
var dataPackage = new DataPackage();
dataPackage.SetText(text);
- SetContent(dataPackage);
+ WindowsClipboard.SetContent(dataPackage);
+ return Task.CompletedTask;
}
static bool PlatformHasText
- => GetContent().Contains(StandardDataFormats.Text);
+ => WindowsClipboard.GetContent().Contains(StandardDataFormats.Text);
static Task PlatformGetTextAsync()
{
- var clipboardContent = GetContent();
+ var clipboardContent = WindowsClipboard.GetContent();
return clipboardContent.Contains(StandardDataFormats.Text)
? clipboardContent.GetTextAsync().AsTask()
: Task.FromResult(null);
diff --git a/Xamarin.Essentials/Xamarin.Essentials.csproj b/Xamarin.Essentials/Xamarin.Essentials.csproj
index bf7f8741f..3587d7d15 100644
--- a/Xamarin.Essentials/Xamarin.Essentials.csproj
+++ b/Xamarin.Essentials/Xamarin.Essentials.csproj
@@ -55,7 +55,7 @@
-
+
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index cf33dd2da..12895551b 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -83,7 +83,7 @@
-
+
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 2412c1c85..4132f87a1 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -83,7 +83,7 @@
-
+
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 09dcad344..6624dfea1 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -83,7 +83,7 @@
-
+
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index 49195f6de..82ae43183 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -83,7 +83,7 @@
-
+
diff --git a/docs/en/Xamarin.Essentials/Clipboard.xml b/docs/en/Xamarin.Essentials/Clipboard.xml
index 11a0719ad..c594f4454 100644
--- a/docs/en/Xamarin.Essentials/Clipboard.xml
+++ b/docs/en/Xamarin.Essentials/Clipboard.xml
@@ -61,16 +61,16 @@
-
-
-
+
+
+
Method
1.0.0.0
Xamarin.Essentials
- System.Void
+ System.Threading.Tasks.Task