diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
index cb3ed03..2c93698 100644
Binary files a/.nuget/NuGet.exe and b/.nuget/NuGet.exe differ
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
index 46a1b6c..83fe906 100644
--- a/.nuget/NuGet.targets
+++ b/.nuget/NuGet.targets
@@ -18,9 +18,9 @@
-
+
@@ -50,9 +50,12 @@
-RequireConsent
-NonInteractive
+ "$(SolutionDir) "
+ "$(SolutionDir)"
+
- $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "
- $(NuGetCommand) pack "$(ProjectPath)" -Properties Configuration=$(Configuration) $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols
+ $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)
+ $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols
@@ -118,7 +121,7 @@
Log.LogMessage("Downloading latest version of NuGet.exe...");
WebClient webClient = new WebClient();
- webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
+ webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
return true;
}
diff --git a/PocketSharp.Examples/PocketSharp.Silverlight/MainPage.xaml.cs b/PocketSharp.Examples/PocketSharp.Silverlight/MainPage.xaml.cs
index 66c6a57..b924e24 100644
--- a/PocketSharp.Examples/PocketSharp.Silverlight/MainPage.xaml.cs
+++ b/PocketSharp.Examples/PocketSharp.Silverlight/MainPage.xaml.cs
@@ -35,8 +35,6 @@ namespace PocketSharp.Silverlight
private async void Button_Click(object sender, RoutedEventArgs e)
{
- // User: pocketsharp-tests
- // PW: pocketsharp
// !! please don't misuse this account !!
PocketClient client = new PocketClient(
consumerKey: "15396-f6f92101d72c8e270a6c9bb3",
diff --git a/PocketSharp.Examples/PocketSharp.WP8/ViewModels/MainViewModel.cs b/PocketSharp.Examples/PocketSharp.WP8/ViewModels/MainViewModel.cs
index e23909c..ae98d38 100644
--- a/PocketSharp.Examples/PocketSharp.WP8/ViewModels/MainViewModel.cs
+++ b/PocketSharp.Examples/PocketSharp.WP8/ViewModels/MainViewModel.cs
@@ -64,8 +64,6 @@ namespace PocketSharp.WP8.ViewModels
///
public async Task LoadData()
{
- // User: pocketsharp-tests
- // PW: pocketsharp
// !! please don't misuse this account !!
PocketClient client = new PocketClient(
consumerKey: "15396-f6f92101d72c8e270a6c9bb3",
diff --git a/PocketSharp.Examples/PocketSharp.Wpf/MainWindow.xaml.cs b/PocketSharp.Examples/PocketSharp.Wpf/MainWindow.xaml.cs
index d5157fc..7f79cd4 100644
--- a/PocketSharp.Examples/PocketSharp.Wpf/MainWindow.xaml.cs
+++ b/PocketSharp.Examples/PocketSharp.Wpf/MainWindow.xaml.cs
@@ -31,8 +31,6 @@ namespace PocketSharp.Wpf
private async void Button_Click(object sender, RoutedEventArgs e)
{
- // User: pocketsharp-tests
- // PW: pocketsharp
// !! please don't misuse this account !!
PocketClient client = new PocketClient(
consumerKey: "15396-f6f92101d72c8e270a6c9bb3",
diff --git a/PocketSharp.Tests/PocketSharp.Tests.csproj b/PocketSharp.Tests/PocketSharp.Tests.csproj
index 35505de..af99fe1 100644
--- a/PocketSharp.Tests/PocketSharp.Tests.csproj
+++ b/PocketSharp.Tests/PocketSharp.Tests.csproj
@@ -3,12 +3,12 @@
Debug
AnyCPU
- {F1CEA363-7039-40BA-9744-0071F46BB90C}
+ {CA3C491B-A8CA-426C-A0BB-E91636767467}
Library
Properties
PocketSharp.Tests
PocketSharp.Tests
- v4.0
+ v4.5
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
10.0
@@ -37,46 +37,24 @@
4
-
- False
- ..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.dll
+
+ ..\packages\Microsoft.Bcl.Async.1.0.16\lib\net45\Microsoft.Threading.Tasks.dll
-
- False
- ..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.Extensions.dll
-
-
- False
- ..\packages\Microsoft.Bcl.Async.1.0.16\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll
+
+ ..\packages\Microsoft.Bcl.Async.1.0.16\lib\net45\Microsoft.Threading.Tasks.Extensions.dll
-
- 3.5
-
-
- ..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.IO.dll
-
-
- False
- ..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.dll
-
+
- ..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.Extensions.dll
+ ..\packages\Microsoft.Net.Http.2.2.13\lib\net45\System.Net.Http.Extensions.dll
-
- False
- ..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.Primitives.dll
+
+ ..\packages\Microsoft.Net.Http.2.2.13\lib\net45\System.Net.Http.Primitives.dll
-
- False
- ..\packages\Microsoft.Net.Http.2.2.13\lib\net40\System.Net.Http.WebRequest.dll
-
-
- ..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Runtime.dll
-
-
- ..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Threading.Tasks.dll
+
+
+ ..\packages\xunit.1.9.2\lib\net20\xunit.dll
@@ -85,16 +63,18 @@
-
-
-
-
-
+
-
+
+
+
+ {817200c3-a327-4e35-9b5f-63a51c088577}
+ PocketSharp
+
+
diff --git a/PocketSharp.Tests/Properties/AssemblyInfo.cs b/PocketSharp.Tests/Properties/AssemblyInfo.cs
index 111ca0c..e85e4fb 100644
--- a/PocketSharp.Tests/Properties/AssemblyInfo.cs
+++ b/PocketSharp.Tests/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fbe5a0d2-d0de-44b1-8b8a-cf8cd3ac2230")]
+[assembly: Guid("87fcf138-5e6e-4584-ac3b-58c8ee6fccaa")]
// Version information for an assembly consists of the following four values:
//
diff --git a/PocketSharp.Tests/RetrieveTests.cs b/PocketSharp.Tests/RetrieveTests.cs
new file mode 100644
index 0000000..b42c995
--- /dev/null
+++ b/PocketSharp.Tests/RetrieveTests.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Xunit;
+using PocketSharp;
+using PocketSharp.Models;
+using System.Diagnostics;
+
+namespace PocketSharp.Tests
+{
+
+ public class RetrieveTests : IDisposable
+ {
+ private PocketClient client;
+
+
+ // setup
+ public RetrieveTests()
+ {
+ // !! please don't misuse this account !!
+ client = new PocketClient(
+ consumerKey: "15396-f6f92101d72c8e270a6c9bb3",
+ callbackUri: "http://frontendplay.com",
+ accessCode: "2c62cd50-b78a-5558-918b-65adae"
+ );
+ }
+
+
+ [Fact]
+ public async Task AreItemsRetrieved()
+ {
+ List items = await client.Retrieve();
+
+ Assert.True(items.Count > 0);
+ }
+
+
+ [Fact]
+ public async Task ItemContainsUri()
+ {
+ List items = await client.Retrieve(new RetrieveParameters()
+ {
+ Count = 1
+ });
+
+ Assert.True(items.Count == 1);
+
+ PocketItem item = items[0];
+
+ Assert.True(item.Uri.ToString().StartsWith("http"));
+ }
+
+
+ [Fact]
+ public async Task SearchReturnsResult()
+ {
+ List items = await client.Search("pocket");
+
+ Assert.True(items.Count > 0);
+ Assert.True(items[0].FullTitle.ToLower().Contains("pocket"));
+ }
+
+
+ [Fact]
+ public async Task SearchByTagsReturnsResult()
+ {
+ List items = await client.SearchByTag("pocket");
+
+ Assert.True(items.Count == 1);
+
+ bool found = false;
+
+ items[0].Tags.ForEach(tag =>
+ {
+ if (tag.Name.Contains("pocket"))
+ {
+ found = true;
+ }
+ });
+
+ Assert.True(found);
+ }
+ }
+}
diff --git a/PocketSharp.Tests/UnitTest1.cs b/PocketSharp.Tests/UnitTest1.cs
deleted file mode 100644
index b4dc156..0000000
--- a/PocketSharp.Tests/UnitTest1.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Threading.Tasks;
-
-namespace PocketSharp.Tests
-{
- [TestClass]
- public class UnitTest1
- {
- [TestMethod]
- public void TestMethod1()
- {
-
- }
- }
-}
diff --git a/PocketSharp.Tests/app.config b/PocketSharp.Tests/app.config
index 2263195..d0071f8 100644
--- a/PocketSharp.Tests/app.config
+++ b/PocketSharp.Tests/app.config
@@ -3,12 +3,8 @@
-
-
-
-
-
-
+
+
diff --git a/PocketSharp.Tests/packages.config b/PocketSharp.Tests/packages.config
index 4aa2591..d0f3b6c 100644
--- a/PocketSharp.Tests/packages.config
+++ b/PocketSharp.Tests/packages.config
@@ -1,7 +1,8 @@
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/PocketSharp.sln b/PocketSharp.sln
index b08fc53..89e25b5 100644
--- a/PocketSharp.sln
+++ b/PocketSharp.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Tests", "PocketSharp.Tests\PocketSharp.Tests.csproj", "{F1CEA363-7039-40BA-9744-0071F46BB90C}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp", "PocketSharp\PocketSharp.csproj", "{817200C3-A327-4E35-9B5F-63A51C088577}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Wpf", "PocketSharp.Examples\PocketSharp.Wpf\PocketSharp.Wpf.csproj", "{775569C2-987F-4AC4-8BA5-A315A21ED1B7}"
@@ -15,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Silverlight", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.WP8", "PocketSharp.Examples\PocketSharp.WP8\PocketSharp.WP8.csproj", "{47721A56-2128-4C5A-8B92-995FFC353304}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Tests", "PocketSharp.Tests\PocketSharp.Tests.csproj", "{CA3C491B-A8CA-426C-A0BB-E91636767467}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -25,14 +25,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|x86.ActiveCfg = Debug|Any CPU
- {F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|Any CPU.Build.0 = Release|Any CPU
- {F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|ARM.ActiveCfg = Release|Any CPU
- {F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|x86.ActiveCfg = Release|Any CPU
{817200C3-A327-4E35-9B5F-63A51C088577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{817200C3-A327-4E35-9B5F-63A51C088577}.Debug|Any CPU.Build.0 = Debug|Any CPU
{817200C3-A327-4E35-9B5F-63A51C088577}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -75,6 +67,14 @@ Global
{47721A56-2128-4C5A-8B92-995FFC353304}.Release|x86.ActiveCfg = Release|x86
{47721A56-2128-4C5A-8B92-995FFC353304}.Release|x86.Build.0 = Release|x86
{47721A56-2128-4C5A-8B92-995FFC353304}.Release|x86.Deploy.0 = Release|x86
+ {CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|ARM.ActiveCfg = Release|Any CPU
+ {CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/README.md b/README.md
index 345026c..2cea6db 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ Do a simple request - e.g. a search for `CSS`:
```csharp
var items = await _client.Search("css");
items.ForEach(
- item => Debug.Write(item.ID + " | " + item.Title)
+ item => Debug.WriteLine(item.ID + " | " + item.Title)
);
```