Skip to content

Bump log4net from 2.0.10 to 3.3.0 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChrisRichner merged 1 commit into from
Apr 14, 2026
Merged

Bump log4net from 2.0.10 to 3.3.0 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions GuideEnricher.Tests/UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
<Reference Include="log4net, Version=3.3.0.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a">
<HintPath>..\packages\log4net.3.3.0\lib\net462\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
Expand Down
84 changes: 44 additions & 40 deletions GuideEnricher.Tests/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="seriesMapping" type="GuideEnricher.Config.SeriesNameMapsSection, GuideEnricherService, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" allowDefinition="Everywhere" allowExeDefinition="MachineToApplication" restartOnExternalChanges="true"/>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
<section name="MatchMethodsSection" type="GuideEnricher.Config.MatchMethodsSection, GuideEnricherService"/>
<section name="seriesMapping" type="GuideEnricher.Config.SeriesNameMapsSection, GuideEnricherService, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" allowDefinition="Everywhere" allowExeDefinition="MachineToApplication" restartOnExternalChanges="true" />
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
<section name="MatchMethodsSection" type="GuideEnricher.Config.MatchMethodsSection, GuideEnricherService" />
</configSections>
<seriesMapping>
</seriesMapping>
<MatchMethodsSection>
<MatchMethods>
<add name="GuideEnricher.EpisodeMatchMethods.EpisodeTitleMatchMethod"/>
<add name="GuideEnricher.EpisodeMatchMethods.NoPunctuationMatchMethod"/>
<add name="GuideEnricher.EpisodeMatchMethods.RemoveCommonWordsMatchMethod"/>
<add name="GuideEnricher.EpisodeMatchMethods.InQuotesInDescriptionMatchMethod"/>
<add name="GuideEnricher.EpisodeMatchMethods.FirstSentenceInDescriptionMatchMethod"/>
<add name="GuideEnricher.EpisodeMatchMethods.DescriptionStartsWithEpisodeTitleMatchMethod"/>
<add name="GuideEnricher.EpisodeMatchMethods.SeasonAndEpisodeInDescriptionMatchMethod"/>
<add name="GuideEnricher.EpisodeMatchMethods.NumericSeasonEpisodeMatchMethod"/>
<add name="GuideEnricher.EpisodeMatchMethods.AirDateMatchMethod"/>
<add name="GuideEnricher.EpisodeMatchMethods.AbsoluteEpisodeNumberMatchMethod"/>
<add name="GuideEnricher.EpisodeMatchMethods.EpisodeTitleMatchMethod" />
<add name="GuideEnricher.EpisodeMatchMethods.NoPunctuationMatchMethod" />
<add name="GuideEnricher.EpisodeMatchMethods.RemoveCommonWordsMatchMethod" />
<add name="GuideEnricher.EpisodeMatchMethods.InQuotesInDescriptionMatchMethod" />
<add name="GuideEnricher.EpisodeMatchMethods.FirstSentenceInDescriptionMatchMethod" />
<add name="GuideEnricher.EpisodeMatchMethods.DescriptionStartsWithEpisodeTitleMatchMethod" />
<add name="GuideEnricher.EpisodeMatchMethods.SeasonAndEpisodeInDescriptionMatchMethod" />
<add name="GuideEnricher.EpisodeMatchMethods.NumericSeasonEpisodeMatchMethod" />
<add name="GuideEnricher.EpisodeMatchMethods.AirDateMatchMethod" />
<add name="GuideEnricher.EpisodeMatchMethods.AbsoluteEpisodeNumberMatchMethod" />
</MatchMethods>
</MatchMethodsSection>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="guideenricher.log"/>
<appendToFile value="true"/>
<maxSizeRollBackups value="10"/>
<maximumFileSize value="5MB"/>
<rollingStyle value="Size"/>
<staticLogFileName value="true"/>
<file value="guideenricher.log" />
<appendToFile value="true" />
<maxSizeRollBackups value="10" />
<maximumFileSize value="5MB" />
<rollingStyle value="Size" />
<staticLogFileName value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger - %message%newline"/>
<conversionPattern value="%date{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger - %message%newline" />
</layout>
</appender>
<appender name="Console" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%message%newline"/>
<conversionPattern value="%message%newline" />
</layout>
</appender>
<root>
<level value="ERROR"/>
<appender-ref ref="RollingLogFileAppender"/>
<appender-ref ref="Console"/>
<level value="ERROR" />
<appender-ref ref="RollingLogFileAppender" />
<appender-ref ref="Console" />
</root>
</log4net>
<appSettings>
<!-- Location to store cache of thetvdb.com data -->
<add key="TvDbLibCache" value="c:\\tvdblibcache\\"/>
<add key="TvDbLibCache" value="c:\\tvdblibcache\\" />
<!-- uncomment the following line and set it to your language if you want to use another language than en (de for German, fr for French, ...) -->
<!-- <add key="TvDbLanguage" value="de"/> -->
<!--
Expand All @@ -55,12 +55,12 @@
Make sure the port is not used by anything else... i.e.,
if you have issues, try changing the port.
-->
<add key="serviceUrl" value="net.tcp://localhost:49830/GuideEnricher"/>
<add key="serviceUrl" value="net.tcp://localhost:49830/GuideEnricher" />
<!--
how long the wait thread waits before doing a run of guide enricher

-->
<add key="sleepTimeInHours" value="12"/>
<add key="sleepTimeInHours" value="12" />

<!--
This number determines the maxiumum number of shows that can be updated at once.
Expand All @@ -71,48 +71,52 @@
the webservice call for taking too long to update the shows. So the number is
probably dependent on the FTR server performance
-->
<add key="maxShowNumberPerUpdate" value="20"/>
<add key="maxShowNumberPerUpdate" value="20" />

<!--
The next properties are used to build the
URL to the FTR server
-->
<add key="ftrUrlHost" value="mc"/>
<add key="ftrUrlPort" value="49942"/>
<add key="ftrUrlHost" value="mc" />
<add key="ftrUrlPort" value="49942" />
<!-- leave ftrUrlPassword blank if you don't use password -->
<add key="ftrUrlPassword" value=""/>
<add key="ftrUrlPassword" value="" />
<!--
set dumpepisodes to 'true' if you want all episodes for a series dumped in the log file
make sure logging is set to at least info level
-->
<add key="dumpepisodes" value="false"/>
<add key="dumpepisodes" value="false" />
<!--
set updateAll to true if you want to refresh all information in your schedules with the infromation from theTvDb
This is useful if a shows information is completely changed on theTvDb, or you suspect a bad run of the enricher.
-->
<add key="updateAll" value="false"/>
<add key="updateAll" value="false" />
<!--
If you want to filter your recordings based on season number the only way possible for now is to use the description field with a contains filter.
In your recordings you would set Description Contains "S02E" for example.
-->
<add key="episodeInDescription" value="false"/>
<add key="episodeInDescription" value="false" />
<!--
set updateTitle to true if you want to update any of your schedules programs with the subtitle that it is
matched with from thetvdb. Note however that if something is incorrectly matched, that this will overwrite
the current title for one that may be incorrect...
-->
<add key="updateSubtitles" value="true"/>
<add key="updateSubtitles" value="true" />
</appSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
2 changes: 1 addition & 1 deletion GuideEnricher.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="ArgusTV.SchedulerProxy" version="2.3.0" targetFramework="net472" userInstalled="true" />
<package id="Castle.Core" version="4.4.0" targetFramework="net472" />
<package id="log4net" version="2.0.10" targetFramework="net472" userInstalled="true" />
<package id="log4net" version="3.3.0" targetFramework="net472" userInstalled="true" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net472" userInstalled="true" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net472" userInstalled="true" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net472" userInstalled="true" />
Expand Down