diff options
Diffstat (limited to 'samples/OAuthServiceProvider')
| -rw-r--r-- | samples/OAuthServiceProvider/OAuthServiceProvider.csproj | 18 | ||||
| -rw-r--r-- | samples/OAuthServiceProvider/Web.config | 43 | ||||
| -rw-r--r-- | samples/OAuthServiceProvider/packages.config | 6 |
3 files changed, 26 insertions, 41 deletions
diff --git a/samples/OAuthServiceProvider/OAuthServiceProvider.csproj b/samples/OAuthServiceProvider/OAuthServiceProvider.csproj index c47d670..58e83b5 100644 --- a/samples/OAuthServiceProvider/OAuthServiceProvider.csproj +++ b/samples/OAuthServiceProvider/OAuthServiceProvider.csproj @@ -12,7 +12,7 @@ <IISExpressUseClassicPipelineMode /> <TargetFrameworkProfile /> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir> - <NuGetPackageImportStamp>4abea8c9</NuGetPackageImportStamp> + <NuGetPackageImportStamp>c72b760a</NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -53,14 +53,6 @@ <Reference Include="System.Data.Linq" /> <Reference Include="System.IdentityModel" /> <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"> - <HintPath>..\..\src\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="System.Net.Http.WebRequest" /> <Reference Include="System.ServiceModel" /> <Reference Include="System.Web.ApplicationServices" /> @@ -156,7 +148,6 @@ <SubType>Designer</SubType> </None> <Content Include="Members\Web.config" /> - <Content Include="packages.config" /> </ItemGroup> <ItemGroup> <None Include="Code\DataClasses.dbml.layout"> @@ -230,11 +221,4 @@ --> <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/OAuthServiceProvider/Web.config b/samples/OAuthServiceProvider/Web.config index 84aea1e..4a75422 100644 --- a/samples/OAuthServiceProvider/Web.config +++ b/samples/OAuthServiceProvider/Web.config @@ -1,7 +1,7 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="utf-8"?> <configuration> <configSections> - <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false"/> + <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" /> <sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core"> <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" /> <section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" /> @@ -13,8 +13,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> @@ -34,7 +34,7 @@ <messaging> <untrustedWebRequest> <whitelistHosts> - <add name="localhost"/> + <add name="localhost" /> </whitelistHosts> </untrustedWebRequest> </messaging> @@ -44,8 +44,7 @@ <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" /> </appSettings> <connectionStrings> - <add name="DatabaseConnectionString" connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\Database.mdf;Integrated Security=True;User Instance=True" - providerName="System.Data.SqlClient" /> + <add name="DatabaseConnectionString" connectionString="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\Database.mdf;Integrated Security=True;User Instance=True" providerName="System.Data.SqlClient" /> </connectionStrings> <system.web> @@ -65,7 +64,7 @@ <authentication mode="Forms"> <forms name="oauthSP" /> </authentication> - <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/> + <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" /> </system.web> <!-- The system.webServer section is required for running ASP.NET AJAX under Internet @@ -74,27 +73,27 @@ <log4net> <appender name="TracePageAppender" type="OAuthServiceProvider.Code.TracePageAppender, OAuthServiceProvider"> <layout type="log4net.Layout.PatternLayout"> - <conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline"/> + <conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" /> </layout> </appender> <!-- Setup the root category, add the appenders and set the default level --> <root> - <level value="INFO"/> + <level value="INFO" /> <!--<appender-ref ref="RollingFileAppender" />--> - <appender-ref ref="TracePageAppender"/> + <appender-ref ref="TracePageAppender" /> </root> <!-- Specify the level for some specific categories --> <logger name="DotNetOpenAuth"> - <level value="ALL"/> + <level value="ALL" /> </logger> </log4net> <system.serviceModel> <behaviors> <serviceBehaviors> <behavior name="DataApiBehavior"> - <serviceMetadata httpGetEnabled="true"/> - <serviceDebug includeExceptionDetailInFaults="true"/> - <serviceAuthorization serviceAuthorizationManagerType="OAuthServiceProvider.Code.OAuthAuthorizationManager, OAuthServiceProvider" principalPermissionMode="Custom"/> + <serviceMetadata httpGetEnabled="true" /> + <serviceDebug includeExceptionDetailInFaults="true" /> + <serviceAuthorization serviceAuthorizationManagerType="OAuthServiceProvider.Code.OAuthAuthorizationManager, OAuthServiceProvider" principalPermissionMode="Custom" /> </behavior> </serviceBehaviors> </behaviors> @@ -102,14 +101,22 @@ <service behaviorConfiguration="DataApiBehavior" name="OAuthServiceProvider.DataApi"> <endpoint address="" binding="wsHttpBinding" contract="OAuthServiceProvider.Code.IDataApi"> <identity> - <dns value="localhost"/> + <dns value="localhost" /> </identity> </endpoint> - <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/> + <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" /> </service> </services> </system.serviceModel> <system.webServer> - <modules runAllManagedModulesForAllRequests="true"/> + <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/OAuthServiceProvider/packages.config b/samples/OAuthServiceProvider/packages.config deleted file mode 100644 index cba8b3a..0000000 --- a/samples/OAuthServiceProvider/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 |