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/.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 @@
https://github.com/inflatablefriends/lastfm/blob/master/LICENCE.md
https://github.com/inflatablefriends/lastfm
false
- Portable Last.fm SDK for modern .NET platforms.
+ Portable Last.fm SDK for modern .NET platforms. Now with .NET Standard!
Copyright 2014 Inflatable Friends
- lastfm last.fm inflatable friends sdk api music metadata scrobble scrobbling portable
+ lastfm last.fm inflatable friends sdk api music metadata scrobble scrobbling portable netstandard
-
-
+
+
-
+
\ No newline at end of file
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/appveyor.yml b/appveyor.yml
index 8ad0d430..d5ba6ed7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,7 +4,7 @@
- master
- /v.*/
- version: 0.2.999.{build}
+ version: 1.0.999.{build}
assembly_info:
patch: true
@@ -91,6 +91,54 @@
branches:
only:
- release
+
+ # don't forget to update this!
+ version: 1.0.0.{build}
+
+ assembly_info:
+ patch: true
+ file: AssemblyInfo.*
+ assembly_version: "{version}"
+ assembly_file_version: "{version}"
+ assembly_informational_version: "{version}"
+
+ configuration: Release
+
+ before_build:
+ - ps: nuget restore IF.Lastfm.sln
+
+ build:
+ project: IF.Lastfm.sln
+
+ test_script:
+ - ps: .\run-tests.ps1
+
+ after_test:
+ - ps: pushd .nuget
+ - ps: .\pack.ps1
+ - ps: popd
+ - ps: cp .\.nuget\*.nupkg .
+
+ artifacts:
+ - path: src\IF.Lastfm.Core\bin\Release\IF.Lastfm.Core.dll
+ name: IF.Lastfm.Core.dll
+ - path: src\IF.Lastfm.SQLite\bin\Release\IF.Lastfm.SQLite.dll
+ name: IF.Lastfm.SQLite.dll
+ - path: '\*.nupkg'
+
+ deploy:
+ provider: NuGet
+ api_key:
+ secure: b4Q8KLmOfeQHZNGbTf4OYud3pvi3aR4rKE35dcLHYBTBaQwc9QeoIkDoG13Jpbxs
+ artifact: /.*\.nupkg/
+
+ notifications:
+ - provider: Webhook # ping Gitter ticker
+ url: https://webhooks.gitter.im/e/aa615fb57d382a430815
+
+-
+ branches:
+ only:
- release-profile259
# don't forget to update this!
diff --git a/src/IF.Lastfm.Core/IF.Lastfm.Core.csproj b/src/IF.Lastfm.Core/IF.Lastfm.Core.csproj
index 7d80b04b..5a702994 100644
--- a/src/IF.Lastfm.Core/IF.Lastfm.Core.csproj
+++ b/src/IF.Lastfm.Core/IF.Lastfm.Core.csproj
@@ -2,7 +2,7 @@
- 11.0
+ 14.0
Debug
AnyCPU
{3CF4B78F-8B48-49CB-942F-83DB13474A4F}
@@ -13,11 +13,13 @@
en-US
512
{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile259
- v4.5
+
+
+ v5.0
..\..\
true
- b5668f17
+
+
true
@@ -159,25 +161,9 @@
-
-
- ..\..\packages\Newtonsoft.Json.6.0.8\lib\portable-net45+wp80+win8+wpa81+aspnetcore50\Newtonsoft.Json.dll
-
-
- ..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll
-
-
- ..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll
-
-
- ..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll
-
-
-
- Designer
-
+
@@ -186,9 +172,7 @@
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}.
-
-