diff options
| author | David Christiansen <DavidChristiansen@users.noreply.github.com> | 2016-03-25 11:33:33 +0000 |
|---|---|---|
| committer | David Christiansen <DavidChristiansen@users.noreply.github.com> | 2016-03-25 11:33:33 +0000 |
| commit | e4435096cbeadb4567cfd77ed68cc9fc92515902 (patch) | |
| tree | 513b96404b24a8e8f84d214d6e217609e988a9f0 /src/DotNetOpenAuth.Core | |
| parent | e774db2029a57f439db894cf798bd8bb22f5e84a (diff) | |
| parent | 6da912c7171495ee0d9b5df05cab1a8e3df85b62 (diff) | |
| download | DotNetOpenAuth-e4435096cbeadb4567cfd77ed68cc9fc92515902.zip DotNetOpenAuth-e4435096cbeadb4567cfd77ed68cc9fc92515902.tar.gz DotNetOpenAuth-e4435096cbeadb4567cfd77ed68cc9fc92515902.tar.bz2 | |
Merge pull request #379 from lcalabrese/develop
StyleCop, fix tests, remove Microsoft.Net.Http and Microsoft.Bcl dependencies
Diffstat (limited to 'src/DotNetOpenAuth.Core')
| -rw-r--r-- | src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj | 17 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.Core/Reporting.cs | 2 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.Core/packages.config | 3 |
3 files changed, 2 insertions, 20 deletions
diff --git a/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj b/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj index bb70e63..c874c07 100644 --- a/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj +++ b/src/DotNetOpenAuth.Core/DotNetOpenAuth.Core.csproj @@ -5,7 +5,7 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> - <NuGetPackageImportStamp>c9786f73</NuGetPackageImportStamp> + <NuGetPackageImportStamp>56d41492</NuGetPackageImportStamp> </PropertyGroup> <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.props" /> <PropertyGroup> @@ -171,14 +171,6 @@ <ItemGroup> <Reference Include="Microsoft.CSharp" /> <Reference Include="System.Net.Http" /> - <Reference Include="System.Net.Http.Extensions"> - <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="System.Net.Http.Primitives, Version=4.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath> - </Reference> <Reference Include="System.Net.Http.WebRequest" /> <Reference Include="Validation"> <HintPath>..\packages\Validation.2.0.6.15003\lib\portable-net40+sl50+win+wpa81+wp80+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Validation.dll</HintPath> @@ -189,11 +181,4 @@ <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.targets" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " /> <Import Project="$(SolutionDir)\.nuget\nuget.targets" /> - <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" /> - <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('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" /> - </Target> </Project>
\ No newline at end of file diff --git a/src/DotNetOpenAuth.Core/Reporting.cs b/src/DotNetOpenAuth.Core/Reporting.cs index 4d21c38..fd52865 100644 --- a/src/DotNetOpenAuth.Core/Reporting.cs +++ b/src/DotNetOpenAuth.Core/Reporting.cs @@ -477,7 +477,7 @@ namespace DotNetOpenAuth { } catch (ProtocolException ex) { Logger.Library.ErrorException("Unable to submit statistical report due to an HTTP error.", ex); } catch (FileNotFoundException ex) { - Logger.Library.ErrorException("Unable to submit statistical report because the report file is missing.", ex); + Logger.Library.ErrorException("Unable to submit statistical report because the report file is missing.", ex); } return false; diff --git a/src/DotNetOpenAuth.Core/packages.config b/src/DotNetOpenAuth.Core/packages.config index 939e61f..18a5755 100644 --- a/src/DotNetOpenAuth.Core/packages.config +++ b/src/DotNetOpenAuth.Core/packages.config @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="LibLog" version="2.0.1" targetFramework="net45" developmentDependency="true" /> - <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" /> - <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" /> - <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" /> <package id="Validation" version="2.0.6.15003" targetFramework="net45" /> </packages>
\ No newline at end of file |