diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 0000000..c4ba765 --- /dev/null +++ b/.github/workflows/dotnet.yml @@ -0,0 +1,28 @@ +name: dotnet package + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + matrix: + dotnet-version: [ '6.0.x' ] + + steps: + - uses: actions/checkout@v3 + - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} + uses: actions/setup-dotnet@v3 + with: + dotnet-version: ${{ matrix.dotnet-version }} + - name: Install dependencies + run: dotnet restore ./src/Hqub.MusicBrainz.sln + - name: Build + run: dotnet build ./src/Hqub.MusicBrainz.sln --configuration Release + - name: Test + run: dotnet test ./src/Hqub.MusicBrainz.Tests/Hqub.MusicBrainz.Tests.csproj --verbosity normal diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 86b7ed7..0000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -language: csharp -mono: none -sudo: required -dist: xenial -dotnet: 6.0 -script: - - cd Hqub.MusicBrainz - - dotnet restore - - dotnet test -c Travis Hqub.MusicBrainz.API.Test/Hqub.MusicBrainz.API.Test.csproj -global: - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true - - DOTNET_CLI_TELEMETRY_OPTOUT=1 \ No newline at end of file diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Configuration.cs b/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Configuration.cs deleted file mode 100644 index 4b96a61..0000000 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Configuration.cs +++ /dev/null @@ -1,35 +0,0 @@ - -namespace Hqub.MusicBrainz.API -{ - using Hqub.MusicBrainz.API.Cache; - using System; - using System.Net; - - /// - /// Hqub.MusicBrainz configuration. - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static class Configuration - { - static Configuration() - { - Proxy = null; - UserAgent = "Hqub.MusicBrainz/2.0"; - } - - /// - /// Gets or sets a used to query the webservice. - /// - public static IWebProxy Proxy { get; set; } - - /// - /// Gets or sets a custom user agent string. - /// - public static string UserAgent { get; set; } - - /// - /// Gets or sets the request cache. - /// - public static IRequestCache Cache { get; set; } - } -} diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Artist.Obsolete.cs b/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Artist.Obsolete.cs deleted file mode 100644 index 5136d5e..0000000 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Artist.Obsolete.cs +++ /dev/null @@ -1,110 +0,0 @@ - -namespace Hqub.MusicBrainz.API.Entities -{ - using Hqub.MusicBrainz.API.Entities.Collections; - using System; - using System.Threading.Tasks; - - partial class Artist - { - #region Static Methods - - [Obsolete("Use async method instead.")] - public static Artist Get(string id, params string[] inc) - { - return GetAsync(id, inc).Result; - } - - [Obsolete("Use async method instead.")] - public static ArtistList Search(string query, int limit = 25, int offset = 0) - { - return SearchAsync(query, limit, offset).Result; - } - - [Obsolete("Use async method instead.")] - public static ArtistList Browse(string relatedEntity, string value, int limit = 25, int offset = 0, params string[] inc) - { - return BrowseAsync(relatedEntity, value, limit, offset, inc).Result; - } - - /// - /// Lookup an artist in the MusicBrainz database. - /// - /// The artist MusicBrainz id. - /// A list of entities to include (subqueries). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task GetAsync(string id, params string[] inc) - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "id")); - } - - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.Artists.GetAsync(id, inc); - } - - /// - /// Search for an artist in the MusicBrainz database, matching the given query. - /// - /// The query string. - /// The maximum number of artists to return (default = 25). - /// The offset to the artists list (enables paging, default = 0). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task SearchAsync(string query, int limit = 25, int offset = 0) - { - if (string.IsNullOrEmpty(query)) - { - throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "query")); - } - - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.Artists.SearchAsync(query, limit, offset); - } - - /// - /// Search for an artist in the MusicBrainz database, matching the given query. - /// - /// The query parameters. - /// The maximum number of artists to return (default = 25). - /// The offset to the artists list (enables paging, default = 0). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task SearchAsync(QueryParameters query, int limit = 25, int offset = 0) - { - return await SearchAsync(query.ToString(), limit, offset); - } - - /// - /// Browse all the artists in the MusicBrainz database, which are directly linked to the entity with given id. - /// - /// The name of the related entity. - /// The id of the related entity. - /// The maximum number of artists to return (default = 25). - /// The offset to the artists list (enables paging, default = 0). - /// A list of entities to include (subqueries). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc) - { - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.Artists.BrowseAsync(entity, id, limit, offset, inc); - } - - #endregion - } -} \ No newline at end of file diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Recording.Obsolete.cs b/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Recording.Obsolete.cs deleted file mode 100644 index dfdd241..0000000 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Recording.Obsolete.cs +++ /dev/null @@ -1,110 +0,0 @@ - -namespace Hqub.MusicBrainz.API.Entities -{ - using Hqub.MusicBrainz.API.Entities.Collections; - using System; - using System.Threading.Tasks; - - partial class Recording - { - #region Static methods - - [Obsolete("Use async method instead.")] - public static Recording Get(string id, params string[] inc) - { - return GetAsync(id, inc).Result; - } - - [Obsolete("Use async method instead.")] - public static RecordingList Search(string query, int limit = 25, int offset = 0) - { - return SearchAsync(query, limit, offset).Result; - } - - [Obsolete("Use async method instead.")] - public static RecordingList Browse(string relatedEntity, string value, int limit = 25, int offset = 0, params string[] inc) - { - return BrowseAsync(relatedEntity, value, limit, offset, inc).Result; - } - - /// - /// Lookup an recording in the MusicBrainz database. - /// - /// The recording MusicBrainz id. - /// A list of entities to include (subqueries). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task GetAsync(string id, params string[] inc) - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "id")); - } - - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.Recordings.GetAsync(id, inc); - } - - /// - /// Search for an recording in the MusicBrainz database, matching the given query. - /// - /// The query string. - /// The maximum number of recordings to return (default = 25). - /// The offset to the recordings list (enables paging, default = 0). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task SearchAsync(string query, int limit = 25, int offset = 0) - { - if (string.IsNullOrEmpty(query)) - { - throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "query")); - } - - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.Recordings.SearchAsync(query, limit, offset); - } - - /// - /// Search for an recording in the MusicBrainz database, matching the given query. - /// - /// The query parameters. - /// The maximum number of recordings to return (default = 25). - /// The offset to the recordings list (enables paging, default = 0). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task SearchAsync(QueryParameters query, int limit = 25, int offset = 0) - { - return await SearchAsync(query.ToString(), limit, offset); - } - - /// - /// Browse all the recordings in the MusicBrainz database, which are directly linked to the entity with given id. - /// - /// The name of the related entity. - /// The id of the related entity. - /// The maximum number of recordings to return (default = 25). - /// The offset to the recordings list (enables paging, default = 0). - /// A list of entities to include (subqueries). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc) - { - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.Recordings.BrowseAsync(entity, id, limit, offset, inc); - } - - #endregion - } -} \ No newline at end of file diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Release.Obsolete.cs b/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Release.Obsolete.cs deleted file mode 100644 index 217c3e4..0000000 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Release.Obsolete.cs +++ /dev/null @@ -1,130 +0,0 @@ - -namespace Hqub.MusicBrainz.API.Entities -{ - using Hqub.MusicBrainz.API.Entities.Collections; - using System; - using System.Threading.Tasks; - - partial class Release - { - #region Static Methods - - [Obsolete("Use async method instead.")] - public static Release Get(string id, params string[] inc) - { - return GetAsync(id, inc).Result; - } - - [Obsolete("Use async method instead.")] - public static ReleaseList Search(string query, int limit = 25, int offset = 0) - { - return SearchAsync(query, limit, offset).Result; - } - - /// - /// Lookup a release in the MusicBrainz database. - /// - /// The release MusicBrainz id. - /// A list of entities to include (subqueries). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task GetAsync(string id, params string[] inc) - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "id")); - } - - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.Releases.GetAsync(id, inc); - } - - /// - /// Search for a release in the MusicBrainz database, matching the given query. - /// - /// The query string. - /// The maximum number of releases to return (default = 25). - /// The offset to the releases list (enables paging, default = 0). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task SearchAsync(string query, int limit = 25, int offset = 0) - { - if (string.IsNullOrEmpty(query)) - { - throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "query")); - } - - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.Releases.SearchAsync(query, limit, offset); - } - - /// - /// Search for a release in the MusicBrainz database, matching the given query. - /// - /// The query parameters. - /// The maximum number of releases to return (default = 25). - /// The offset to the releases list (enables paging, default = 0). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task SearchAsync(QueryParameters query, int limit = 25, int offset = 0) - { - return await SearchAsync(query.ToString(), limit, offset); - } - - /// - /// Browse all the releases in the MusicBrainz database, which are directly linked to the entity with given id. - /// - /// The name of the related entity. - /// The id of the related entity. - /// The maximum number of releases to return (default = 25). - /// The offset to the releases list (enables paging, default = 0). - /// A list of entities to include (subqueries). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task BrowseAsync(string entity, string id, int limit = 25, - int offset = 0, params string[] inc) - { - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.Releases.BrowseAsync(entity, id, limit, offset, inc); - } - - /// - /// Browse all the releases in the MusicBrainz database, which are directly linked to the entity with given id. - /// - /// The name of the related entity. - /// The id of the related entity. - /// If releases or release-groups are included in the result, filter by type (for example 'album'). - /// If releases are included in the result, filter by status (for example 'official', default = null). - /// The maximum number of releases to return (default = 25). - /// The offset to the releases list (enables paging, default = 0). - /// A list of entities to include (subqueries). - /// - /// - /// See http://musicbrainz.org/doc/Development/XML_Web_Service/Version_2#Release_Type_and_Status for supported values of type and status. - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task BrowseAsync(string entity, string id, string type, string status = null, int limit = 25, int offset = 0, params string[] inc) - { - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.Releases.BrowseAsync(entity, id, type, status, limit, offset, inc); - } - - #endregion - } -} \ No newline at end of file diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/ReleaseGroup.Obsolete.cs b/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/ReleaseGroup.Obsolete.cs deleted file mode 100644 index e54905c..0000000 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/ReleaseGroup.Obsolete.cs +++ /dev/null @@ -1,134 +0,0 @@ - -namespace Hqub.MusicBrainz.API.Entities -{ - using Hqub.MusicBrainz.API.Entities.Collections; - using System; - using System.Threading.Tasks; - - partial class ReleaseGroup - { - #region Static Methods - - [Obsolete("Use async method instead.")] - public static ReleaseGroup Get(string id, params string[] inc) - { - return GetAsync(id, inc).Result; - } - - [Obsolete("Use async method instead.")] - public static ReleaseGroupList Search(string query, int limit = 25, int offset = 0) - { - return SearchAsync(query, limit, offset).Result; - } - - [Obsolete("Use async method instead.")] - public static ReleaseGroupList Browse(string relatedEntity, string value, int limit = 25, int offset = 0, params string[] inc) - { - return BrowseAsync(relatedEntity, value, limit, offset, inc).Result; - } - - /// - /// Lookup a release-group in the MusicBrainz database. - /// - /// The release-group MusicBrainz id. - /// A list of entities to include (subqueries). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task GetAsync(string id, params string[] inc) - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "id")); - } - - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.ReleaseGroups.GetAsync(id, inc); - } - - /// - /// Search for a release-group in the MusicBrainz database, matching the given query. - /// - /// The query string. - /// The maximum number of release-groups to return (default = 25). - /// The offset to the release-groups list (enables paging, default = 0). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task SearchAsync(string query, int limit = 25, int offset = 0) - { - if (string.IsNullOrEmpty(query)) - { - throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "query")); - } - - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.ReleaseGroups.SearchAsync(query, limit, offset); - } - - /// - /// Search for a release-group in the MusicBrainz database, matching the given query. - /// - /// The query parameters. - /// The maximum number of release-groups to return (default = 25). - /// The offset to the release-groups list (enables paging, default = 0). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task SearchAsync(QueryParameters query, int limit = 25, int offset = 0) - { - return await SearchAsync(query.ToString(), limit, offset); - } - - /// - /// Browse all the release-groups in the MusicBrainz database, which are directly linked to the entity with given id. - /// - /// The name of the related entity. - /// The id of the related entity. - /// The maximum number of release-groups to return (default = 25). - /// The offset to the release-groups list (enables paging, default = 0). - /// A list of entities to include (subqueries). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task BrowseAsync(string entity, string id, int limit = 25, int offset = 0, params string[] inc) - { - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.ReleaseGroups.BrowseAsync(entity, id, limit, offset, inc); - } - - /// - /// Browse all the release-groups in the MusicBrainz database, which are directly linked to the entity with given id. - /// - /// The name of the related entity. - /// The id of the related entity. - /// If releases or release-groups are included in the result, filter by type (for example 'album'). - /// The maximum number of release-groups to return (default = 25). - /// The offset to the release-groups list (enables paging, default = 0). - /// A list of entities to include (subqueries). - /// - /// - /// See http://musicbrainz.org/doc/Development/XML_Web_Service/Version_2#Release_Type_and_Status for supported values of type and status. - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task BrowseAsync(string entity, string id, string type, int limit = 25, int offset = 0, params string[] inc) - { - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.ReleaseGroups.BrowseAsync(entity, id, type, limit, offset, inc); - } - - #endregion - } -} \ No newline at end of file diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Work.Obsolete.cs b/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Work.Obsolete.cs deleted file mode 100644 index e9a17c3..0000000 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Work.Obsolete.cs +++ /dev/null @@ -1,37 +0,0 @@ - -namespace Hqub.MusicBrainz.API.Entities -{ - using System; - using System.Collections.Generic; - using System.Runtime.Serialization; - using System.Threading.Tasks; - - partial class Work - { - #region Static Methods - - /// - /// Lookup a work in the MusicBrainz database. - /// - /// The work MusicBrainz id. - /// A list of entities to include (subqueries). - /// - [Obsolete("Use MusicBrainzClient instead of static API.")] - public static async Task GetAsync(string id, params string[] inc) - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentException(string.Format(Resources.Messages.MissingParameter, "id")); - } - - var client = new MusicBrainzClient(Configuration.Proxy) - { - Cache = Configuration.Cache - }; - - return await client.Work.GetAsync(id, inc); - } - - #endregion - } -} \ No newline at end of file diff --git a/README.md b/README.md index 00056a2..5ab43f9 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ MusicBrainz ============ -[![Build Status](https://img.shields.io/travis/avatar29A/MusicBrainz.svg?style=flat-square)](https://app.travis-ci.com/github/avatar29A/MusicBrainz) -[![NuGet](https://img.shields.io/nuget/v/MusicBrainzAPI.svg?style=flat-square)](https://www.nuget.org/packages/MusicBrainzAPI) +[![Build Status](https://img.shields.io/github/actions/workflow/status/avatar29A/MusicBrainz/dotnet.yml?style=flat-square)](https://github.com/avatar29A/MusicBrainz/actions/workflows/dotnet.yml) [![Issues](https://img.shields.io/github/issues/avatar29A/MusicBrainz.svg?style=flat-square)](https://github.com/avatar29A/MusicBrainz/issues) +[![NuGet](https://img.shields.io/nuget/v/MusicBrainzAPI.svg?style=flat-square)](https://www.nuget.org/packages/MusicBrainzAPI) [![Gitter](https://img.shields.io/gitter/room/avatar29A/MusicBrainz?color=%2346BC99&style=flat-square)](https://gitter.im/avatar29A/MusicBrainz) -Implementation of the [MusicBrainz](https://musicbrainz.org/) API version 2.0 (requires .NET framework 4.5 or above). +Implementation of the [MusicBrainz](https://musicbrainz.org/) API version 2 for .NET ## Features @@ -20,3 +20,9 @@ More information about the MusicBrainz webservice can be found [here](https://mu ## Examples Take a look at the [wiki](https://github.com/avatar29A/MusicBrainz/wiki) or the [Hqub.MusicBrainz.Client](https://github.com/avatar29A/MusicBrainz/tree/master/Hqub.MusicBrainz/Hqub.MusicBrainz.Client) example project. + +## Breaking changes in v3 + +Version 3 removes all code that was marked obsolete in previous versions, specifically the static API and configuration. You should now use the [MusicBrainzClient](https://github.com/avatar29A/MusicBrainz/blob/master/Hqub.MusicBrainz/Hqub.MusicBrainz.API/MusicBrainzClient.cs) class instead. Take a look at the wiki or the examples! + +Additionally, the `.API` suffix was removed from the assembly and all namespaces. Fix the namespace change by removing the `.API` suffix in your using statements, for example `using Hqub.MusicBrainz.API` now becomes `using Hqub.MusicBrainz`. The name change of the assembly should be automatically picked up if you are using Nuget to manage package dependencies. Otherwise, you will have to manually fix the reference in your project files. diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example1.cs b/src/Hqub.MusicBrainz.Client/Example1.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example1.cs rename to src/Hqub.MusicBrainz.Client/Example1.cs index 7f7f45c..0c8cdfc 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example1.cs +++ b/src/Hqub.MusicBrainz.Client/Example1.cs @@ -1,7 +1,7 @@  namespace Hqub.MusicBrainz.Client { - using Hqub.MusicBrainz.API; + using Hqub.MusicBrainz; using System; using System.Linq; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example2.cs b/src/Hqub.MusicBrainz.Client/Example2.cs similarity index 92% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example2.cs rename to src/Hqub.MusicBrainz.Client/Example2.cs index dac72a2..1cf717e 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example2.cs +++ b/src/Hqub.MusicBrainz.Client/Example2.cs @@ -1,8 +1,8 @@  namespace Hqub.MusicBrainz.Client { - using Hqub.MusicBrainz.API; - using Hqub.MusicBrainz.API.Entities; + using Hqub.MusicBrainz; + using Hqub.MusicBrainz.Entities; using System; using System.Linq; using System.Threading.Tasks; @@ -40,7 +40,7 @@ public static async Task Search(MusicBrainzClient client, string band, string al Console.WriteLine("Total matches for '{0}': {1}", album, releases.Count); // Get the oldest release (remember to sort out items with no date set). - var release = releases.Items.Where(r => r.Date != null && IsCompactDisc(r)).OrderBy(r => r.Date).First(); + var release = releases.Items.Where(r => !string.IsNullOrEmpty(r.Date) && IsCompactDisc(r)).OrderBy(r => r.Date).First(); // Get detailed information of the release, including recordings. release = await client.Releases.GetAsync(release.Id, "recordings", "url-rels"); diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example3.cs b/src/Hqub.MusicBrainz.Client/Example3.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example3.cs rename to src/Hqub.MusicBrainz.Client/Example3.cs index fa800b4..016189e 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example3.cs +++ b/src/Hqub.MusicBrainz.Client/Example3.cs @@ -1,8 +1,8 @@  namespace Hqub.MusicBrainz.Client { - using Hqub.MusicBrainz.API; - using Hqub.MusicBrainz.API.Entities; + using Hqub.MusicBrainz; + using Hqub.MusicBrainz.Entities; using System; using System.Linq; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example4.cs b/src/Hqub.MusicBrainz.Client/Example4.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example4.cs rename to src/Hqub.MusicBrainz.Client/Example4.cs index 0e4fbd2..c941405 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example4.cs +++ b/src/Hqub.MusicBrainz.Client/Example4.cs @@ -1,8 +1,8 @@  namespace Hqub.MusicBrainz.Client { - using Hqub.MusicBrainz.API; - using Hqub.MusicBrainz.API.Entities; + using Hqub.MusicBrainz; + using Hqub.MusicBrainz.Entities; using System; using System.Linq; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example5.cs b/src/Hqub.MusicBrainz.Client/Example5.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example5.cs rename to src/Hqub.MusicBrainz.Client/Example5.cs index 34cdfde..209ab90 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example5.cs +++ b/src/Hqub.MusicBrainz.Client/Example5.cs @@ -1,8 +1,8 @@  namespace Hqub.MusicBrainz.Client { - using Hqub.MusicBrainz.API; - using Hqub.MusicBrainz.API.Entities; + using Hqub.MusicBrainz; + using Hqub.MusicBrainz.Entities; using System; using System.Linq; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example6.cs b/src/Hqub.MusicBrainz.Client/Example6.cs similarity index 95% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example6.cs rename to src/Hqub.MusicBrainz.Client/Example6.cs index ffe64d8..4b35b9a 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Example6.cs +++ b/src/Hqub.MusicBrainz.Client/Example6.cs @@ -1,9 +1,9 @@  namespace Hqub.MusicBrainz.Client { - using Hqub.MusicBrainz.API; - using Hqub.MusicBrainz.API.Entities; - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz; + using Hqub.MusicBrainz.Entities; + using Hqub.MusicBrainz.Entities.Collections; using System; using System.Linq; using System.Threading.Tasks; @@ -66,7 +66,7 @@ public static async Task Search(MusicBrainzClient client, string genre, int limi DisplayReleases(groups, i + 1, pages); // Try to avoid rate limit ... - await Task.Delay(500); + await Task.Delay(1000); } if (i == MAX_PAGES) diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Extensions.cs b/src/Hqub.MusicBrainz.Client/Extensions.cs similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Extensions.cs rename to src/Hqub.MusicBrainz.Client/Extensions.cs diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/FileRequestCache.cs b/src/Hqub.MusicBrainz.Client/FileRequestCache.cs similarity index 99% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.Client/FileRequestCache.cs rename to src/Hqub.MusicBrainz.Client/FileRequestCache.cs index 337bd35..1cc1676 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/FileRequestCache.cs +++ b/src/Hqub.MusicBrainz.Client/FileRequestCache.cs @@ -1,7 +1,7 @@  namespace Hqub.MusicBrainz.Client { - using Hqub.MusicBrainz.API.Cache; + using Hqub.MusicBrainz.Cache; using System; using System.IO; using System.Security.Cryptography; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Hqub.MusicBrainz.Client.csproj b/src/Hqub.MusicBrainz.Client/Hqub.MusicBrainz.Client.csproj similarity index 73% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Hqub.MusicBrainz.Client.csproj rename to src/Hqub.MusicBrainz.Client/Hqub.MusicBrainz.Client.csproj index 5b24990..26860f3 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Hqub.MusicBrainz.Client.csproj +++ b/src/Hqub.MusicBrainz.Client/Hqub.MusicBrainz.Client.csproj @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Levenshtein.cs b/src/Hqub.MusicBrainz.Client/Levenshtein.cs similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Levenshtein.cs rename to src/Hqub.MusicBrainz.Client/Levenshtein.cs diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Program.cs b/src/Hqub.MusicBrainz.Client/Program.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Program.cs rename to src/Hqub.MusicBrainz.Client/Program.cs index ce8d8a6..15e4416 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.Client/Program.cs +++ b/src/Hqub.MusicBrainz.Client/Program.cs @@ -1,6 +1,6 @@ namespace Hqub.MusicBrainz.Client { - using Hqub.MusicBrainz.API; + using Hqub.MusicBrainz; using System; using System.IO; using System.Net; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ArtistListTests.cs b/src/Hqub.MusicBrainz.Tests/ArtistListTests.cs similarity index 94% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ArtistListTests.cs rename to src/Hqub.MusicBrainz.Tests/ArtistListTests.cs index a5dd40b..16017cd 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ArtistListTests.cs +++ b/src/Hqub.MusicBrainz.Tests/ArtistListTests.cs @@ -1,7 +1,7 @@  -namespace Hqub.MusicBrainz.API.Test +namespace Hqub.MusicBrainz.Tests { - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities.Collections; using NUnit.Framework; // Resource: artist-search.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ArtistTests.cs b/src/Hqub.MusicBrainz.Tests/ArtistTests.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ArtistTests.cs rename to src/Hqub.MusicBrainz.Tests/ArtistTests.cs index 06ac3fd..da8b500 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ArtistTests.cs +++ b/src/Hqub.MusicBrainz.Tests/ArtistTests.cs @@ -1,7 +1,7 @@  -namespace Hqub.MusicBrainz.API.Test +namespace Hqub.MusicBrainz.Tests { - using Hqub.MusicBrainz.API.Entities; + using Hqub.MusicBrainz.Entities; using NUnit.Framework; using System.Linq; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/artist-get.json b/src/Hqub.MusicBrainz.Tests/Data/artist-get.json similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/artist-get.json rename to src/Hqub.MusicBrainz.Tests/Data/artist-get.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/artist-search.json b/src/Hqub.MusicBrainz.Tests/Data/artist-search.json similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/artist-search.json rename to src/Hqub.MusicBrainz.Tests/Data/artist-search.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/recording-get.json b/src/Hqub.MusicBrainz.Tests/Data/recording-get.json similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/recording-get.json rename to src/Hqub.MusicBrainz.Tests/Data/recording-get.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/recording-search.json b/src/Hqub.MusicBrainz.Tests/Data/recording-search.json similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/recording-search.json rename to src/Hqub.MusicBrainz.Tests/Data/recording-search.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/release-get.json b/src/Hqub.MusicBrainz.Tests/Data/release-get.json similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/release-get.json rename to src/Hqub.MusicBrainz.Tests/Data/release-get.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/release-search.json b/src/Hqub.MusicBrainz.Tests/Data/release-search.json similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/release-search.json rename to src/Hqub.MusicBrainz.Tests/Data/release-search.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/releasegroup-get.json b/src/Hqub.MusicBrainz.Tests/Data/releasegroup-get.json similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/releasegroup-get.json rename to src/Hqub.MusicBrainz.Tests/Data/releasegroup-get.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/releasegroup-search.json b/src/Hqub.MusicBrainz.Tests/Data/releasegroup-search.json similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Data/releasegroup-search.json rename to src/Hqub.MusicBrainz.Tests/Data/releasegroup-search.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Hqub.MusicBrainz.API.Test.csproj b/src/Hqub.MusicBrainz.Tests/Hqub.MusicBrainz.Tests.csproj similarity index 89% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Hqub.MusicBrainz.API.Test.csproj rename to src/Hqub.MusicBrainz.Tests/Hqub.MusicBrainz.Tests.csproj index 4021077..3a3fadb 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/Hqub.MusicBrainz.API.Test.csproj +++ b/src/Hqub.MusicBrainz.Tests/Hqub.MusicBrainz.Tests.csproj @@ -32,12 +32,12 @@ - - + + - + \ No newline at end of file diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/QueryParametersTests.cs b/src/Hqub.MusicBrainz.Tests/QueryParametersTests.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/QueryParametersTests.cs rename to src/Hqub.MusicBrainz.Tests/QueryParametersTests.cs index 6e0fddc..48e8793 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/QueryParametersTests.cs +++ b/src/Hqub.MusicBrainz.Tests/QueryParametersTests.cs @@ -1,7 +1,7 @@  -namespace Hqub.MusicBrainz.API.Test +namespace Hqub.MusicBrainz.Tests { - using Hqub.MusicBrainz.API.Entities; + using Hqub.MusicBrainz.Entities; using NUnit.Framework; public class QueryParametersTests diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/RecordingListTests.cs b/src/Hqub.MusicBrainz.Tests/RecordingListTests.cs similarity index 94% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/RecordingListTests.cs rename to src/Hqub.MusicBrainz.Tests/RecordingListTests.cs index 90f1b6a..e4ae3a4 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/RecordingListTests.cs +++ b/src/Hqub.MusicBrainz.Tests/RecordingListTests.cs @@ -1,7 +1,7 @@  -namespace Hqub.MusicBrainz.API.Test +namespace Hqub.MusicBrainz.Tests { - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities.Collections; using NUnit.Framework; using System.Linq; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/RecordingTests.cs b/src/Hqub.MusicBrainz.Tests/RecordingTests.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/RecordingTests.cs rename to src/Hqub.MusicBrainz.Tests/RecordingTests.cs index 7a9d149..ff905a8 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/RecordingTests.cs +++ b/src/Hqub.MusicBrainz.Tests/RecordingTests.cs @@ -1,7 +1,7 @@  -namespace Hqub.MusicBrainz.API.Test +namespace Hqub.MusicBrainz.Tests { - using Hqub.MusicBrainz.API.Entities; + using Hqub.MusicBrainz.Entities; using NUnit.Framework; using System.Linq; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseGroupListTests.cs b/src/Hqub.MusicBrainz.Tests/ReleaseGroupListTests.cs similarity index 94% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseGroupListTests.cs rename to src/Hqub.MusicBrainz.Tests/ReleaseGroupListTests.cs index 5972700..92c319e 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseGroupListTests.cs +++ b/src/Hqub.MusicBrainz.Tests/ReleaseGroupListTests.cs @@ -1,7 +1,7 @@  -namespace Hqub.MusicBrainz.API.Test +namespace Hqub.MusicBrainz.Tests { - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities.Collections; using NUnit.Framework; using System.Linq; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseGroupTests.cs b/src/Hqub.MusicBrainz.Tests/ReleaseGroupTests.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseGroupTests.cs rename to src/Hqub.MusicBrainz.Tests/ReleaseGroupTests.cs index 97e1046..2b96af0 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseGroupTests.cs +++ b/src/Hqub.MusicBrainz.Tests/ReleaseGroupTests.cs @@ -1,7 +1,7 @@  -namespace Hqub.MusicBrainz.API.Test +namespace Hqub.MusicBrainz.Tests { - using Hqub.MusicBrainz.API.Entities; + using Hqub.MusicBrainz.Entities; using NUnit.Framework; // Resource: releasegroup-get.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseListTests.cs b/src/Hqub.MusicBrainz.Tests/ReleaseListTests.cs similarity index 94% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseListTests.cs rename to src/Hqub.MusicBrainz.Tests/ReleaseListTests.cs index 44a1771..e90713d 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseListTests.cs +++ b/src/Hqub.MusicBrainz.Tests/ReleaseListTests.cs @@ -1,7 +1,7 @@  -namespace Hqub.MusicBrainz.API.Test +namespace Hqub.MusicBrainz.Tests { - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities.Collections; using NUnit.Framework; // Resource: release-search.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseTests.cs b/src/Hqub.MusicBrainz.Tests/ReleaseTests.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseTests.cs rename to src/Hqub.MusicBrainz.Tests/ReleaseTests.cs index 475899c..5aea1e5 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/ReleaseTests.cs +++ b/src/Hqub.MusicBrainz.Tests/ReleaseTests.cs @@ -1,7 +1,7 @@  -namespace Hqub.MusicBrainz.API.Test +namespace Hqub.MusicBrainz.Tests { - using Hqub.MusicBrainz.API.Entities; + using Hqub.MusicBrainz.Entities; using NUnit.Framework; // Resource: release-get.json diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/TestHelper.cs b/src/Hqub.MusicBrainz.Tests/TestHelper.cs similarity index 88% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/TestHelper.cs rename to src/Hqub.MusicBrainz.Tests/TestHelper.cs index 8e81d0e..0b94bc6 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/TestHelper.cs +++ b/src/Hqub.MusicBrainz.Tests/TestHelper.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Test +namespace Hqub.MusicBrainz.Tests { using System; using System.IO; @@ -8,7 +8,7 @@ namespace Hqub.MusicBrainz.API.Test static class TestHelper { - private const string prefix = "Hqub.MusicBrainz.API.Test.Data."; + private const string prefix = "Hqub.MusicBrainz.Tests.Data."; private static Stream LoadResource(string name) { diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/WebserviceTests.cs b/src/Hqub.MusicBrainz.Tests/WebserviceTests.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/WebserviceTests.cs rename to src/Hqub.MusicBrainz.Tests/WebserviceTests.cs index c16f82f..a12dff7 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API.Test/WebserviceTests.cs +++ b/src/Hqub.MusicBrainz.Tests/WebserviceTests.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Test +namespace Hqub.MusicBrainz.Tests { using NUnit.Framework; using System.Linq; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.sln b/src/Hqub.MusicBrainz.sln similarity index 80% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.sln rename to src/Hqub.MusicBrainz.sln index 8dcd60e..9ecdd00 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.sln +++ b/src/Hqub.MusicBrainz.sln @@ -1,13 +1,19 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30204.135 +# Visual Studio Version 17 +VisualStudioVersion = 17.7.34024.191 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hqub.MusicBrainz.API.Test", "Hqub.MusicBrainz.API.Test\Hqub.MusicBrainz.API.Test.csproj", "{1E8BEEE2-DF91-4D0B-902E-E661D03E70C3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hqub.MusicBrainz.API.Tests", "Hqub.MusicBrainz.Tests\Hqub.MusicBrainz.Tests.csproj", "{1E8BEEE2-DF91-4D0B-902E-E661D03E70C3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hqub.MusicBrainz.Client", "Hqub.MusicBrainz.Client\Hqub.MusicBrainz.Client.csproj", "{A30BD5FD-E8DF-454F-8280-9B1B7093785A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hqub.MusicBrainz.API", "Hqub.MusicBrainz.API\Hqub.MusicBrainz.API.csproj", "{9FB7E37D-A37B-4262-897F-48291BF836DC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hqub.MusicBrainz.API", "Hqub.MusicBrainz\Hqub.MusicBrainz.csproj", "{9FB7E37D-A37B-4262-897F-48291BF836DC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8CF491B0-FCB6-4031-B988-6C37E61DE19E}" + ProjectSection(SolutionItems) = preProject + ..\.github\workflows\dotnet.yml = ..\.github\workflows\dotnet.yml + ..\README.md = ..\README.md + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Cache/IRequestCache.cs b/src/Hqub.MusicBrainz/Cache/IRequestCache.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Cache/IRequestCache.cs rename to src/Hqub.MusicBrainz/Cache/IRequestCache.cs index 6a5ad12..f64dbd1 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Cache/IRequestCache.cs +++ b/src/Hqub.MusicBrainz/Cache/IRequestCache.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Cache +namespace Hqub.MusicBrainz.Cache { using System.IO; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Cache/NullCache.cs b/src/Hqub.MusicBrainz/Cache/NullCache.cs similarity index 95% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Cache/NullCache.cs rename to src/Hqub.MusicBrainz/Cache/NullCache.cs index 887be0a..64704a2 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Cache/NullCache.cs +++ b/src/Hqub.MusicBrainz/Cache/NullCache.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Cache +namespace Hqub.MusicBrainz.Cache { using System.IO; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Alias.cs b/src/Hqub.MusicBrainz/Entities/Alias.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Alias.cs rename to src/Hqub.MusicBrainz/Entities/Alias.cs index 3330e92..9cf9738 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Alias.cs +++ b/src/Hqub.MusicBrainz/Entities/Alias.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Collections.Generic; using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Area.cs b/src/Hqub.MusicBrainz/Entities/Area.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Area.cs rename to src/Hqub.MusicBrainz/Entities/Area.cs index d08ed07..10b8ab8 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Area.cs +++ b/src/Hqub.MusicBrainz/Entities/Area.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Collections.Generic; using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Artist.cs b/src/Hqub.MusicBrainz/Entities/Artist.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Artist.cs rename to src/Hqub.MusicBrainz/Entities/Artist.cs index d304c6a..14c0ae2 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Artist.cs +++ b/src/Hqub.MusicBrainz/Entities/Artist.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Collections.Generic; using System.Runtime.Serialization; @@ -10,7 +10,7 @@ namespace Hqub.MusicBrainz.API.Entities /// /// [DataContract(Name = "artist")] - public partial class Artist + public class Artist { #region Properties diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/ArtistList.cs b/src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/ArtistList.cs rename to src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs index bf60d55..9fb6468 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/ArtistList.cs +++ b/src/Hqub.MusicBrainz/Entities/Collections/ArtistList.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities.Collections +namespace Hqub.MusicBrainz.Entities.Collections { using System.Collections.Generic; using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/RecordingList.cs b/src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/RecordingList.cs rename to src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs index a30c01f..0e7d93b 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/RecordingList.cs +++ b/src/Hqub.MusicBrainz/Entities/Collections/RecordingList.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities.Collections +namespace Hqub.MusicBrainz.Entities.Collections { using System.Collections.Generic; using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/ReleaseGroupList.cs b/src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/ReleaseGroupList.cs rename to src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs index 14d496b..e66ea20 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/ReleaseGroupList.cs +++ b/src/Hqub.MusicBrainz/Entities/Collections/ReleaseGroupList.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities.Collections +namespace Hqub.MusicBrainz.Entities.Collections { using System.Collections.Generic; using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/ReleaseList.cs b/src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/ReleaseList.cs rename to src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs index 2aef00c..b4f632e 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Collections/ReleaseList.cs +++ b/src/Hqub.MusicBrainz/Entities/Collections/ReleaseList.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities.Collections +namespace Hqub.MusicBrainz.Entities.Collections { using System.Collections.Generic; using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/CoverArtArchive.cs b/src/Hqub.MusicBrainz/Entities/CoverArtArchive.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/CoverArtArchive.cs rename to src/Hqub.MusicBrainz/Entities/CoverArtArchive.cs index 69a0261..14f5efa 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/CoverArtArchive.cs +++ b/src/Hqub.MusicBrainz/Entities/CoverArtArchive.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System; using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Disc.cs b/src/Hqub.MusicBrainz/Entities/Disc.cs similarity index 94% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Disc.cs rename to src/Hqub.MusicBrainz/Entities/Disc.cs index 90b0392..d215925 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Disc.cs +++ b/src/Hqub.MusicBrainz/Entities/Disc.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Collections.Generic; using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Genre.cs b/src/Hqub.MusicBrainz/Entities/Genre.cs similarity index 95% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Genre.cs rename to src/Hqub.MusicBrainz/Entities/Genre.cs index 94b479c..104c5f8 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Genre.cs +++ b/src/Hqub.MusicBrainz/Entities/Genre.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Label.cs b/src/Hqub.MusicBrainz/Entities/Label.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Label.cs rename to src/Hqub.MusicBrainz/Entities/Label.cs index 5378727..1cfb0df 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Label.cs +++ b/src/Hqub.MusicBrainz/Entities/Label.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Collections.Generic; using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/LabelInfo.cs b/src/Hqub.MusicBrainz/Entities/LabelInfo.cs similarity index 93% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/LabelInfo.cs rename to src/Hqub.MusicBrainz/Entities/LabelInfo.cs index 1fa26c1..ce5c66d 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/LabelInfo.cs +++ b/src/Hqub.MusicBrainz/Entities/LabelInfo.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/LifeSpan.cs b/src/Hqub.MusicBrainz/Entities/LifeSpan.cs similarity index 94% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/LifeSpan.cs rename to src/Hqub.MusicBrainz/Entities/LifeSpan.cs index 2b49302..dd47dcd 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/LifeSpan.cs +++ b/src/Hqub.MusicBrainz/Entities/LifeSpan.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Medium.cs b/src/Hqub.MusicBrainz/Entities/Medium.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Medium.cs rename to src/Hqub.MusicBrainz/Entities/Medium.cs index c91d4af..b1513e5 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Medium.cs +++ b/src/Hqub.MusicBrainz/Entities/Medium.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Collections.Generic; using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/NameCredit.cs b/src/Hqub.MusicBrainz/Entities/NameCredit.cs similarity index 95% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/NameCredit.cs rename to src/Hqub.MusicBrainz/Entities/NameCredit.cs index a6de132..b6a7b66 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/NameCredit.cs +++ b/src/Hqub.MusicBrainz/Entities/NameCredit.cs @@ -1,5 +1,5 @@ -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Rating.cs b/src/Hqub.MusicBrainz/Entities/Rating.cs similarity index 93% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Rating.cs rename to src/Hqub.MusicBrainz/Entities/Rating.cs index a7801cd..8d23dc3 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Rating.cs +++ b/src/Hqub.MusicBrainz/Entities/Rating.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Recording.cs b/src/Hqub.MusicBrainz/Entities/Recording.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Recording.cs rename to src/Hqub.MusicBrainz/Entities/Recording.cs index 723ed61..b0fe549 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Recording.cs +++ b/src/Hqub.MusicBrainz/Entities/Recording.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Collections.Generic; using System.Runtime.Serialization; @@ -10,7 +10,7 @@ namespace Hqub.MusicBrainz.API.Entities /// /// [DataContract(Name = "recording")] - public partial class Recording + public class Recording { #region Properties diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Relation.cs b/src/Hqub.MusicBrainz/Entities/Relation.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Relation.cs rename to src/Hqub.MusicBrainz/Entities/Relation.cs index c05f6ce..113b764 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Relation.cs +++ b/src/Hqub.MusicBrainz/Entities/Relation.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Release.cs b/src/Hqub.MusicBrainz/Entities/Release.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Release.cs rename to src/Hqub.MusicBrainz/Entities/Release.cs index 79396b0..cb53fee 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Release.cs +++ b/src/Hqub.MusicBrainz/Entities/Release.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Collections.Generic; using System.Runtime.Serialization; @@ -10,7 +10,7 @@ namespace Hqub.MusicBrainz.API.Entities /// /// [DataContract(Name = "release")] - public partial class Release + public class Release { #region Properties diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/ReleaseGroup.cs b/src/Hqub.MusicBrainz/Entities/ReleaseGroup.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/ReleaseGroup.cs rename to src/Hqub.MusicBrainz/Entities/ReleaseGroup.cs index 65cf712..e0bf3c6 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/ReleaseGroup.cs +++ b/src/Hqub.MusicBrainz/Entities/ReleaseGroup.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Collections.Generic; using System.Runtime.Serialization; @@ -9,7 +9,7 @@ namespace Hqub.MusicBrainz.API.Entities /// /// [DataContract(Name = "release-group")] - public partial class ReleaseGroup + public class ReleaseGroup { #region Properties diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Tag.cs b/src/Hqub.MusicBrainz/Entities/Tag.cs similarity index 92% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Tag.cs rename to src/Hqub.MusicBrainz/Entities/Tag.cs index 80799b9..ceb445d 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Tag.cs +++ b/src/Hqub.MusicBrainz/Entities/Tag.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/TextRepresentation.cs b/src/Hqub.MusicBrainz/Entities/TextRepresentation.cs similarity index 93% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/TextRepresentation.cs rename to src/Hqub.MusicBrainz/Entities/TextRepresentation.cs index 1975d31..e73708f 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/TextRepresentation.cs +++ b/src/Hqub.MusicBrainz/Entities/TextRepresentation.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Track.cs b/src/Hqub.MusicBrainz/Entities/Track.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Track.cs rename to src/Hqub.MusicBrainz/Entities/Track.cs index 9ecc930..6b099d2 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Track.cs +++ b/src/Hqub.MusicBrainz/Entities/Track.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Url.cs b/src/Hqub.MusicBrainz/Entities/Url.cs similarity index 94% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Url.cs rename to src/Hqub.MusicBrainz/Entities/Url.cs index 334b781..20ebfff 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Url.cs +++ b/src/Hqub.MusicBrainz/Entities/Url.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Runtime.Serialization; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Work.cs b/src/Hqub.MusicBrainz/Entities/Work.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Work.cs rename to src/Hqub.MusicBrainz/Entities/Work.cs index 6f68b71..95ea80f 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Entities/Work.cs +++ b/src/Hqub.MusicBrainz/Entities/Work.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API.Entities +namespace Hqub.MusicBrainz.Entities { using System.Collections.Generic; using System.Runtime.Serialization; @@ -10,7 +10,7 @@ namespace Hqub.MusicBrainz.API.Entities /// /// [DataContract(Name = "work")] - public partial class Work + public class Work { #region Properties diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Hqub.MusicBrainz.API.csproj b/src/Hqub.MusicBrainz/Hqub.MusicBrainz.csproj similarity index 61% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Hqub.MusicBrainz.API.csproj rename to src/Hqub.MusicBrainz/Hqub.MusicBrainz.csproj index 2c0d443..66b2f8c 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Hqub.MusicBrainz.API.csproj +++ b/src/Hqub.MusicBrainz/Hqub.MusicBrainz.csproj @@ -6,26 +6,29 @@ true MusicBrainzAPI Implementation of the MuzicBrainz API v2. - Hqub.MusicBrainz.API + Hqub.MusicBrainz h-qub.ru - Copyright h-qub.ru © 2014-2022 + Copyright h-qub.ru © 2014-2023 Boris Glebov, Christian Woltering https://github.com/avatar29A/MusicBrainz https://github.com/avatar29A/MusicBrainz - 2.5.0.0 - 2.5.0.0 + 3.0.0.0 + 3.0.0.0 music musicbrainz brainz - 2.5.0 - Hqub.MusicBrainz.API - Hqub.MusicBrainz.API + 3.0.0 + Hqub.MusicBrainz + Hqub.MusicBrainz Debug;Release http://rhythmsforliving.com/wp-content/uploads/2014/11/brain-256.png MIT git - * Add support for aliases. -* Add artist begin- and end-area properties. - + + Hqub.MusicBrainz version 3 breaking changes: + + * Removes the obsolete static API: fix by using the MusicBrainzClient class. + * Removes the ".API" suffix from assembly and namespaces: fix by removing the ".API" suffix in your using statements. + diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/MusicBrainzClient.cs b/src/Hqub.MusicBrainz/MusicBrainzClient.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/MusicBrainzClient.cs rename to src/Hqub.MusicBrainz/MusicBrainzClient.cs index 859c758..b9b38a1 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/MusicBrainzClient.cs +++ b/src/Hqub.MusicBrainz/MusicBrainzClient.cs @@ -1,7 +1,7 @@ -namespace Hqub.MusicBrainz.API +namespace Hqub.MusicBrainz { - using Hqub.MusicBrainz.API.Cache; - using Hqub.MusicBrainz.API.Services; + using Hqub.MusicBrainz.Cache; + using Hqub.MusicBrainz.Services; using System; using System.IO; using System.Net; @@ -21,7 +21,7 @@ public sealed class MusicBrainzClient : IDisposable /// public const string ServiceBaseAddress = "https://musicbrainz.org/ws/2/"; - private const string UserAgent = "Hqub.MusicBrainz/3.0-beta"; + private const string UserAgent = "Hqub.MusicBrainz/3.0 (https://github.com/avatar29A/MusicBrainz)"; #region Public services diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/QueryParameters.cs b/src/Hqub.MusicBrainz/QueryParameters.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/QueryParameters.cs rename to src/Hqub.MusicBrainz/QueryParameters.cs index f4e1b15..d225a31 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/QueryParameters.cs +++ b/src/Hqub.MusicBrainz/QueryParameters.cs @@ -1,7 +1,7 @@  -namespace Hqub.MusicBrainz.API +namespace Hqub.MusicBrainz { - using Hqub.MusicBrainz.API.Entities; + using Hqub.MusicBrainz.Entities; using System; using System.Collections; using System.Collections.Generic; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/QueryResult.cs b/src/Hqub.MusicBrainz/QueryResult.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/QueryResult.cs rename to src/Hqub.MusicBrainz/QueryResult.cs index f612e20..80d9a8e 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/QueryResult.cs +++ b/src/Hqub.MusicBrainz/QueryResult.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; -namespace Hqub.MusicBrainz.API +namespace Hqub.MusicBrainz { /// /// Abstract base class for MusicBrainz queries returning lists (with paging support). diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Resources/Constants.Designer.cs b/src/Hqub.MusicBrainz/Resources/Constants.Designer.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Resources/Constants.Designer.cs rename to src/Hqub.MusicBrainz/Resources/Constants.Designer.cs index ac1bb8a..2c60e48 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Resources/Constants.Designer.cs +++ b/src/Hqub.MusicBrainz/Resources/Constants.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Hqub.MusicBrainz.API.Resources { +namespace Hqub.MusicBrainz.Resources { using System; using System.Reflection; @@ -40,7 +40,7 @@ internal Constants() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Hqub.MusicBrainz.API.Resources.Constants", typeof(Constants).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Hqub.MusicBrainz.Resources.Constants", typeof(Constants).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Resources/Constants.resx b/src/Hqub.MusicBrainz/Resources/Constants.resx similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Resources/Constants.resx rename to src/Hqub.MusicBrainz/Resources/Constants.resx diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Resources/Messages.Designer.cs b/src/Hqub.MusicBrainz/Resources/Messages.Designer.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Resources/Messages.Designer.cs rename to src/Hqub.MusicBrainz/Resources/Messages.Designer.cs index f0c4714..6a3e74b 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Resources/Messages.Designer.cs +++ b/src/Hqub.MusicBrainz/Resources/Messages.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Hqub.MusicBrainz.API.Resources { +namespace Hqub.MusicBrainz.Resources { using System; using System.Reflection; @@ -40,7 +40,7 @@ internal Messages() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Hqub.MusicBrainz.API.Resources.Messages", typeof(Messages).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Hqub.MusicBrainz.Resources.Messages", typeof(Messages).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Resources/Messages.resx b/src/Hqub.MusicBrainz/Resources/Messages.resx similarity index 100% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Resources/Messages.resx rename to src/Hqub.MusicBrainz/Resources/Messages.resx diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/ArtistService.cs b/src/Hqub.MusicBrainz/Services/ArtistService.cs similarity index 95% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/ArtistService.cs rename to src/Hqub.MusicBrainz/Services/ArtistService.cs index ca8b227..e71eff1 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/ArtistService.cs +++ b/src/Hqub.MusicBrainz/Services/ArtistService.cs @@ -1,7 +1,7 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { - using Hqub.MusicBrainz.API.Entities; - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities; + using Hqub.MusicBrainz.Entities.Collections; using System; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/BrowseRequest.cs b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/BrowseRequest.cs rename to src/Hqub.MusicBrainz/Services/BrowseRequest.cs index 9256896..67d685d 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/BrowseRequest.cs +++ b/src/Hqub.MusicBrainz/Services/BrowseRequest.cs @@ -1,6 +1,6 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities.Collections; using System; using System.Threading; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IArtistService.cs b/src/Hqub.MusicBrainz/Services/IArtistService.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IArtistService.cs rename to src/Hqub.MusicBrainz/Services/IArtistService.cs index 8035c9c..40b954b 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IArtistService.cs +++ b/src/Hqub.MusicBrainz/Services/IArtistService.cs @@ -1,7 +1,7 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { - using Hqub.MusicBrainz.API.Entities; - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities; + using Hqub.MusicBrainz.Entities.Collections; using System.Threading.Tasks; /// diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IRecordingService.cs b/src/Hqub.MusicBrainz/Services/IRecordingService.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IRecordingService.cs rename to src/Hqub.MusicBrainz/Services/IRecordingService.cs index 053ba23..81fbe9e 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IRecordingService.cs +++ b/src/Hqub.MusicBrainz/Services/IRecordingService.cs @@ -1,7 +1,7 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { - using Hqub.MusicBrainz.API.Entities; - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities; + using Hqub.MusicBrainz.Entities.Collections; using System.Threading.Tasks; /// diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IReleaseGroupService.cs b/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IReleaseGroupService.cs rename to src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs index 363ce3e..4778fdb 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IReleaseGroupService.cs +++ b/src/Hqub.MusicBrainz/Services/IReleaseGroupService.cs @@ -1,7 +1,7 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { - using Hqub.MusicBrainz.API.Entities; - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities; + using Hqub.MusicBrainz.Entities.Collections; using System.Threading.Tasks; /// diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IReleaseService.cs b/src/Hqub.MusicBrainz/Services/IReleaseService.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IReleaseService.cs rename to src/Hqub.MusicBrainz/Services/IReleaseService.cs index 7a898e3..002274c 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IReleaseService.cs +++ b/src/Hqub.MusicBrainz/Services/IReleaseService.cs @@ -1,7 +1,7 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { - using Hqub.MusicBrainz.API.Entities; - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities; + using Hqub.MusicBrainz.Entities.Collections; using System.Threading.Tasks; /// diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IWorkService.cs b/src/Hqub.MusicBrainz/Services/IWorkService.cs similarity index 86% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IWorkService.cs rename to src/Hqub.MusicBrainz/Services/IWorkService.cs index b418c82..872a8a2 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/IWorkService.cs +++ b/src/Hqub.MusicBrainz/Services/IWorkService.cs @@ -1,7 +1,7 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { - using Hqub.MusicBrainz.API.Entities; - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities; + using Hqub.MusicBrainz.Entities.Collections; using System.Threading.Tasks; /// diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/LookupRequest.cs b/src/Hqub.MusicBrainz/Services/LookupRequest.cs similarity index 97% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/LookupRequest.cs rename to src/Hqub.MusicBrainz/Services/LookupRequest.cs index c024cf7..000f19c 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/LookupRequest.cs +++ b/src/Hqub.MusicBrainz/Services/LookupRequest.cs @@ -1,4 +1,4 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { using System; using System.Threading; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/RecordingService.cs b/src/Hqub.MusicBrainz/Services/RecordingService.cs similarity index 95% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/RecordingService.cs rename to src/Hqub.MusicBrainz/Services/RecordingService.cs index aa432f9..45a4c3c 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/RecordingService.cs +++ b/src/Hqub.MusicBrainz/Services/RecordingService.cs @@ -1,7 +1,7 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { - using Hqub.MusicBrainz.API.Entities; - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities; + using Hqub.MusicBrainz.Entities.Collections; using System; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/ReleaseGroupService.cs b/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/ReleaseGroupService.cs rename to src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs index caf3086..3a53fc4 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/ReleaseGroupService.cs +++ b/src/Hqub.MusicBrainz/Services/ReleaseGroupService.cs @@ -1,7 +1,7 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { - using Hqub.MusicBrainz.API.Entities; - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities; + using Hqub.MusicBrainz.Entities.Collections; using System; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/ReleaseService.cs b/src/Hqub.MusicBrainz/Services/ReleaseService.cs similarity index 96% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/ReleaseService.cs rename to src/Hqub.MusicBrainz/Services/ReleaseService.cs index 4014712..7ffb135 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/ReleaseService.cs +++ b/src/Hqub.MusicBrainz/Services/ReleaseService.cs @@ -1,7 +1,7 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { - using Hqub.MusicBrainz.API.Entities; - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities; + using Hqub.MusicBrainz.Entities.Collections; using System; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/SearchRequest.cs b/src/Hqub.MusicBrainz/Services/SearchRequest.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/SearchRequest.cs rename to src/Hqub.MusicBrainz/Services/SearchRequest.cs index 1142818..de9729d 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/SearchRequest.cs +++ b/src/Hqub.MusicBrainz/Services/SearchRequest.cs @@ -1,4 +1,4 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { using System; using System.Threading; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/WorkService.cs b/src/Hqub.MusicBrainz/Services/WorkService.cs similarity index 91% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/WorkService.cs rename to src/Hqub.MusicBrainz/Services/WorkService.cs index fabd5e3..72a8168 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/Services/WorkService.cs +++ b/src/Hqub.MusicBrainz/Services/WorkService.cs @@ -1,7 +1,7 @@ -namespace Hqub.MusicBrainz.API.Services +namespace Hqub.MusicBrainz.Services { - using Hqub.MusicBrainz.API.Entities; - using Hqub.MusicBrainz.API.Entities.Collections; + using Hqub.MusicBrainz.Entities; + using Hqub.MusicBrainz.Entities.Collections; using System; using System.Threading.Tasks; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/UrlBuilder.cs b/src/Hqub.MusicBrainz/UrlBuilder.cs similarity index 99% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/UrlBuilder.cs rename to src/Hqub.MusicBrainz/UrlBuilder.cs index a854f56..23fe128 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/UrlBuilder.cs +++ b/src/Hqub.MusicBrainz/UrlBuilder.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API +namespace Hqub.MusicBrainz { using System; using System.Linq; diff --git a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/WebServiceException.cs b/src/Hqub.MusicBrainz/WebServiceException.cs similarity index 98% rename from Hqub.MusicBrainz/Hqub.MusicBrainz.API/WebServiceException.cs rename to src/Hqub.MusicBrainz/WebServiceException.cs index 1592cf1..7fe203d 100644 --- a/Hqub.MusicBrainz/Hqub.MusicBrainz.API/WebServiceException.cs +++ b/src/Hqub.MusicBrainz/WebServiceException.cs @@ -1,5 +1,5 @@  -namespace Hqub.MusicBrainz.API +namespace Hqub.MusicBrainz { using System; using System.Net;