diff options
author | David Christiansen <david.christiansen@civil.lmco.com> | 2015-01-05 17:02:04 +0000 |
---|---|---|
committer | David Christiansen <david.christiansen@civil.lmco.com> | 2015-01-05 17:02:04 +0000 |
commit | 26ddb1b78f25d306863740ec35f9ebe327cf3a8b (patch) | |
tree | 61207d6807f71de0ef106a5be6e539bd9d5e3b77 /src/DotNetOpenAuth.Test | |
parent | 317597141f00b6ef20a0b03d61f8a674af410436 (diff) | |
download | DotNetOpenAuth-26ddb1b78f25d306863740ec35f9ebe327cf3a8b.zip DotNetOpenAuth-26ddb1b78f25d306863740ec35f9ebe327cf3a8b.tar.gz DotNetOpenAuth-26ddb1b78f25d306863740ec35f9ebe327cf3a8b.tar.bz2 |
Test green
- Packages update
Diffstat (limited to 'src/DotNetOpenAuth.Test')
7 files changed, 9 insertions, 74 deletions
diff --git a/src/DotNetOpenAuth.Test/App.config b/src/DotNetOpenAuth.Test/App.config index 16f07fc..b2e5092 100644 --- a/src/DotNetOpenAuth.Test/App.config +++ b/src/DotNetOpenAuth.Test/App.config @@ -61,12 +61,4 @@ <system.diagnostics> <assert assertuienabled="false"/> </system.diagnostics> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31BF3856AD364E35" culture="neutral"/> - <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/> - </dependentAssembly> - </assemblyBinding> - </runtime> </configuration> diff --git a/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj b/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj index 590fc12..e6ad9b7 100644 --- a/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj +++ b/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj @@ -6,7 +6,7 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> - <NuGetPackageImportStamp>1dd2ad2f</NuGetPackageImportStamp> + <NuGetPackageImportStamp>21a885ee</NuGetPackageImportStamp> </PropertyGroup> <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.props" /> <PropertyGroup> @@ -80,23 +80,7 @@ <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> </Reference> - <Reference Include="System.Data" /> - <Reference Include="System.Data.DataSetExtensions"> - <RequiredTargetFramework>3.5</RequiredTargetFramework> - </Reference> <Reference Include="System.Net.Http" /> - <Reference Include="System.Net.Http.Extensions, Version=2.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.Extensions.dll</HintPath> - </Reference> - <Reference Include="System.Net.Http.Formatting, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\bin\v4.5\Debug\System.Net.Http.Formatting.dll</HintPath> - </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="System.Runtime.Serialization"> <RequiredTargetFramework>3.0</RequiredTargetFramework> @@ -107,9 +91,6 @@ <Reference Include="System.ServiceModel.Web" /> <Reference Include="System.Web" /> <Reference Include="System.Xml" /> - <Reference Include="System.Xml.Linq"> - <RequiredTargetFramework>3.5</RequiredTargetFramework> - </Reference> <Reference Include="Validation, Version=2.0.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\packages\Validation.2.0.6.15003\lib\portable-net40+sl50+win+wpa81+wp80+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Validation.dll</HintPath> @@ -318,18 +299,10 @@ <EmbeddedResource Include="OpenId\Discovery\htmldiscovery\html20provWithBadXrds.html" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\DotNetOpenAuth.Core.UI\DotNetOpenAuth.Core.UI.csproj"> - <Project>{173E7B8D-E751-46E2-A133-F72297C0D2F4}</Project> - <Name>DotNetOpenAuth.Core.UI</Name> - </ProjectReference> <ProjectReference Include="..\DotNetOpenAuth.Core\DotNetOpenAuth.Core.csproj"> <Project>{60426312-6AE5-4835-8667-37EDEA670222}</Project> <Name>DotNetOpenAuth.Core</Name> </ProjectReference> - <ProjectReference Include="..\DotNetOpenAuth.OAuth.Common\DotNetOpenAuth.OAuth.Common.csproj"> - <Project>{115217c5-22cd-415c-a292-0dd0238cdd89}</Project> - <Name>DotNetOpenAuth.OAuth.Common</Name> - </ProjectReference> <ProjectReference Include="..\DotNetOpenAuth.OAuth.Consumer\DotNetOpenAuth.OAuth.Consumer.csproj"> <Project>{B202E40D-4663-4A2B-ACDA-865F88FF7CAA}</Project> <Name>DotNetOpenAuth.OAuth.Consumer</Name> @@ -342,10 +315,6 @@ <Project>{99BB7543-EA16-43EE-A7BC-D7A25A3B22F6}</Project> <Name>DotNetOpenAuth.OAuth2.AuthorizationServer</Name> </ProjectReference> - <ProjectReference Include="..\DotNetOpenAuth.OAuth2.Client.UI\DotNetOpenAuth.OAuth2.Client.UI.csproj"> - <Project>{ADC2CC8C-541E-4F86-ACB1-DD504A36FA4B}</Project> - <Name>DotNetOpenAuth.OAuth2.Client.UI</Name> - </ProjectReference> <ProjectReference Include="..\DotNetOpenAuth.OAuth2.ClientAuthorization\DotNetOpenAuth.OAuth2.ClientAuthorization.csproj"> <Project>{CCF3728A-B3D7-404A-9BC6-75197135F2D7}</Project> <Name>DotNetOpenAuth.OAuth2.ClientAuthorization</Name> @@ -366,10 +335,6 @@ <Project>{A288FCC8-6FCF-46DA-A45E-5F9281556361}</Project> <Name>DotNetOpenAuth.OAuth</Name> </ProjectReference> - <ProjectReference Include="..\DotNetOpenAuth.OpenId.Provider.UI\DotNetOpenAuth.OpenId.Provider.UI.csproj"> - <Project>{9D0F8866-2131-4C2A-BC0E-16FEA5B50828}</Project> - <Name>DotNetOpenAuth.OpenId.Provider.UI</Name> - </ProjectReference> <ProjectReference Include="..\DotNetOpenAuth.OpenId.Provider\DotNetOpenAuth.OpenId.Provider.csproj"> <Project>{F8284738-3B5D-4733-A511-38C23F4A763F}</Project> <Name>DotNetOpenAuth.OpenId.Provider</Name> @@ -382,22 +347,10 @@ <Project>{F458AB60-BA1C-43D9-8CEF-EC01B50BE87B}</Project> <Name>DotNetOpenAuth.OpenId.RelyingParty</Name> </ProjectReference> - <ProjectReference Include="..\DotNetOpenAuth.OpenId.UI\DotNetOpenAuth.OpenId.UI.csproj"> - <Project>{75E13AAE-7D51-4421-ABFD-3F3DC91F576E}</Project> - <Name>DotNetOpenAuth.OpenId.UI</Name> - </ProjectReference> - <ProjectReference Include="..\DotNetOpenAuth.OpenIdOAuth\DotNetOpenAuth.OpenIdOAuth.csproj"> - <Project>{4bfaa336-5df3-4f27-82d3-06d13240e8ab}</Project> - <Name>DotNetOpenAuth.OpenIdOAuth</Name> - </ProjectReference> <ProjectReference Include="..\DotNetOpenAuth.OpenId\DotNetOpenAuth.OpenId.csproj"> <Project>{3896A32A-E876-4C23-B9B8-78E17D134CD3}</Project> <Name>DotNetOpenAuth.OpenId</Name> </ProjectReference> - <ProjectReference Include="..\Mono.Math\Mono.Math.csproj"> - <Project>{F4CD3C04-6037-4946-B7A5-34BFC96A75D2}</Project> - <Name>Mono.Math</Name> - </ProjectReference> <ProjectReference Include="..\Org.Mentalis.Security.Cryptography\Org.Mentalis.Security.Cryptography.csproj"> <Project>{26DC877F-5987-48DD-9DDB-E62F2DE0E150}</Project> <Name>Org.Mentalis.Security.Cryptography</Name> @@ -407,11 +360,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.Test/Messaging/MessagingTestBase.cs b/src/DotNetOpenAuth.Test/Messaging/MessagingTestBase.cs index ea39397..6bc4ab7 100644 --- a/src/DotNetOpenAuth.Test/Messaging/MessagingTestBase.cs +++ b/src/DotNetOpenAuth.Test/Messaging/MessagingTestBase.cs @@ -107,7 +107,7 @@ namespace DotNetOpenAuth.Test { message.Age = 15; } if (fill >= FieldFill.AllRequired) { - message.Timestamp = DateTime.ParseExact("09/09/2008 08:00", "dd/MM/yyyy hh:mm", CultureInfo.InvariantCulture); + message.Timestamp = DateTime.ParseExact("09/09/2008 08:00", "dd/MM/yyyy hh:mm", CultureInfo.InvariantCulture); } if (fill >= FieldFill.CompleteBeforeBindings) { message.Name = "Andrew"; diff --git a/src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs b/src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs index 11fdfd0..0a49473 100644 --- a/src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs +++ b/src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs @@ -220,10 +220,10 @@ namespace DotNetOpenAuth.Test.Messaging { [Test] public void DeserializeFromJson() { var message = new TestMessageWithDate(); - string json = "{\"ts\":\"2012-04-28T08:00:00Z\",\"age\":18,\"Name\":\"Andrew\"}"; + string json = "{\"ts\":\"2012-04-28T08:00:00Z\",\"age\":18,\"Name\":\"Andrew\"}"; MessagingUtilities.DeserializeFromJson(Encoding.UTF8.GetBytes(json), message, this.MessageDescriptions); Assert.That(message.Age, Is.EqualTo(18)); - Assert.That(message.Timestamp, Is.EqualTo(DateTime.ParseExact("28/04/2012 08:00", "dd/MM/yyyy hh:mm", CultureInfo.InvariantCulture))); + Assert.That(message.Timestamp, Is.EqualTo(DateTime.ParseExact("28/04/2012 08:00", "dd/MM/yyyy hh:mm", CultureInfo.InvariantCulture))); Assert.That(message.Name, Is.EqualTo("Andrew")); } diff --git a/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs b/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs index ae1b115..23e9864 100644 --- a/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs +++ b/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs @@ -95,7 +95,7 @@ namespace DotNetOpenAuth.Test.OpenId.Messages { responseReplay.UtcCreationDate = local; DateTime utcCreationDate = responseReplay.UtcCreationDate; Assert.AreEqual(DateTimeKind.Utc, utcCreationDate.Kind, "Local time should have been converted to universal time."); - //Assert.AreNotEqual(local.Hour, utcCreationDate.Hour, "The hour was expected to change (unless local time _is_ UTC time for this PC!)"); + //Assert.AreNotEqual(local.Hour, utcCreationDate.Hour, "The hour was expected to change (unless local time _is_ UTC time for this PC!)"); // Now try setting UTC time just to make sure it DOESN'T mangle the hour if (this.creationDate.Kind != DateTimeKind.Utc) { diff --git a/src/DotNetOpenAuth.Test/TestUtilities.cs b/src/DotNetOpenAuth.Test/TestUtilities.cs index f56a408..a52cde9 100644 --- a/src/DotNetOpenAuth.Test/TestUtilities.cs +++ b/src/DotNetOpenAuth.Test/TestUtilities.cs @@ -5,13 +5,13 @@ //----------------------------------------------------------------------- namespace DotNetOpenAuth.Test { - using System.Collections.Specialized; + using System.Collections.Specialized; - using DotNetOpenAuth.Logging; + using DotNetOpenAuth.Logging; - using Validation; + using Validation; - /// <summary> + /// <summary> /// An assortment of methods useful for testing. /// </summary> internal static class TestUtilities { diff --git a/src/DotNetOpenAuth.Test/packages.config b/src/DotNetOpenAuth.Test/packages.config index dee9206..a11f102 100644 --- a/src/DotNetOpenAuth.Test/packages.config +++ b/src/DotNetOpenAuth.Test/packages.config @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <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="Moq" version="4.2.1409.1722" targetFramework="net45" /> <package id="NUnit" version="2.6.4" targetFramework="net45" /> <package id="Validation" version="2.0.6.15003" targetFramework="net45" /> |