summaryrefslogtreecommitdiffstats
path: root/samples/OAuthClient
diff options
context:
space:
mode:
Diffstat (limited to 'samples/OAuthClient')
-rw-r--r--samples/OAuthClient/Code/Logging.cs2
-rw-r--r--samples/OAuthClient/Global.asax.cs3
-rw-r--r--samples/OAuthClient/OAuthClient.csproj18
-rw-r--r--samples/OAuthClient/Web.config30
-rw-r--r--samples/OAuthClient/packages.config6
5 files changed, 22 insertions, 37 deletions
diff --git a/samples/OAuthClient/Code/Logging.cs b/samples/OAuthClient/Code/Logging.cs
index 8fbf594..d7d725e 100644
--- a/samples/OAuthClient/Code/Logging.cs
+++ b/samples/OAuthClient/Code/Logging.cs
@@ -7,7 +7,7 @@
using DotNetOpenAuth.Logging;
- /// <summary>
+ /// <summary>
/// Logging tools for this sample.
/// </summary>
public static class Logging {
diff --git a/samples/OAuthClient/Global.asax.cs b/samples/OAuthClient/Global.asax.cs
index 0553cbc..4021896 100644
--- a/samples/OAuthClient/Global.asax.cs
+++ b/samples/OAuthClient/Global.asax.cs
@@ -6,9 +6,8 @@
using DotNetOpenAuth.Logging;
- public partial class Global : HttpApplication {
+ public partial class Global : HttpApplication {
protected void Application_Start(object sender, EventArgs e) {
-
Logging.Logger.Info("Sample starting...");
}
diff --git a/samples/OAuthClient/OAuthClient.csproj b/samples/OAuthClient/OAuthClient.csproj
index 1957b10..4c54aae 100644
--- a/samples/OAuthClient/OAuthClient.csproj
+++ b/samples/OAuthClient/OAuthClient.csproj
@@ -11,7 +11,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir>
- <NuGetPackageImportStamp>a73d8e5b</NuGetPackageImportStamp>
+ <NuGetPackageImportStamp>eafda698</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,14 +54,6 @@
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
- <Reference Include="System.Net.Http.Extensions">
- <HintPath>..\..\src\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>..\..\src\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" />
<Reference Include="System.ServiceModel" />
@@ -91,7 +83,6 @@
<Content Include="Scripts\jquery-1.6.1.js" />
<Content Include="Scripts\jquery-1.6.1.min.js" />
<Content Include="WindowsLive.aspx" />
- <Content Include="packages.config" />
<None Include="Service References\SampleResourceServer\DataApi.disco" />
<None Include="Service References\SampleResourceServer\configuration91.svcinfo" />
<None Include="Service References\SampleResourceServer\configuration.svcinfo" />
@@ -237,11 +228,4 @@
</ProjectExtensions>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
- <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')" />
- <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('..\..\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'))" />
- </Target>
</Project> \ No newline at end of file
diff --git a/samples/OAuthClient/Web.config b/samples/OAuthClient/Web.config
index 2ba90c5..a47aaac 100644
--- a/samples/OAuthClient/Web.config
+++ b/samples/OAuthClient/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />
@@ -14,8 +14,8 @@
which is necessary for OpenID urls with unicode characters in the domain/host name.
It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
<uri>
- <idn enabled="All"/>
- <iriParsing enabled="true"/>
+ <idn enabled="All" />
+ <iriParsing enabled="true" />
</uri>
<system.net>
@@ -44,17 +44,17 @@
<add key="twitterConsumerKey" value="eRJd2AMcOnGqDOtF3IrBQ" />
<add key="twitterConsumerSecret" value="iTijQWFOSDokpkVIPnlLbdmf3wPZgUVqktXKASg0QjM" />
<!-- Google sign-up: https://www.google.com/accounts/ManageDomains -->
- <add key="googleConsumerKey" value="anonymous"/>
- <add key="googleConsumerSecret" value="anonymous"/>
+ <add key="googleConsumerKey" value="anonymous" />
+ <add key="googleConsumerSecret" value="anonymous" />
<!--Google API sign-up: https://code.google.com/apis/console/ (OAuth2) -->
<add key="googleClientID" value="" />
<add key="googleClientSecret" value="" />
<!-- Yammer sign-up: https://www.yammer.com/client_applications/new -->
- <add key="yammerConsumerKey" value=""/>
- <add key="yammerConsumerSecret" value=""/>
+ <add key="yammerConsumerKey" value="" />
+ <add key="yammerConsumerSecret" value="" />
<!-- Facebook sign-up: http://developers.facebook.com/setup/ -->
- <add key="facebookAppID" value="367207604173"/>
- <add key="facebookAppSecret" value="1df77e64055c4d7d3583cefdf2bc62d7"/>
+ <add key="facebookAppID" value="367207604173" />
+ <add key="facebookAppSecret" value="1df77e64055c4d7d3583cefdf2bc62d7" />
<!-- Windows Live sign-up: http://go.microsoft.com/fwlink/p/?LinkId=193157 -->
<add key="windowsLiveAppID" value="000000004408E558" />
<add key="windowsLiveAppSecret" value="od8NVdanEIWqmlKu9hOepBE3AfUu4jCw" />
@@ -64,7 +64,7 @@
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
</appSettings>
- <connectionStrings/>
+ <connectionStrings />
<system.web>
<httpRuntime targetFramework="4.5" />
@@ -80,7 +80,7 @@
of the security authentication mode used by
ASP.NET to identify an incoming user.
-->
- <authentication mode="Windows"/>
+ <authentication mode="Windows" />
<!--
The <customErrors> section enables configuration
of what to do if/when an unhandled error occurs
@@ -140,4 +140,12 @@
<system.webServer>
<modules runAllManagedModulesForAllRequests="true" />
</system.webServer>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
</configuration> \ No newline at end of file
diff --git a/samples/OAuthClient/packages.config b/samples/OAuthClient/packages.config
deleted file mode 100644
index cba8b3a..0000000
--- a/samples/OAuthClient/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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" />
-</packages> \ No newline at end of file
generated by cgit v1.1 at 2025-05-10 23:32:12 +0000