Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed error in line 351 of MusicClient.cs #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed error in line 351 of MusicClient.cs #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Xbox.Music/MusicClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ private async Task Authenticate()
var request = new RestRequest("v2/OAuth2-13", HttpMethod.Post)
{
ContentType = ContentTypes.FormUrlEncoded,
ReturnRawString = true,
//ReturnRawString = true,
};
request.AddParameter("client_id", ClientId);
request.AddParameter("client_secret", ClientSecret);
Expand Down Expand Up @@ -335,7 +335,7 @@ private async Task CheckToken()
/// </summary>
/// <param name="request">The RextRequest to execute.</param>
/// <returns>A ContentResponse object with the results from the service.</returns>
private async Task<ContentResponse> ExecuteRequestAsync(RestRequest request)
public async Task<ContentResponse> ExecuteRequestAsync(RestRequest request)
{
var result = await SendAsync<ContentResponse>(request);
if (result.HttpResponseMessage != null && result.HttpResponseMessage.IsSuccessStatusCode)
Expand All @@ -348,7 +348,7 @@ private async Task<ContentResponse> ExecuteRequestAsync(RestRequest request)
Error = new Error
{
ErrorCode = result.HttpResponseMessage != null ? result.HttpResponseMessage.StatusCode.ToString() : "",
Message = result.HttpResponseMessage != null ? result.HttpResponseMessage.ReasonPhrase : result.SerializationException.Message,
Message = result.HttpResponseMessage != null ? result.HttpResponseMessage.ReasonPhrase : result.Exception.Message,
Response = result.HttpResponseMessage,
}
};
Expand Down
15 changes: 9 additions & 6 deletions src/Xbox.Music/Xbox.Music.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>c88da469</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -65,10 +66,10 @@
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net45+win8+wp8+wpa81\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\..\..\..\Documents\Dev\WP7\MySocialShareTarget\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PortableRest">
<HintPath>..\packages\PortableRest.3.0.0-RC7\lib\portable-net45+sl5+wp8+win8+wpa81\PortableRest.dll</HintPath>
<HintPath>..\..\..\..\..\Documents\Dev\WP7\MySocialShareTarget\packages\PortableRest.3.1.0-Beta1\lib\portable-net45+sl5+wp8+win8+wpa81+MonoTouch1+MonoAndroid1\PortableRest.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http">
<HintPath>..\packages\Microsoft.Net.Http.2.2.27-beta\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
Expand All @@ -85,10 +86,12 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.17-beta\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.17-beta\tools\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.17-beta\tools\Microsoft.Bcl.Build.targets')" Text="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=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.17-beta\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
<Import Project="..\..\..\..\..\Documents\Dev\WP7\MySocialShareTarget\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\..\..\Documents\Dev\WP7\MySocialShareTarget\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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('..\..\..\..\..\Documents\Dev\WP7\MySocialShareTarget\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\Documents\Dev\WP7\MySocialShareTarget\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
</Target>
<!-- 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.
Expand Down
6 changes: 3 additions & 3 deletions src/Xbox.Music/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<packages>
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="portable-net45+win+wp80" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="portable-net45+win+wp80" />
<package id="Microsoft.Bcl.Build" version="1.0.17-beta" targetFramework="portable-net45+win+wp80" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
<package id="Microsoft.Net.Http" version="2.2.27-beta" targetFramework="portable-net45+win+wp80" />
<package id="Newtonsoft.Json" version="6.0.2" targetFramework="portable-net45+win+wp80" />
<package id="PortableRest" version="3.0.0-RC7" targetFramework="portable-net45+win+wp80" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
<package id="PortableRest" version="3.1.0-Beta1" targetFramework="portable-net45+win+wp80+MonoAndroid10+MonoTouch10" />
</packages>