cleanup + target net472 iso net431

jeroenmaes · Jan 28, 2021 · b6c5f55 · b6c5f55
1 parent cf87ad2
commit b6c5f55
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 54 deletions.
diff --git a/src/log4net.MicrosoftTeams/Extensions.cs b/src/log4net.MicrosoftTeams/Extensions.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
 
 namespace log4net.MicrosoftTeams
 {

diff --git a/src/log4net.MicrosoftTeams/MicrosoftTeamsAppender.cs b/src/log4net.MicrosoftTeams/MicrosoftTeamsAppender.cs
@@ -10,18 +10,7 @@ namespace log4net.MicrosoftTeams
     public class MicrosoftTeamsAppender : AppenderSkeleton
     {
         private readonly Process _currentProcess = Process.GetCurrentProcess();
-
-        /// <summary>
-        ///     Gets or sets the layout for title line of the Teams Post.
-        /// </summary>
-        /// <value>
-        ///     The layout for title line of the Teams Post.
-        /// </value>
-        /// <remarks>
-        ///     <para>
-        ///         The layout for title line of the Teams Post.
-        ///     </para>
-        /// </remarks>
+
         public PatternLayout TitleLayout { get; set; }
 
         public string WebhookUrl { get; set; }
@@ -56,7 +45,6 @@ protected override void Append(LoggingEvent loggingEvent)
                 facts.Add("Exception Type", exception.GetType().Name);
                 facts.Add("Exception Message", exception.Message);
             }
-
 
             var formattedMessage = (Layout != null ? Layout.FormatString(loggingEvent) : loggingEvent.RenderedMessage);
             var title = (TitleLayout != null ?  TitleLayout.FormatString(loggingEvent) : formattedMessage);

diff --git a/src/log4net.MicrosoftTeams/MicrosoftTeamsMessageCard.cs b/src/log4net.MicrosoftTeams/MicrosoftTeamsMessageCard.cs
@@ -1,8 +1,5 @@
-using System;
+using Newtonsoft.Json;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
-using System.Text;
-using Newtonsoft.Json;
 
 namespace log4net.MicrosoftTeams
 {

diff --git a/src/log4net.MicrosoftTeams/MicrosoftTeamsMessageFact.cs b/src/log4net.MicrosoftTeams/MicrosoftTeamsMessageFact.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace log4net.MicrosoftTeams
 {

diff --git a/src/log4net.MicrosoftTeams/MicrosoftTeamsMessageSection.cs b/src/log4net.MicrosoftTeams/MicrosoftTeamsMessageSection.cs
@@ -1,7 +1,5 @@
-using System;
+using Newtonsoft.Json;
 using System.Collections.Generic;
-using System.Text;
-using Newtonsoft.Json;
 
 namespace log4net.MicrosoftTeams
 {

diff --git a/src/log4net.MicrosoftTeams/log4net.MicrosoftTeams.csproj b/src/log4net.MicrosoftTeams/log4net.MicrosoftTeams.csproj
@@ -1,22 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <PackageProjectUrl>https://github.com/jeroenmaes/log4net.MicrosoftTeams</PackageProjectUrl>
     <Description>A log4net appender that writes to Microsoft Teams.</Description>
-    <Version>1.1.4</Version>
+    <Version>1.2.0</Version>
     <PackageLicenseUrl>https://github.com/jeroenmaes/log4net.MicrosoftTeams/blob/master/LICENSE</PackageLicenseUrl>
-    <Copyright>Copyright © Jeroen Maes 2019</Copyright>
+    <Copyright>Copyright © Jeroen Maes 2021</Copyright>
     <PackageTags>log4net;MicrosoftTeams;appender</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <AssemblyVersion>1.2.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <Reference Include="System.Net.Http" />
   </ItemGroup>
 

diff --git a/tst/log4net.MicrosoftTeams.Testing/App.config b/tst/log4net.MicrosoftTeams.Testing/App.config
@@ -1,38 +1,36 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="log4net"
-             type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
   </configSections>
   <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
   <log4net>
     <root>
-      <level value="ALL" />
-      <appender-ref ref="myMicrosoftTeamsAppender" />
-      <appender-ref ref="ColoredConsoleAppender" />
+      <level value="ALL"/>
+      <appender-ref ref="myMicrosoftTeamsAppender"/>
+      <appender-ref ref="ColoredConsoleAppender"/>
     </root>
-    <appender name="ColoredConsoleAppender"
-              type="log4net.Appender.ColoredConsoleAppender">
+    <appender name="ColoredConsoleAppender" type="log4net.Appender.ColoredConsoleAppender">
       <mapping>
-        <level value="ERROR" />
-        <foreColor value="White" />
-        <backColor value="Red, HighIntensity" />
+        <level value="ERROR"/>
+        <foreColor value="White"/>
+        <backColor value="Red, HighIntensity"/>
       </mapping>
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
+        <conversionPattern value="%date [%thread] %-5level %logger - %message%newline"/>
       </layout>
     </appender>
     <appender name="myMicrosoftTeamsAppender" type="log4net.MicrosoftTeams.MicrosoftTeamsAppender, log4net.MicrosoftTeams">
-      <WebhookUrl value="" />
+      <WebhookUrl value=""/>
       <!-- Your MicrosoftTeams channel to post to -->
       <titleLayout> 
-        <conversionPattern value="Title - %p: %date [%c]" />
+        <conversionPattern value="Title - %p: %date [%c]"/>
       </titleLayout>
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%-5level %logger - %message" />
+        <conversionPattern value="%-5level %logger - %message"/>
       </layout>
     </appender>
   </log4net>
-</configuration>
+</configuration>
diff --git a/tst/log4net.MicrosoftTeams.Testing/Program.cs b/tst/log4net.MicrosoftTeams.Testing/Program.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace log4net.MicrosoftTeams.Testing
 {

diff --git a/tst/log4net.MicrosoftTeams.Testing/Properties/AssemblyInfo.cs b/tst/log4net.MicrosoftTeams.Testing/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("log4net.MicrosoftTeams.Testing")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/tst/log4net.MicrosoftTeams.Testing/log4net.MicrosoftTeams.Testing.csproj b/tst/log4net.MicrosoftTeams.Testing/log4net.MicrosoftTeams.Testing.csproj
@@ -8,10 +8,11 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>log4net.MicrosoftTeams.Testing</RootNamespace>
     <AssemblyName>log4net.MicrosoftTeams.Testing</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>