Collapsed projects into one.

No benefit in separate projects and Nuget packges at this stage.
Ringobot · Aug 11, 2019 · 1e27e54 · 1e27e54
1 parent b0ad526
commit 1e27e54
Show file tree

Hide file tree

Showing 17 changed files with 0 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -109,13 +109,6 @@ See tests and `SpotifyApi.NetCore.Samples` for more usage examples.
 
 > There is a working demo using the sample project here: <https://spotifyaspnetcore.z5.web.core.windows.net/>
 
-## In this repo
-
-| Path | Remarks |
-| ---- | ------- |
-| `src/SpotifyApi.NetCore` | SpotifyApi.NetCore project |
-| `src/SpotifyApi.NetCore.Tests` | Tests |
-
 ## Spotify Web API Coverage
 
 | Spotify API | Endpoints | Implemented | % | |

diff --git a/src/SpotifyApi.NetCore.Authorization/AssemblyInfo.cs b/src/SpotifyApi.NetCore.Authorization/AssemblyInfo.cs
diff --git a/src/SpotifyApi.NetCore.Authorization/SpotifyApi.NetCore.Authorization.csproj b/src/SpotifyApi.NetCore.Authorization/SpotifyApi.NetCore.Authorization.csproj
diff --git a/src/SpotifyApi.NetCore.Core/SpotifyApi.NetCore.Core.csproj b/src/SpotifyApi.NetCore.Core/SpotifyApi.NetCore.Core.csproj
diff --git a/src/SpotifyApi.NetCore.Tests/SpotifyApi.NetCore.Tests.csproj b/src/SpotifyApi.NetCore.Tests/SpotifyApi.NetCore.Tests.csproj
@@ -18,7 +18,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SpotifyApi.NetCore.Authorization\SpotifyApi.NetCore.Authorization.csproj" />
     <ProjectReference Include="..\SpotifyApi.NetCore\SpotifyApi.NetCore.csproj" />
   </ItemGroup>
 

diff --git a/src/SpotifyApi.NetCore.sln b/src/SpotifyApi.NetCore.sln
@@ -7,10 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpotifyApi.NetCore", "Spoti
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpotifyApi.NetCore.Tests", "SpotifyApi.NetCore.Tests\SpotifyApi.NetCore.Tests.csproj", "{86644469-0957-4363-A185-32E6ADEB0C3E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpotifyApi.NetCore.Authorization", "SpotifyApi.NetCore.Authorization\SpotifyApi.NetCore.Authorization.csproj", "{D2E70BD3-DAAC-4CBE-878C-616D98917131}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpotifyApi.NetCore.Core", "SpotifyApi.NetCore.Core\SpotifyApi.NetCore.Core.csproj", "{46A62F5C-7512-42D9-AB3A-A4158B6713AF}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,14 +21,6 @@ Global
 		{86644469-0957-4363-A185-32E6ADEB0C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{86644469-0957-4363-A185-32E6ADEB0C3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{86644469-0957-4363-A185-32E6ADEB0C3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2E70BD3-DAAC-4CBE-878C-616D98917131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2E70BD3-DAAC-4CBE-878C-616D98917131}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2E70BD3-DAAC-4CBE-878C-616D98917131}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2E70BD3-DAAC-4CBE-878C-616D98917131}.Release|Any CPU.Build.0 = Release|Any CPU
-		{46A62F5C-7512-42D9-AB3A-A4158B6713AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{46A62F5C-7512-42D9-AB3A-A4158B6713AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{46A62F5C-7512-42D9-AB3A-A4158B6713AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{46A62F5C-7512-42D9-AB3A-A4158B6713AF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/....NetCore.Authorization/AccountsService.cs → ....NetCore/Authorization/AccountsService.cs b/....NetCore.Authorization/AccountsService.cs → ....NetCore/Authorization/AccountsService.cs
diff --git a/...Authorization/BearerAccessRefreshToken.cs → ...Authorization/BearerAccessRefreshToken.cs b/...Authorization/BearerAccessRefreshToken.cs → ...Authorization/BearerAccessRefreshToken.cs
diff --git a/...ore/Authorization/IAccessTokenProvider.cs → ...ore/Authorization/IAccessTokenProvider.cs b/...ore/Authorization/IAccessTokenProvider.cs → ...ore/Authorization/IAccessTokenProvider.cs
diff --git a/...NetCore.Authorization/IAccountsService.cs → ...NetCore/Authorization/IAccountsService.cs b/...NetCore.Authorization/IAccountsService.cs → ...NetCore/Authorization/IAccountsService.cs
diff --git a/...etCore.Authorization/IBearerTokenStore.cs → ...etCore/Authorization/IBearerTokenStore.cs b/...etCore.Authorization/IBearerTokenStore.cs → ...etCore/Authorization/IBearerTokenStore.cs
diff --git a/...e.Authorization/MemoryBearerTokenStore.cs → ...e/Authorization/MemoryBearerTokenStore.cs b/...e.Authorization/MemoryBearerTokenStore.cs → ...e/Authorization/MemoryBearerTokenStore.cs
diff --git a/...Core.Authorization/UserAccountsService.cs → ...Core/Authorization/UserAccountsService.cs b/...Core.Authorization/UserAccountsService.cs → ...Core/Authorization/UserAccountsService.cs
diff --git a/...fyApi.NetCore.Core/Http/RestHttpClient.cs → ...SpotifyApi.NetCore/Http/RestHttpClient.cs b/...fyApi.NetCore.Core/Http/RestHttpClient.cs → ...SpotifyApi.NetCore/Http/RestHttpClient.cs
diff --git a/src/SpotifyApi.NetCore.Core/Logger/Logger.cs → src/SpotifyApi.NetCore/Logger/Logger.cs b/src/SpotifyApi.NetCore.Core/Logger/Logger.cs → src/SpotifyApi.NetCore/Logger/Logger.cs
diff --git a/src/SpotifyApi.NetCore/SpotifyApi.NetCore.csproj b/src/SpotifyApi.NetCore/SpotifyApi.NetCore.csproj
@@ -28,7 +28,4 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SpotifyApi.NetCore.Core\SpotifyApi.NetCore.Core.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/....NetCore.Core/SpotifyApiErrorException.cs → ...fyApi.NetCore/SpotifyApiErrorException.cs b/....NetCore.Core/SpotifyApiErrorException.cs → ...fyApi.NetCore/SpotifyApiErrorException.cs