From 9dfe53fef873fa5e59a34e1cc0c55e0fcfbde443 Mon Sep 17 00:00:00 2001
From: Warren <warren@umbraco.com>
Date: Fri, 27 Jul 2018 14:15:34 +0100
Subject: [PATCH] Log4Net config files removed from disk & CSProj Removes
 references to Log4Net from Web.Config's

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  4 --
 .../config/log4net.Release.config             | 49 -------------------
 src/Umbraco.Web.UI/config/log4net.config      | 49 -------------------
 src/Umbraco.Web.UI/web.Template.Debug.config  |  7 ---
 src/Umbraco.Web.UI/web.Template.config        |  9 +---
 5 files changed, 1 insertion(+), 117 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/config/log4net.Release.config
 delete mode 100644 src/Umbraco.Web.UI/config/log4net.config

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index b552d37ce8..c9414af1ea 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -266,9 +266,6 @@
     <Content Include="Config\imageprocessor\cache.config">
       <SubType>Designer</SubType>
     </Content>
-    <None Include="Config\log4net.Release.config">
-      <DependentUpon>log4net.config</DependentUpon>
-    </None>
     <None Include="Config\FileSystemProviders.Release.config">
       <DependentUpon>FileSystemProviders.config</DependentUpon>
     </None>
@@ -548,7 +545,6 @@
     <Content Include="Config\umbracoSettings.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Config\log4net.config" />
     <Content Include="Config\FileSystemProviders.config" />
     <Content Include="Config\EmbeddedMedia.config" />
     <Content Include="Config\BackOfficeTours\getting-started.json" />
diff --git a/src/Umbraco.Web.UI/config/log4net.Release.config b/src/Umbraco.Web.UI/config/log4net.Release.config
deleted file mode 100644
index 9993f88371..0000000000
--- a/src/Umbraco.Web.UI/config/log4net.Release.config
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<log4net>
-
-  <!--
-    note - if log4net is not logging at all
-
-    set <log4net debug="true"> above
-    set web.config with
-
-    <system.diagnostics>
-      <trace autoflush="true">
-        <listeners>
-          <add
-            name="textWriterTraceListener"
-            type="System.Diagnostics.TextWriterTraceListener"
-            initializeData="c:\path\to\log4net.txt" />
-        </listeners>
-      </trace>
-    </system.diagnostics>
-  -->
-
-  <root>
-    <priority value="Info"/>
-    <appender-ref ref="AsynchronousLog4NetAppender" />
-  </root>
-
-  <appender name="rollingFile" type="log4net.Appender.RollingFileAppender">
-	  <file type="log4net.Util.PatternString" value="App_Data\Logs\UmbracoTraceLog.%property{log4net:HostName}.txt" />
-    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-    <appendToFile value="true" />
-    <rollingStyle value="Date" />
-    <maximumFileSize value="5MB" />
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
-    </layout>
-    <encoding value="utf-8" />
-  </appender>
-
-  <appender name="AsynchronousLog4NetAppender" type="Log4Net.Async.ParallelForwardingAppender,Log4Net.Async">
-    <appender-ref ref="rollingFile" />
-  </appender>
-
-  <!--Here you can change the way logging works for certain namespaces  -->
-
-  <logger name="NHibernate">
-    <level value="WARN" />
-  </logger>
-
-</log4net>
diff --git a/src/Umbraco.Web.UI/config/log4net.config b/src/Umbraco.Web.UI/config/log4net.config
deleted file mode 100644
index d9d107cd8d..0000000000
--- a/src/Umbraco.Web.UI/config/log4net.config
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<log4net>
-
-  <!--
-    note - if log4net is not logging at all
-
-    set <log4net debug="true"> above
-    set web.config with
-
-    <system.diagnostics>
-      <trace autoflush="true">
-        <listeners>
-          <add
-            name="textWriterTraceListener"
-            type="System.Diagnostics.TextWriterTraceListener"
-            initializeData="c:\path\to\log4net.txt" />
-        </listeners>
-      </trace>
-    </system.diagnostics>
-  -->
-
-  <root>
-    <priority value="Debug"/>
-    <appender-ref ref="AsynchronousLog4NetAppender" />
-  </root>
-
-  <appender name="rollingFile" type="log4net.Appender.RollingFileAppender">
-	  <file type="log4net.Util.PatternString" value="App_Data\Logs\UmbracoTraceLog.%property{log4net:HostName}.txt" />
-    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-    <appendToFile value="true" />
-    <rollingStyle value="Date" />
-    <maximumFileSize value="5MB" />
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
-    </layout>
-    <encoding value="utf-8" />
-  </appender>
-
-  <appender name="AsynchronousLog4NetAppender" type="Log4Net.Async.ParallelForwardingAppender,Log4Net.Async">
-    <appender-ref ref="rollingFile" />
-  </appender>
-
-  <!--Here you can change the way logging works for certain namespaces  -->
-
-  <logger name="NHibernate">
-    <level value="WARN" />
-  </logger>
-
-</log4net>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config
index c4804160e1..080eef37da 100644
--- a/src/Umbraco.Web.UI/web.Template.Debug.config
+++ b/src/Umbraco.Web.UI/web.Template.Debug.config
@@ -70,7 +70,6 @@
     <add key="webpages:Enabled" value="false" />
     <add key="enableSimpleMembership" value="false" />
     <add key="autoFormsAuthentication" value="false" />
-    <add key="log4net.Config" value="config\log4net.config" />
     <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Transform="InsertIfMissing" xdt:Locator="Match(key)"  />
   </appSettings>
 
@@ -416,12 +415,6 @@
         <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
 
-      <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='log4net']])" />
-      <dependentAssembly xdt:Transform="Insert">
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
-      </dependentAssembly>
-
       <dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Microsoft.CodeAnalysis']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 3bcd14aed7..9a2f27bac5 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -12,8 +12,7 @@
         <section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
         <section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
         <section name="ExamineLuceneIndexSets" type="Umbraco.Examine.Config.IndexSets, Umbraco.Examine" requirePermission="false" />
-        <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" requirePermission="false" />
-
+        
         <sectionGroup name="umbracoConfiguration">
             <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
             <section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
@@ -39,7 +38,6 @@
     <clientDependency configSource="config\ClientDependency.config" />
     <Examine configSource="config\ExamineSettings.config" />
     <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
-    <log4net configSource="config\log4net.config" />
 
     <appSettings>
         <add key="umbracoConfigurationStatus" value="" />
@@ -58,7 +56,6 @@
         <add key="autoFormsAuthentication" value="false" />
         <add key="dataAnnotations:dataTypeAttribute:disableRegEx" value="false"/>
 
-        <add key="log4net.Config" value="config\log4net.config" />
         <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" />
 
         <add key="Umbraco.ModelsBuilder.Enable" value="true" />
@@ -242,10 +239,6 @@
 
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly>
-                <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
-            </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
                 <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>