From 26251314229130ba92f2e332dfc1e2cc6a98c1a7 Mon Sep 17 00:00:00 2001
From: Rikki Tooley <hello@rikk.it>
Date: Wed, 30 Nov 2016 03:18:39 +0000
Subject: [PATCH 1/4] Support .Net Standard 1.1 #88 - Upgrade JSON.NET from
 6.0.8 to 9.0.1 - Change from Microsoft.Net.Http 2.2.28 to System.Net.Http
 4.3.0 (this package doesn't support .Net Standard 1.0) - This commit
 deprecates support for Windows Phone Silverlight 8.0 - Remove
 IF.Lastfm.SQLite project from the solution so it can be upgraded to .Net
 Standard separately

---
 .gitignore                                    |  1 +
 IF.Lastfm.sln                                 | 55 +------------------
 src/IF.Lastfm.Core/IF.Lastfm.Core.csproj      | 30 +++-------
 src/IF.Lastfm.Core/packages.config            |  7 ---
 src/IF.Lastfm.Core/project.json               | 12 ++++
 .../IF.Lastfm.SQLite.Tests.Integration.csproj |  4 --
 6 files changed, 21 insertions(+), 88 deletions(-)
 delete mode 100644 src/IF.Lastfm.Core/packages.config
 create mode 100644 src/IF.Lastfm.Core/project.json

diff --git a/.gitignore b/.gitignore
index 1a133f93..0e4c1d7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,3 +110,4 @@ Desktop.ini
 # ReportGenerator and Syro dump stuff in this folder
 /tmp
 /IF.Lastfm.sln.ide
+project.lock.json
diff --git a/IF.Lastfm.sln b/IF.Lastfm.sln
index e410e1d3..aef239bb 100644
--- a/IF.Lastfm.sln
+++ b/IF.Lastfm.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.22310.1
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IF.Lastfm.Core.Tests", "src\IF.Lastfm.Core.Tests\IF.Lastfm.Core.Tests.csproj", "{EC1526C6-AE22-4F12-8640-F9613DFCCE1A}"
 EndProject
@@ -19,10 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IF.Lastfm.Core.Tests.Integr
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5185BD96-FDB5-4DB2-A967-9152D6556150}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IF.Lastfm.SQLite.Tests.Integration", "src\IF.Lastfm.SQLite.Tests.Integration\IF.Lastfm.SQLite.Tests.Integration.csproj", "{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IF.Lastfm.SQLite", "src\IF.Lastfm.SQLite\IF.Lastfm.SQLite.csproj", "{09D7D389-7D67-45B7-90EC-B1D20693DBC5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug ARM|Any CPU = Debug ARM|Any CPU
@@ -101,54 +97,6 @@ Global
 		{39C00A2D-9896-4392-B751-540CD16B3315}.Release|ARM.ActiveCfg = Release|Any CPU
 		{39C00A2D-9896-4392-B751-540CD16B3315}.Release|x64.ActiveCfg = Release|Any CPU
 		{39C00A2D-9896-4392-B751-540CD16B3315}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug ARM|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug ARM|Any CPU.Build.0 = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug ARM|ARM.ActiveCfg = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug ARM|ARM.Build.0 = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug ARM|x64.ActiveCfg = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug ARM|x64.Build.0 = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug ARM|x86.ActiveCfg = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug ARM|x86.Build.0 = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug|ARM.Build.0 = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug|x64.Build.0 = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Debug|x86.Build.0 = Debug|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Release|ARM.ActiveCfg = Release|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Release|ARM.Build.0 = Release|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Release|x64.ActiveCfg = Release|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Release|x64.Build.0 = Release|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000}.Release|x86.Build.0 = Release|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug ARM|Any CPU.ActiveCfg = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug ARM|Any CPU.Build.0 = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug ARM|ARM.ActiveCfg = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug ARM|ARM.Build.0 = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug ARM|x64.ActiveCfg = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug ARM|x64.Build.0 = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug ARM|x86.ActiveCfg = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug ARM|x86.Build.0 = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug|ARM.Build.0 = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug|x64.Build.0 = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Debug|x86.Build.0 = Debug|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Release|ARM.ActiveCfg = Release|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Release|ARM.Build.0 = Release|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Release|x64.ActiveCfg = Release|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Release|x64.Build.0 = Release|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Release|x86.ActiveCfg = Release|Any CPU
-		{09D7D389-7D67-45B7-90EC-B1D20693DBC5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -156,6 +104,5 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{EC1526C6-AE22-4F12-8640-F9613DFCCE1A} = {5185BD96-FDB5-4DB2-A967-9152D6556150}
 		{39C00A2D-9896-4392-B751-540CD16B3315} = {5185BD96-FDB5-4DB2-A967-9152D6556150}
-		{3F182AD9-AD85-4CE0-BBB1-8BA0A8D22000} = {5185BD96-FDB5-4DB2-A967-9152D6556150}
 	EndGlobalSection
 EndGlobal
diff --git a/src/IF.Lastfm.Core/IF.Lastfm.Core.csproj b/src/IF.Lastfm.Core/IF.Lastfm.Core.csproj
index abd865fe..e4e27c0b 100644
--- a/src/IF.Lastfm.Core/IF.Lastfm.Core.csproj
+++ b/src/IF.Lastfm.Core/IF.Lastfm.Core.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{3CF4B78F-8B48-49CB-942F-83DB13474A4F}</ProjectGuid>
@@ -13,11 +13,13 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>b5668f17</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -158,25 +160,9 @@
     </Compile>
     <Compile Include="Scrobblers\ScrobbleResponse.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\portable-net45+wp80+win8+wpa81+aspnetcore50\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http">
-      <HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http.Extensions">
-      <HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http.Primitives">
-      <HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="project.json" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
@@ -185,9 +171,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/IF.Lastfm.Core/packages.config b/src/IF.Lastfm.Core/packages.config
deleted file mode 100644
index 0d65e162..00000000
--- a/src/IF.Lastfm.Core/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Bcl" version="1.1.9" targetFramework="portable-net45+win+wpa81+wp80" />
-  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable-net45+win+wpa81+wp80" />
-  <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="portable-net45+win+wpa81+wp80" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="portable-net45+win+wpa81+wp80" />
-</packages>
\ No newline at end of file
diff --git a/src/IF.Lastfm.Core/project.json b/src/IF.Lastfm.Core/project.json
new file mode 100644
index 00000000..46d87838
--- /dev/null
+++ b/src/IF.Lastfm.Core/project.json
@@ -0,0 +1,12 @@
+{
+  "supports": {},
+  "dependencies": {
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
+    "NETStandard.Library": "1.6.1",
+    "Newtonsoft.Json": "9.0.1",
+    "System.Net.Http": "4.3.0"
+  },
+  "frameworks": {
+    "netstandard1.1": {}
+  }
+}
\ No newline at end of file
diff --git a/src/IF.Lastfm.SQLite.Tests.Integration/IF.Lastfm.SQLite.Tests.Integration.csproj b/src/IF.Lastfm.SQLite.Tests.Integration/IF.Lastfm.SQLite.Tests.Integration.csproj
index 8d9dde8a..ee1e179a 100644
--- a/src/IF.Lastfm.SQLite.Tests.Integration/IF.Lastfm.SQLite.Tests.Integration.csproj
+++ b/src/IF.Lastfm.SQLite.Tests.Integration/IF.Lastfm.SQLite.Tests.Integration.csproj
@@ -91,10 +91,6 @@
       <Project>{3cf4b78f-8b48-49cb-942f-83db13474a4f}</Project>
       <Name>IF.Lastfm.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\IF.Lastfm.SQLite\IF.Lastfm.SQLite.csproj">
-      <Project>{09d7d389-7d67-45b7-90ec-b1d20693dbc5}</Project>
-      <Name>IF.Lastfm.SQLite</Name>
-    </ProjectReference>
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">

From 1a81ace49d44830cddf4d6043cff4521d92f0454 Mon Sep 17 00:00:00 2001
From: Rikki Tooley <hello@rikk.it>
Date: Wed, 30 Nov 2016 03:46:48 +0000
Subject: [PATCH 2/4] Bump version to 1.0.0

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6d6fc510..7d62f50c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -49,7 +49,7 @@
       - release
 
   # don't forget to update this!
-  version: 0.2.4.{build}
+  version: 1.0.0.{build}
 
   assembly_info:
     patch: true

From 1bb51e9fe9ee30b537392c51bc53ed7e9d066892 Mon Sep 17 00:00:00 2001
From: Rikki Tooley <hello@rikk.it>
Date: Wed, 30 Nov 2016 04:39:28 +0000
Subject: [PATCH 3/4] Bump version for master builds as well

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7d62f50c..30e15ab0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,7 +4,7 @@
       - master
       - /v.*/
 
-  version: 0.2.999.{build}
+  version: 0.9.999.{build}
 
   assembly_info:
     patch: true

From 7a3af103e381d82199f28adae37ff9de5355b73b Mon Sep 17 00:00:00 2001
From: Rikki Tooley <hello@rikk.it>
Date: Sat, 3 Dec 2016 20:14:50 +0000
Subject: [PATCH 4/4] Update nuspec for .NET Standard - though apparently this
 is not necessary, need to investigate nuget pack <project.json> command

---
 .nuget/Inflatable.Lastfm.nuspec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.nuget/Inflatable.Lastfm.nuspec b/.nuget/Inflatable.Lastfm.nuspec
index 760e7e3d..6c33c41d 100644
--- a/.nuget/Inflatable.Lastfm.nuspec
+++ b/.nuget/Inflatable.Lastfm.nuspec
@@ -8,15 +8,15 @@
 		<licenseUrl>https://github.com/inflatablefriends/lastfm/blob/master/LICENCE.md</licenseUrl>
 		<projectUrl>https://github.com/inflatablefriends/lastfm</projectUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Portable Last.fm SDK for modern .NET platforms.</description>
+		<description>Portable Last.fm SDK for modern .NET platforms. Now with .NET Standard!</description>
 		<copyright>Copyright 2014 Inflatable Friends</copyright>
-		<tags>lastfm last.fm inflatable friends sdk api music metadata scrobble scrobbling portable</tags>
+		<tags>lastfm last.fm inflatable friends sdk api music metadata scrobble scrobbling portable netstandard</tags>
 		<dependencies>
-			<dependency id="Newtonsoft.Json" version="6.0.5"/>
-			<dependency id="Microsoft.Net.Http" version="2.2.28"/>
+			<dependency id="Newtonsoft.Json" version="9.0.1"/>
+			<dependency id="System.Net.Http" version="4.3.0"/>
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="..\src\IF.Lastfm.Core\bin\Release\IF.Lastfm.Core.dll" target="lib\portable-win8+net45+wp8+wpa81"/>
+		<file src="..\src\IF.Lastfm.Core\bin\Release\IF.Lastfm.Core.dll" target="lib\netstandard1.1"/>
 	</files>
 </package>
\ No newline at end of file