diff options
Diffstat (limited to 'samples/OpenIdProviderWebForms')
4 files changed, 4 insertions, 24 deletions
diff --git a/samples/OpenIdProviderWebForms/Code/TracePageAppender.cs b/samples/OpenIdProviderWebForms/Code/TracePageAppender.cs deleted file mode 100644 index 1bb7a34..0000000 --- a/samples/OpenIdProviderWebForms/Code/TracePageAppender.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace OpenIdProviderWebForms.Code { - using System; - using System.Collections.Generic; - using System.IO; - using System.Web; - - public class TracePageAppender : log4net.Appender.AppenderSkeleton { - protected override void Append(log4net.Core.LoggingEvent loggingEvent) { - StringWriter sw = new StringWriter(Global.LogMessages); - Layout.Format(sw, loggingEvent); - } - } -} diff --git a/samples/OpenIdProviderWebForms/Global.asax.cs b/samples/OpenIdProviderWebForms/Global.asax.cs index 43b1be6..409b6c4 100644 --- a/samples/OpenIdProviderWebForms/Global.asax.cs +++ b/samples/OpenIdProviderWebForms/Global.asax.cs @@ -10,10 +10,13 @@ namespace OpenIdProviderWebForms { using System.IO; using System.Text; using System.Web; + + using DotNetOpenAuth.Logging; + using OpenIdProviderWebForms.Code; public class Global : System.Web.HttpApplication { - public static log4net.ILog Logger = log4net.LogManager.GetLogger(typeof(Global)); + public static ILog Logger = LogProvider.GetLogger(typeof(Global)); internal static StringBuilder LogMessages = new StringBuilder(); @@ -27,15 +30,11 @@ namespace OpenIdProviderWebForms { } protected void Application_Start(object sender, EventArgs e) { - log4net.Config.XmlConfigurator.Configure(); Logger.Info("Sample starting..."); } protected void Application_End(object sender, EventArgs e) { Logger.Info("Sample shutting down..."); - - // this would be automatic, but in partial trust scenarios it is not. - log4net.LogManager.Shutdown(); } protected void Application_BeginRequest(object sender, EventArgs e) { diff --git a/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj b/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj index a5025f0..5c6fbdb 100644 --- a/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj +++ b/samples/OpenIdProviderWebForms/OpenIdProviderWebForms.csproj @@ -61,10 +61,6 @@ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <ItemGroup> - <Reference Include="log4net, Version=1.2.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\src\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath> - </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Data.DataSetExtensions" /> @@ -123,7 +119,6 @@ <Compile Include="Code\InMemoryTokenManager.cs" /> <Compile Include="Code\OAuthHybrid.cs" /> <Compile Include="Code\ReadOnlyXmlMembershipProvider.cs" /> - <Compile Include="Code\TracePageAppender.cs" /> <Compile Include="Code\Util.cs" /> <Compile Include="decide.aspx.cs"> <DependentUpon>decide.aspx</DependentUpon> diff --git a/samples/OpenIdProviderWebForms/packages.config b/samples/OpenIdProviderWebForms/packages.config index ea83ad2..c6cfe98 100644 --- a/samples/OpenIdProviderWebForms/packages.config +++ b/samples/OpenIdProviderWebForms/packages.config @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="log4net" version="2.0.2" targetFramework="net45" /> <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net45" /> <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net45" /> <package id="Microsoft.Net.Http" version="2.2.15" targetFramework="net45" /> |