Skip to content
This repository was archived by the owner on Mar 20, 2019. It is now read-only.

Commit e443509

Browse files
DavidChristiansenDavidChristiansen
committed
Merge pull request #379 from lcalabrese/develop
StyleCop, fix tests, remove Microsoft.Net.Http and Microsoft.Bcl dependencies
2 parents e774db2 + 6da912c commit e443509

File tree

87 files changed

+347
-810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+347
-810
lines changed

‎nuget/DotNetOpenAuth.Core.nuspec‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
<frameworkAssembly assemblyName="System.Configuration" targetFramework="net40" />
1818
</frameworkAssemblies>
1919
<dependencies>
20-
<dependency id="Microsoft.Net.Http" />
20+
<group targetFramework="net40">
21+
<dependency id="Microsoft.Net.Http" />
22+
</group>
2123
</dependencies>
2224
</metadata>
2325
<files>
@@ -30,4 +32,4 @@
3032
<file src="..\src\$Identity$\**\*.cs" target="src" exclude="..\src\$Identity$\obj\**" />
3133
<file src="$GeneratedAssemblyInfoSourceFile$" target="src" />
3234
</files>
33-
</package>
35+
</package>

‎samples/DotNetOpenAuth.ApplicationBlock/DotNetOpenAuth.ApplicationBlock.csproj‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<UseApplicationTrust>false</UseApplicationTrust>
3535
<BootstrapperEnabled>true</BootstrapperEnabled>
3636
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir>
37-
<NuGetPackageImportStamp>d1b81524</NuGetPackageImportStamp>
37+
<NuGetPackageImportStamp>f2223ea7</NuGetPackageImportStamp>
3838
</PropertyGroup>
3939
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4040
<DebugSymbols>true</DebugSymbols>
@@ -80,14 +80,6 @@
8080
<RequiredTargetFramework>3.5</RequiredTargetFramework>
8181
</Reference>
8282
<Reference Include="System.Net.Http" />
83-
<Reference Include="System.Net.Http.Extensions">
84-
<HintPath>..\..\src\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
85-
<Private>True</Private>
86-
</Reference>
87-
<Reference Include="System.Net.Http.Primitives, Version=4.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
88-
<SpecificVersion>False</SpecificVersion>
89-
<HintPath>..\..\src\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
90-
</Reference>
9183
<Reference Include="System.Net.Http.WebRequest" />
9284
<Reference Include="System.Runtime.Serialization" />
9385
<Reference Include="System.ServiceModel.Web" />
@@ -191,16 +183,10 @@
191183
</ProjectReference>
192184
</ItemGroup>
193185
<ItemGroup>
186+
<None Include="app.config" />
194187
<None Include="packages.config" />
195188
</ItemGroup>
196189
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
197190
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
198191
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
199-
<Import Project="..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
200-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
201-
<PropertyGroup>
202-
<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>
203-
</PropertyGroup>
204-
<Error Condition="!Exists('..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
205-
</Target>
206192
</Project>

‎samples/DotNetOpenAuth.ApplicationBlock/app.config‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎samples/DotNetOpenAuth.ApplicationBlock/packages.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
4-
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
5-
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
63
<package id="Newtonsoft.Json" version="6.0.7" targetFramework="net45" />
74
</packages>

‎samples/OAuth2ProtectedWebApi/OAuth2ProtectedWebApi.csproj‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<IISExpressUseClassicPipelineMode />
2323
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir>
2424
<RestorePackages>true</RestorePackages>
25-
<NuGetPackageImportStamp>7d66c86a</NuGetPackageImportStamp>
25+
<NuGetPackageImportStamp>d57f764f</NuGetPackageImportStamp>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2828
<DebugSymbols>true</DebugSymbols>
@@ -54,18 +54,10 @@
5454
<Reference Include="System" />
5555
<Reference Include="System.Data" />
5656
<Reference Include="System.Drawing" />
57-
<Reference Include="System.Net.Http.Extensions">
58-
<HintPath>..\..\src\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
6157
<Reference Include="System.Net.Http.Formatting">
6258
<HintPath>..\..\src\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
6359
<Private>True</Private>
6460
</Reference>
65-
<Reference Include="System.Net.Http.Primitives, Version=4.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
66-
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\src\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
68-
</Reference>
6961
<Reference Include="System.ServiceModel" />
7062
<Reference Include="System.Web.Entity" />
7163
<Reference Include="System.Web.ApplicationServices" />
@@ -302,13 +294,6 @@
302294
</VisualStudio>
303295
</ProjectExtensions>
304296
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
305-
<Import Project="..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
306-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
307-
<PropertyGroup>
308-
<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>
309-
</PropertyGroup>
310-
<Error Condition="!Exists('..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
311-
</Target>
312297
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
313298
Other similar extension points exist, see Microsoft.Common.targets.
314299
<Target Name="BeforeBuild">

‎samples/OAuth2ProtectedWebApi/packages.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@
1616
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net45" />
1717
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.2" targetFramework="net45" />
1818
<package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
19-
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
20-
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
2119
<package id="Microsoft.jQuery.Unobtrusive.Ajax" version="3.2.2" targetFramework="net45" />
2220
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.2" targetFramework="net45" />
23-
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
2421
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
2522
<package id="Modernizr" version="2.8.3" targetFramework="net45" />
2623
<package id="Newtonsoft.Json" version="6.0.7" targetFramework="net45" />

‎samples/OAuthAuthorizationServer/Global.asax.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
using DotNetOpenAuth.Logging;
1212

13-
/// <summary>
13+
/// <summary>
1414
/// The global MVC Application.
1515
/// </summary>
1616
/// <remarks>
@@ -85,7 +85,7 @@ protected void Application_Start() {
8585

8686
KeyNonceStore = new DatabaseKeyNonceStore();
8787

88-
/// LogProvider.SetCurrentLogProvider(new ....)
88+
//// LogProvider.SetCurrentLogProvider(new ....)
8989
Logger.Info("Sample starting...");
9090
}
9191

‎samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</FileUpgradeFlags>
1616
<OldToolsVersion>4.0</OldToolsVersion>
1717
<UpgradeBackupLocation />
18-
<NuGetPackageImportStamp>09fee6fa</NuGetPackageImportStamp>
18+
<NuGetPackageImportStamp>cff0dd27</NuGetPackageImportStamp>
1919
</PropertyGroup>
2020
<PropertyGroup>
2121
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -244,11 +244,4 @@
244244
</ProjectExtensions>
245245
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
246246
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
247-
<Import Project="..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
248-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
249-
<PropertyGroup>
250-
<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>
251-
</PropertyGroup>
252-
<Error Condition="!Exists('..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
253-
</Target>
254247
</Project>

‎samples/OAuthAuthorizationServer/packages.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,5 @@
33
<package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
44
<package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
6-
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
7-
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
8-
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
96
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
107
</packages>

‎samples/OAuthClient/Code/Logging.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
using DotNetOpenAuth.Logging;
99

10-
/// <summary>
10+
/// <summary>
1111
/// Logging tools for this sample.
1212
/// </summary>
1313
public static class Logging {

0 commit comments

Comments
 (0)