diff options
Diffstat (limited to 'samples/OpenIdProviderWebForms')
| -rw-r--r-- | samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj | 10 | ||||
| -rw-r--r-- | samples/OpenIdProviderWebForms/Web.config | 56 | ||||
| -rw-r--r-- | samples/OpenIdProviderWebForms/packages.config | 6 |
3 files changed, 32 insertions, 40 deletions
diff --git a/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj b/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj index 353690e..189ba9f 100644 --- a/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj +++ b/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj @@ -10,7 +10,7 @@ <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication> <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir> - <NuGetPackageImportStamp>d1063c84</NuGetPackageImportStamp> + <NuGetPackageImportStamp>49ffad78</NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -193,7 +193,6 @@ </None> <Content Include="images\DotNetOpenAuth.png" /> <Content Include="Provider.ashx" /> - <Content Include="packages.config" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\src\DotNetOpenAuth.Core\DotNetOpenAuth.Core.csproj"> @@ -263,11 +262,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/OpenIdProviderWebForms/Web.config b/samples/OpenIdProviderWebForms/Web.config index c028df1..06604bf 100644 --- a/samples/OpenIdProviderWebForms/Web.config +++ b/samples/OpenIdProviderWebForms/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="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" /> <section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" /> @@ -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> @@ -47,7 +47,7 @@ <untrustedWebRequest> <whitelistHosts> <!-- since this is a sample, and will often be used with localhost --> - <add name="localhost"/> + <add name="localhost" /> </whitelistHosts> </untrustedWebRequest> </messaging> @@ -57,7 +57,7 @@ <appSettings> <!-- Get your own Yubico API key here: https://upgrade.yubico.com/getapikey/ --> - <add key="YubicoAPIKey" value="3961"/> + <add key="YubicoAPIKey" value="3961" /> <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" /> </appSettings> @@ -71,50 +71,50 @@ during development. --> <compilation debug="true" targetFramework="4.0" /> - <sessionState mode="InProc" cookieless="false"/> + <sessionState mode="InProc" cookieless="false" /> <membership defaultProvider="AspNetReadOnlyXmlMembershipProvider"> <providers> - <clear/> - <add name="AspNetReadOnlyXmlMembershipProvider" type="OpenIdProviderWebForms.Code.ReadOnlyXmlMembershipProvider" description="Read-only XML membership provider" xmlFileName="~/App_Data/Users.xml"/> + <clear /> + <add name="AspNetReadOnlyXmlMembershipProvider" type="OpenIdProviderWebForms.Code.ReadOnlyXmlMembershipProvider" description="Read-only XML membership provider" xmlFileName="~/App_Data/Users.xml" /> </providers> </membership> <authentication mode="Forms"> <!-- named cookie prevents conflicts with other samples --> - <forms name="OpenIdProviderWebForms"/> + <forms name="OpenIdProviderWebForms" /> </authentication> - <customErrors mode="RemoteOnly"/> + <customErrors mode="RemoteOnly" /> <!-- Trust level discussion: Full: everything works (this is required for Google Apps for Domains support) High: TRACE compilation symbol must NOT be defined Medium: doesn't work unless originUrl=".*" or WebPermission.Connect is extended, and Google Apps doesn't work. Low: doesn't work because WebPermission.Connect is denied. --> - <trust level="Full" originUrl=".*"/> - <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/> + <trust level="Full" originUrl=".*" /> + <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" /> </system.web> <location path="decide.aspx"> <system.web> <authorization> - <deny users="?"/> + <deny users="?" /> </authorization> </system.web> </location> <!-- log4net is a 3rd party (free) logger library that DotNetOpenAuth will use if present but does not require. --> <log4net> <appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender"> - <file value="Provider.log"/> - <appendToFile value="true"/> - <rollingStyle value="Size"/> - <maxSizeRollBackups value="10"/> - <maximumFileSize value="100KB"/> - <staticLogFileName value="true"/> + <file value="Provider.log" /> + <appendToFile value="true" /> + <rollingStyle value="Size" /> + <maxSizeRollBackups value="10" /> + <maximumFileSize value="100KB" /> + <staticLogFileName value="true" /> <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> <appender name="TracePageAppender" type="OpenIdProviderWebForms.Code.TracePageAppender, OpenIdProviderWebForms"> <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 --> @@ -125,13 +125,19 @@ </root> <!-- Specify the level for some specific categories --> <logger name="DotNetOpenAuth"> - <level value="INFO"/> + <level value="INFO" /> </logger> </log4net> <runtime> - <legacyHMACWarning enabled="0"/> + <legacyHMACWarning enabled="0" /> + <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> <system.webServer> - <modules runAllManagedModulesForAllRequests="true"/> + <modules runAllManagedModulesForAllRequests="true" /> </system.webServer> </configuration>
\ No newline at end of file diff --git a/samples/OpenIdProviderWebForms/packages.config b/samples/OpenIdProviderWebForms/packages.config deleted file mode 100644 index cba8b3a..0000000 --- a/samples/OpenIdProviderWebForms/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 |