diff options
Diffstat (limited to 'src')
6 files changed, 23 insertions, 6 deletions
diff --git a/src/DotNetOpenAuth.AspNet.Test/DotNetOpenAuth.AspNet.Test.csproj b/src/DotNetOpenAuth.AspNet.Test/DotNetOpenAuth.AspNet.Test.csproj index b0315cf..ab4023a 100644 --- a/src/DotNetOpenAuth.AspNet.Test/DotNetOpenAuth.AspNet.Test.csproj +++ b/src/DotNetOpenAuth.AspNet.Test/DotNetOpenAuth.AspNet.Test.csproj @@ -13,6 +13,7 @@ <AssemblyName>DotNetOpenAuth.AspNet.Test</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -37,10 +38,10 @@ </PropertyGroup> <ItemGroup> <Reference Include="Moq"> - <HintPath>..\..\lib\Moq.dll</HintPath> + <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath> </Reference> <Reference Include="nunit.framework"> - <HintPath>..\..\lib\nunit.framework.dll</HintPath> + <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -72,7 +73,11 @@ <Name>DotNetOpenAuth.AspNet</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <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" /> </Project>
\ No newline at end of file diff --git a/src/DotNetOpenAuth.AspNet.Test/packages.config b/src/DotNetOpenAuth.AspNet.Test/packages.config new file mode 100644 index 0000000..a60a41f --- /dev/null +++ b/src/DotNetOpenAuth.AspNet.Test/packages.config @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="Moq" version="4.0.10827" targetFramework="net45" /> + <package id="NUnit" version="2.6.2" targetFramework="net45" /> +</packages>
\ No newline at end of file diff --git a/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj b/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj index fb7ee6b..89daa3f 100644 --- a/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj +++ b/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj @@ -67,8 +67,12 @@ </PropertyGroup> <ItemGroup> <Reference Include="log4net" /> - <Reference Include="Moq" /> - <Reference Include="NUnit.Framework" /> + <Reference Include="Moq"> + <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath> + </Reference> + <Reference Include="nunit.framework"> + <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.configuration" /> <Reference Include="System.Core"> diff --git a/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs b/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs index 8b8b29c..2a4241e 100644 --- a/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs +++ b/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs @@ -136,7 +136,7 @@ namespace DotNetOpenAuth.Test.OAuth2 { var tcs = new TaskCompletionSource<HttpResponseMessage>(); var expectedResponse = new HttpResponseMessage(); - var mockHandler = new Mocks.MockHttpMessageHandler((req, ct) => { + var mockHandler = new DotNetOpenAuth.Test.Mocks.MockHttpMessageHandler((req, ct) => { Assert.That(req.Headers.Authorization.Scheme, Is.EqualTo(Protocol.BearerHttpAuthorizationScheme)); Assert.That(req.Headers.Authorization.Parameter, Is.EqualTo(bearerToken)); tcs.SetResult(expectedResponse); @@ -157,7 +157,7 @@ namespace DotNetOpenAuth.Test.OAuth2 { var tcs = new TaskCompletionSource<HttpResponseMessage>(); var expectedResponse = new HttpResponseMessage(); - var mockHandler = new Mocks.MockHttpMessageHandler((req, ct) => { + var mockHandler = new DotNetOpenAuth.Test.Mocks.MockHttpMessageHandler((req, ct) => { Assert.That(req.Headers.Authorization.Scheme, Is.EqualTo(Protocol.BearerHttpAuthorizationScheme)); Assert.That(req.Headers.Authorization.Parameter, Is.EqualTo(bearerToken)); tcs.SetResult(expectedResponse); diff --git a/src/DotNetOpenAuth.Test/packages.config b/src/DotNetOpenAuth.Test/packages.config index 70866e7..c309d49 100644 --- a/src/DotNetOpenAuth.Test/packages.config +++ b/src/DotNetOpenAuth.Test/packages.config @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> + <package id="Moq" version="4.0.10827" targetFramework="net45" /> + <package id="NUnit" version="2.6.2" targetFramework="net45" /> <package id="Validation" version="2.0.1.12362" targetFramework="net40" /> </packages>
\ No newline at end of file diff --git a/src/packages/repositories.config b/src/packages/repositories.config index 0b7a47b..bee3332 100644 --- a/src/packages/repositories.config +++ b/src/packages/repositories.config @@ -2,6 +2,7 @@ <repositories> <repository path="..\..\samples\OAuthConsumerWpf\packages.config" /> <repository path="..\..\samples\OpenIdOfflineProvider\packages.config" /> + <repository path="..\DotNetOpenAuth.AspNet.Test\packages.config" /> <repository path="..\DotNetOpenAuth.AspNet\packages.config" /> <repository path="..\DotNetOpenAuth.Core.UI\packages.config" /> <repository path="..\DotNetOpenAuth.Core\packages.config" /> |