Skip to content

Commit

Permalink
Fixed easiest compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
mperdeck committed Jan 10, 2016
1 parent d8e3d1b commit 74c27c0
Show file tree
Hide file tree
Showing 21 changed files with 795 additions and 179 deletions.
22 changes: 22 additions & 0 deletions .gitattributes
@@ -0,0 +1,22 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
171 changes: 171 additions & 0 deletions .gitignore
@@ -0,0 +1,171 @@
#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath


#################
## Visual Studio
#################

## NuGet packages
.nupkg
.vs
UpgradeLog.htm
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results
[Dd]ebug/
[Rr]elease/
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.vspscc
.builds
*.dotCover

## TODO: If you have NuGet Package Restore enabled, uncomment this
packages/

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf

# Visual Studio profiler
*.psess
*.vsp

# ReSharper is a .NET coding add-in
_ReSharper*

# Installshield output folder
[Ee]xpress

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish

# Others
[Bb]in
[Oo]bj
sql
TestResults
*.Cache
ClientBin
stylecop.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects

# 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



############
## Windows
############

# Windows image file caches
Thumbs.db

# Folder config file
Desktop.ini


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg

# Mac crap
.DS_Store

# Included files
!chromedriver.exe

@@ -1,6 +1,5 @@
D:\Dev\JSNLog\jsnlog\JSNLog.Tests\bin\Debug\JSNLog.Tests.dll
D:\Dev\JSNLog\jsnlog\JSNLog.Tests\bin\Debug\JSNLog.Tests.pdb
D:\Dev\JSNLog\jsnlog\JSNLog.Tests\bin\Debug\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll
D:\Dev\JSNLog\jsnlog\JSNLog.Tests\obj\Debug\JSNLog.Tests.csprojResolveAssemblyReference.cache
D:\Dev\JSNLog\jsnlog\JSNLog.Tests\obj\Debug\JSNLog.Tests.dll
D:\Dev\JSNLog\jsnlog\JSNLog.Tests\obj\Debug\JSNLog.Tests.pdb
9 changes: 0 additions & 9 deletions src/JSNLog/Infrastructure/ConfigProcessor.cs
@@ -1,16 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Xml;
using System.Web.Configuration;
using JSNLog.Exceptions;
using JSNLog.Infrastructure;
using System.Text.RegularExpressions;
using System.Web;
using System.Reflection;
using JSNLog.ValueInfos;
using JSNLog;

namespace JSNLog.Infrastructure
{
Expand Down
4 changes: 0 additions & 4 deletions src/JSNLog/Infrastructure/LogMessageHelpers.cs
@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.Script.Serialization;
using System.Web;
using Newtonsoft.Json;

namespace JSNLog.Infrastructure
Expand Down
5 changes: 0 additions & 5 deletions src/JSNLog/LogHandling/LoggerProcessor.cs
@@ -1,11 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using JSNLog.Infrastructure;
using System.Web.Script.Serialization;
using System.Xml;
using System.Web;
using System.Net;
using System.Text.RegularExpressions;
using JSNLog.Exceptions;
Expand Down
@@ -1,4 +1,6 @@
using System;
#if NET40

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
Expand All @@ -15,3 +17,6 @@ public object Create(object parent, object configContext, XmlNode section)
}
}
}

#endif

Expand Up @@ -2,15 +2,12 @@

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http;
using System.Text.RegularExpressions;
// Nuget cannot find this package! using Microsoft.AspNet.Http.Extensions;
using JSNLog.AspNet5.Infrastructure;
using JSNLog.Infrastructure.AspNet5;
using Microsoft.Extensions.Primitives;
using JSNLog.Infrastructure;
using JSNLog.LogHandling;
Expand Down
11 changes: 8 additions & 3 deletions src/JSNLog/PublicFacing/Configuration/JavascriptLogging.cs
@@ -1,13 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Xml;
using JSNLog.Exceptions;
using JSNLog.Infrastructure;
using System.Text.RegularExpressions;
using JSNLog.LogHandling;
#if NET40
using System.Web;
#endif

namespace JSNLog
{
Expand Down Expand Up @@ -79,7 +78,13 @@ internal static void RaiseLoggingEvent(LoggingEventArgs loggingEventArgs)
#region JsnlogConfiguration

private static JsnlogConfiguration _jsnlogConfiguration = null;

#if NET40
private static ILoggingAdapter _logger = new CommonLoggingAdapter();
#else
private static ILoggingAdapter _logger = null;
#endif


internal static JsnlogConfiguration GetJsnlogConfigurationWithoutWebConfig()
{
Expand Down
Expand Up @@ -12,7 +12,9 @@ namespace JSNLog
{
public class AjaxAppender : Appender, ICanCreateJsonFields, ICanCreateElement
{
#if !DNXCORE50
[XmlAttribute]
#endif
public string url { get; set; }

public AjaxAppender()
Expand Down
Expand Up @@ -13,19 +13,29 @@ namespace JSNLog
{
public class Appender : FilterOptions, ICanCreateJsonFields
{
#if !DNXCORE50
[XmlAttribute]
#endif
public string name { get; set; }

#if !DNXCORE50
[XmlAttribute]
#endif
public string sendWithBufferLevel { get; set; }

#if !DNXCORE50
[XmlAttribute]
#endif
public string storeInBufferLevel { get; set; }

#if !DNXCORE50
[XmlAttribute]
#endif
public uint bufferSize { get; set; }

#if !DNXCORE50
[XmlAttribute]
#endif
public uint batchSize { get; set; }

public Appender()
Expand Down
Expand Up @@ -12,16 +12,24 @@ namespace JSNLog
{
public class FilterOptions: ICanCreateJsonFields
{
#if !DNXCORE50
[XmlAttribute]
#endif
public string level { get; set; }

#if !DNXCORE50
[XmlAttribute]
#endif
public string ipRegex { get; set; }

#if !DNXCORE50
[XmlAttribute]
#endif
public string userAgentRegex { get; set; }

#if !DNXCORE50
[XmlAttribute]
#endif
public string disallow { get; set; }

// --------------------------------------------------------
Expand Down

0 comments on commit 74c27c0

Please sign in to comment.