From 4b31f30087313b1397b1e8152f43f25de7c6aac5 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 10 Feb 2018 19:16:46 +0200 Subject: [PATCH 1/3] update gitignore --- .gitignore | 131 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 96 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 2f72fc4..150691a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,26 +4,49 @@ # User-specific files *.suo *.user +*.userosscache *.sln.docstates -# Build results +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs +# Build results [Dd]ebug/ +[Dd]ebugPublic/ [Rr]elease/ +[Rr]eleases/ x64/ +x86/ build/ +bld/ [Bb]in/ [Oo]bj/ -# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets -!packages/*/build/ +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +artifacts/ + *_i.c *_p.c +*_i.h *.ilk *.meta *.obj @@ -43,9 +66,12 @@ build/ *.vssscc .builds *.pidb -*.log +*.svclog *.scc +# Chutzpah Test files +_Chutzpah* + # Visual C++ cache files ipch/ *.aps @@ -58,6 +84,10 @@ ipch/ *.psess *.vsp *.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ # Guidance Automation Toolkit *.gpState @@ -65,6 +95,10 @@ ipch/ # ReSharper is a .NET coding add-in _ReSharper*/ *.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode # TeamCity is a build add-in _TeamCity* @@ -73,8 +107,16 @@ _TeamCity* *.dotCover # NCrunch -*.ncrunch* +_NCrunch_* .*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ # Installshield output folder [Ee]xpress/ @@ -93,64 +135,83 @@ DocProject/Help/html publish/ # Publish Web Output -*.Publish.xml - -# NuGet Packages Directory -## TODO: If you have NuGet Package Restore enabled, uncomment the next line -packages/ +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config # Windows Azure Build Output -csx +csx/ *.build.csdef # Windows Store app package directory AppPackages/ +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + # Others -sql/ -*.Cache ClientBin/ [Ss]tyle[Cc]op.* ~$* *~ *.dbmdl -*.[Pp]ublish.xml +*.dbproj.schemaview *.pfx *.publishsettings +node_modules/ +orleans.codegen.cs # RIA/Silverlight projects Generated_Code/ -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML UpgradeLog*.htm # SQL Server files -App_Data/*.mdf -App_Data/*.ldf - +*.mdf +*.ldf -#LightSwitch generated files -GeneratedArtifacts/ -_Pvt_Extensions/ -ModelManifest.xml +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings -# ========================= -# Windows detritus -# ========================= +# Microsoft Fakes +FakesAssemblies/ -# Windows image file caches -Thumbs.db -ehthumbs.db +# Node.js Tools for Visual Studio +.ntvs_analysis.dat -# Folder config file -Desktop.ini +# Visual Studio 6 build log +*.plg -# Recycle Bin used on file shares -$RECYCLE.BIN/ +# Visual Studio 6 workspace options file +*.opt -# Mac desktop service store files -.DS_Store +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions From 1f89b2c1f63095640984c0d26af6a775b033e32d Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 10 Feb 2018 19:22:23 +0200 Subject: [PATCH 2/3] target netstandard and netframework --- Log4Slack/Log4Slack.csproj | 68 ++++------------------------ Log4Slack/Properties/AssemblyInfo.cs | 36 --------------- Log4Slack/SlackAppender.cs | 2 +- Log4Slack/packages.config | 4 -- README.md | 2 +- 5 files changed, 11 insertions(+), 101 deletions(-) delete mode 100644 Log4Slack/Properties/AssemblyInfo.cs delete mode 100644 Log4Slack/packages.config diff --git a/Log4Slack/Log4Slack.csproj b/Log4Slack/Log4Slack.csproj index 5d3e3c5..a2e36c9 100644 --- a/Log4Slack/Log4Slack.csproj +++ b/Log4Slack/Log4Slack.csproj @@ -1,65 +1,15 @@ - - - + + - Debug - AnyCPU - {189AF12B-F742-42F4-95B9-88944AA64FDF} - Library - Properties - Log4Slack - Log4Slack - v4.0 - 512 - + netstandard2.0;net4 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - - - - - - - - - - - - + - - - + + - - + - - - \ No newline at end of file + + diff --git a/Log4Slack/Properties/AssemblyInfo.cs b/Log4Slack/Properties/AssemblyInfo.cs deleted file mode 100644 index 3dcce3f..0000000 --- a/Log4Slack/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Log4Slack")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Log4Slack")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("211b0c2f-2611-4086-8b50-48815c8c32ce")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Log4Slack/SlackAppender.cs b/Log4Slack/SlackAppender.cs index bfef684..49cc227 100644 --- a/Log4Slack/SlackAppender.cs +++ b/Log4Slack/SlackAppender.cs @@ -104,7 +104,7 @@ protected override void Append(log4net.Core.LoggingEvent loggingEvent) { if (mapping != null) { var color = Color.FromName(mapping.backColor); - var hex = color.IsKnownColor ? String.Format("#{0:X2}{1:X2}{2:X2}", color.R, color.G, color.B) : mapping.backColor; + var hex = color.IsNamedColor ? String.Format("#{0:X2}{1:X2}{2:X2}", color.R, color.G, color.B) : mapping.backColor; theAttachment.Color = !string.IsNullOrEmpty(hex) ? hex : theAttachment.Color; } diff --git a/Log4Slack/packages.config b/Log4Slack/packages.config deleted file mode 100644 index e25c2bd..0000000 --- a/Log4Slack/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/README.md b/README.md index f1f1077..873395a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Log4Slack +Log4Slack modified to target .Net Standard and .Net Framework ========= Simple, asynchronous [Slack](https://slack.com/) log4net appender. Grab the NuGet package [here](https://www.nuget.org/packages/Log4Slack/). From 492a6d9077360318c8b9d2f95585c9131b756dc8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 11 Feb 2018 13:00:07 +0200 Subject: [PATCH 3/3] Move nuspec to csproj --- Log4Slack/Log4Slack.csproj | 9 +++++++++ Log4Slack/Log4Slack.nuspec | 19 ------------------- 2 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 Log4Slack/Log4Slack.nuspec diff --git a/Log4Slack/Log4Slack.csproj b/Log4Slack/Log4Slack.csproj index a2e36c9..ce5f0fc 100644 --- a/Log4Slack/Log4Slack.csproj +++ b/Log4Slack/Log4Slack.csproj @@ -2,6 +2,15 @@ netstandard2.0;net4 + false + Jonathan Freeland + true + Simple, asynchronous Slack log4net appender. + Copyright © 2015 Jonathan Freeland + https://github.com/jonfreeland/Log4Slack + slack log4net appender + en-US + Log4Slack diff --git a/Log4Slack/Log4Slack.nuspec b/Log4Slack/Log4Slack.nuspec deleted file mode 100644 index 6eaeb0f..0000000 --- a/Log4Slack/Log4Slack.nuspec +++ /dev/null @@ -1,19 +0,0 @@ - - - - Log4Slack - 1.0.0 - Log4Slack - Jonathan Freeland - Jonathan Freeland - false - Simple, asynchronous Slack log4net appender. - Copyright © 2015 Jonathan Freeland - slack log4net appender - en-us - https://github.com/jonfreeland/Log4Slack - - - - -