diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..9cbc972 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,5 @@ +## Contributor License Agreement + +* Please sign the [Contributor License Agreement](https://docs.google.com/forms/d/16Op0fmKaqYtxGL4sg7w_g-cXXyCoWjzppgkuqzOeKyk/viewform) in order to have your changes merged. + +See the [Contributing Wiki](https://github.com/ServiceStack/ServiceStack/wiki/Contributing) to learn how you can Contribute! diff --git a/LICENSE b/LICENSE deleted file mode 100644 index c5e98c9..0000000 --- a/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2007-2011, Demis Bellot, ServiceStack. -http://www.servicestack.net -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the ServiceStack nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/NuGet/NuGetPack.cmd b/NuGet/NuGetPack.cmd new file mode 100644 index 0000000..266db0a --- /dev/null +++ b/NuGet/NuGetPack.cmd @@ -0,0 +1,9 @@ +SET NUGET=..\src\.nuget\nuget +%NUGET% pack ServiceStack.Logging.Elmah\servicestack.logging.elmah.nuspec -symbols +%NUGET% pack ServiceStack.Logging.EntLib5\servicestack.logging.entlib5.nuspec -symbols +%NUGET% pack ServiceStack.Logging.EventLog\servicestack.logging.eventlog.nuspec -symbols +%NUGET% pack ServiceStack.Logging.Log4Net\servicestack.logging.log4net.nuspec -symbols +%NUGET% pack ServiceStack.Logging.Log4Netv129\servicestack.logging.log4netv129.nuspec -symbols +%NUGET% pack ServiceStack.Logging.Log4Netv1210\servicestack.logging.log4netv1210.nuspec -symbols +%NUGET% pack ServiceStack.Logging.NLog\servicestack.logging.nlog.nuspec -symbols + diff --git a/NuGet/NuGetPush.cmd b/NuGet/NuGetPush.cmd new file mode 100644 index 0000000..7ce4295 --- /dev/null +++ b/NuGet/NuGetPush.cmd @@ -0,0 +1,15 @@ +SET NUGET=..\src\.nuget\nuget +%NUGET% push ServiceStack.Logging.Elmah.3.9.60.nupkg +%NUGET% push ServiceStack.Logging.Elmah.3.9.60.symbols.nupkg +%NUGET% push ServiceStack.Logging.EntLib5.3.9.60.nupkg +%NUGET% push ServiceStack.Logging.EntLib5.3.9.60.symbols.nupkg +%NUGET% push ServiceStack.Logging.EventLog.3.9.60.nupkg +%NUGET% push ServiceStack.Logging.EventLog.3.9.60.symbols.nupkg +%NUGET% push ServiceStack.Logging.Log4Net.3.9.60.nupkg +%NUGET% push ServiceStack.Logging.Log4Net.3.9.60.symbols.nupkg +%NUGET% push ServiceStack.Logging.Log4Netv129.3.9.60.nupkg +%NUGET% push ServiceStack.Logging.Log4Netv129.3.9.60.symbols.nupkg +%NUGET% push ServiceStack.Logging.Log4Netv1210.3.9.60.nupkg +%NUGET% push ServiceStack.Logging.Log4Netv1210.3.9.60.symbols.nupkg +%NUGET% push ServiceStack.Logging.NLog.3.9.60.nupkg +%NUGET% push ServiceStack.Logging.NLog.3.9.60.symbols.nupkg diff --git a/NuGet/ServiceStack.Logging.Elmah/lib/net35/ServiceStack.Logging.Elmah.dll b/NuGet/ServiceStack.Logging.Elmah/lib/net35/ServiceStack.Logging.Elmah.dll new file mode 100644 index 0000000..493a65d Binary files /dev/null and b/NuGet/ServiceStack.Logging.Elmah/lib/net35/ServiceStack.Logging.Elmah.dll differ diff --git a/src/ServiceStack.Logging.Elmah/ServiceStack.Logging.Elmah.nuspec b/NuGet/ServiceStack.Logging.Elmah/servicestack.logging.elmah.nuspec similarity index 59% rename from src/ServiceStack.Logging.Elmah/ServiceStack.Logging.Elmah.nuspec rename to NuGet/ServiceStack.Logging.Elmah/servicestack.logging.elmah.nuspec index b90185e..5731631 100644 --- a/src/ServiceStack.Logging.Elmah/ServiceStack.Logging.Elmah.nuspec +++ b/NuGet/ServiceStack.Logging.Elmah/servicestack.logging.elmah.nuspec @@ -1,23 +1,29 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - Elmah logging integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework - false - $description$ - https://github.com/ServiceStack/ServiceStack.Logging - https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE - http://www.servicestack.net/logo-100x100.png - servicestack log logging elmah - en-US - servicestack.net 2012 and contributors - - - - - + + + + ServiceStack.Logging.Elmah + 3.9.60 + ServiceStack.Logging.Elmah + Demis Bellot + Demis Bellot + Elmah logging integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework + false + + Provides Elmah logging integration for other ServiceStack projects + + https://github.com/ServiceStack/ServiceStack.Logging + https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE + http://www.servicestack.net/logo-100x100.png + servicestack log logging elmah + en-US + servicestack.net 2013 and contributors + + + + + + + + + \ No newline at end of file diff --git a/NuGet/ServiceStack.Logging.EntLib5/lib/net35/ServiceStack.Logging.EntLib5.dll b/NuGet/ServiceStack.Logging.EntLib5/lib/net35/ServiceStack.Logging.EntLib5.dll new file mode 100644 index 0000000..82821e4 Binary files /dev/null and b/NuGet/ServiceStack.Logging.EntLib5/lib/net35/ServiceStack.Logging.EntLib5.dll differ diff --git a/src/ServiceStack.Logging.EnterpriseLibrary5/App.config b/NuGet/ServiceStack.Logging.EntLib5/lib/net35/ServiceStack.Logging.EntLib5.dll.config similarity index 98% rename from src/ServiceStack.Logging.EnterpriseLibrary5/App.config rename to NuGet/ServiceStack.Logging.EntLib5/lib/net35/ServiceStack.Logging.EntLib5.dll.config index 6966856..89f7711 100644 --- a/src/ServiceStack.Logging.EnterpriseLibrary5/App.config +++ b/NuGet/ServiceStack.Logging.EntLib5/lib/net35/ServiceStack.Logging.EntLib5.dll.config @@ -1,82 +1,82 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ServiceStack.Logging.EnterpriseLibrary5/ServiceStack.Logging.EntLib5.nuspec b/NuGet/ServiceStack.Logging.EntLib5/servicestack.logging.entlib5.nuspec similarity index 59% rename from src/ServiceStack.Logging.EnterpriseLibrary5/ServiceStack.Logging.EntLib5.nuspec rename to NuGet/ServiceStack.Logging.EntLib5/servicestack.logging.entlib5.nuspec index c3e76e0..6600489 100644 --- a/src/ServiceStack.Logging.EnterpriseLibrary5/ServiceStack.Logging.EntLib5.nuspec +++ b/NuGet/ServiceStack.Logging.EntLib5/servicestack.logging.entlib5.nuspec @@ -1,23 +1,29 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - Enterprise Library 5.0 Logging Application Block integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework - false - $description$ - https://github.com/ServiceStack/ServiceStack.Logging - https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE - http://www.servicestack.net/logo-100x100.png - servicestack log logging nlog - en-US - servicestack.net 2012 and contributors - - - - - + + + + ServiceStack.Logging.EntLib5 + 3.9.60 + ServiceStack.Logging.EntLib5 + Demis Bellot + Demis Bellot + Enterprise Library 5.0 Logging Application Block integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework + false + + Provides Enterprise Library 5.0 Logging Application Block logging integration for other ServiceStack projects + + https://github.com/ServiceStack/ServiceStack.Logging + https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE + http://www.servicestack.net/logo-100x100.png + servicestack log logging nlog + en-US + servicestack.net 2013 and contributors + + + + + + + + + \ No newline at end of file diff --git a/NuGet/ServiceStack.Logging.EventLog/lib/net35/ServiceStack.Logging.EventLog.dll b/NuGet/ServiceStack.Logging.EventLog/lib/net35/ServiceStack.Logging.EventLog.dll new file mode 100644 index 0000000..a4dd376 Binary files /dev/null and b/NuGet/ServiceStack.Logging.EventLog/lib/net35/ServiceStack.Logging.EventLog.dll differ diff --git a/src/ServiceStack.Logging.EventLog/ServiceStack.Logging.EventLog.nuspec b/NuGet/ServiceStack.Logging.EventLog/servicestack.logging.eventlog.nuspec similarity index 58% rename from src/ServiceStack.Logging.EventLog/ServiceStack.Logging.EventLog.nuspec rename to NuGet/ServiceStack.Logging.EventLog/servicestack.logging.eventlog.nuspec index 1eb60ab..16e4b5a 100644 --- a/src/ServiceStack.Logging.EventLog/ServiceStack.Logging.EventLog.nuspec +++ b/NuGet/ServiceStack.Logging.EventLog/servicestack.logging.eventlog.nuspec @@ -1,22 +1,28 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - Windows Event Log integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework - false - $description$ - https://github.com/ServiceStack/ServiceStack.Logging - https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE - http://www.servicestack.net/logo-100x100.png - servicestack log logging eventlog - en-US - servicestack.net 2012 and contributors - - - - + + + + ServiceStack.Logging.EventLog + 3.9.60 + ServiceStack.Logging.EventLog + Demis Bellot + Demis Bellot + Windows Event Log integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework + false + + Provides EventLog logging integration for other ServiceStack projects + + https://github.com/ServiceStack/ServiceStack.Logging + https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE + http://www.servicestack.net/logo-100x100.png + servicestack log logging eventlog + en-US + servicestack.net 2013 and contributors + + + + + + + + \ No newline at end of file diff --git a/NuGet/ServiceStack.Logging.Log4Net/lib/net35/ServiceStack.Logging.Log4Net.dll b/NuGet/ServiceStack.Logging.Log4Net/lib/net35/ServiceStack.Logging.Log4Net.dll new file mode 100644 index 0000000..72ec28d Binary files /dev/null and b/NuGet/ServiceStack.Logging.Log4Net/lib/net35/ServiceStack.Logging.Log4Net.dll differ diff --git a/src/ServiceStack.Logging.Log4Net/ServiceStack.Logging.Log4Net.nuspec b/NuGet/ServiceStack.Logging.Log4Net/servicestack.logging.log4net.nuspec similarity index 59% rename from src/ServiceStack.Logging.Log4Net/ServiceStack.Logging.Log4Net.nuspec rename to NuGet/ServiceStack.Logging.Log4Net/servicestack.logging.log4net.nuspec index ec6c5ac..7e69347 100644 --- a/src/ServiceStack.Logging.Log4Net/ServiceStack.Logging.Log4Net.nuspec +++ b/NuGet/ServiceStack.Logging.Log4Net/servicestack.logging.log4net.nuspec @@ -1,23 +1,29 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - log4Net logging integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework - false - $description$ - https://github.com/ServiceStack/ServiceStack.Logging - https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE - http://www.servicestack.net/logo-100x100.png - servicestack log logging log4net - en-US - servicestack.net 2012 and contributors - - - - - + + + + ServiceStack.Logging.Log4Net + 3.9.60 + ServiceStack.Logging.Log4Net + Demis Bellot + Demis Bellot + log4Net logging integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework + false + + Provides log4net logging integration for other ServiceStack projects + + https://github.com/ServiceStack/ServiceStack.Logging + https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE + http://www.servicestack.net/logo-100x100.png + servicestack log logging log4net + en-US + servicestack.net 2013 and contributors + + + + + + + + + \ No newline at end of file diff --git a/NuGet/ServiceStack.Logging.Log4Netv1210/lib/net35/ServiceStack.Logging.Log4Netv1210.dll b/NuGet/ServiceStack.Logging.Log4Netv1210/lib/net35/ServiceStack.Logging.Log4Netv1210.dll new file mode 100644 index 0000000..fb2aa4b Binary files /dev/null and b/NuGet/ServiceStack.Logging.Log4Netv1210/lib/net35/ServiceStack.Logging.Log4Netv1210.dll differ diff --git a/src/ServiceStack.Logging.Log4Netv1210/ServiceStack.Logging.Log4Netv1210.nuspec b/NuGet/ServiceStack.Logging.Log4Netv1210/servicestack.logging.log4netv1210.nuspec similarity index 59% rename from src/ServiceStack.Logging.Log4Netv1210/ServiceStack.Logging.Log4Netv1210.nuspec rename to NuGet/ServiceStack.Logging.Log4Netv1210/servicestack.logging.log4netv1210.nuspec index e155d6c..e772460 100644 --- a/src/ServiceStack.Logging.Log4Netv1210/ServiceStack.Logging.Log4Netv1210.nuspec +++ b/NuGet/ServiceStack.Logging.Log4Netv1210/servicestack.logging.log4netv1210.nuspec @@ -1,23 +1,29 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - log4Net 1.2.10 logging integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework - false - $description$ - https://github.com/ServiceStack/ServiceStack.Logging - https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE - http://www.servicestack.net/logo-100x100.png - servicestack log logging log4net - en-US - servicestack.net 2012 and contributors - - - - - + + + + ServiceStack.Logging.Log4Netv1210 + 3.9.60 + ServiceStack.Logging.Log4Netv1210 + Demis Bellot + Demis Bellot + log4Net 1.2.10 logging integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework + false + + Provides log4net logging integration for other ServiceStack projects + + https://github.com/ServiceStack/ServiceStack.Logging + https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE + http://www.servicestack.net/logo-100x100.png + servicestack log logging log4net + en-US + servicestack.net 2013 and contributors + + + + + + + + + \ No newline at end of file diff --git a/NuGet/ServiceStack.Logging.Log4Netv129/lib/net35/ServiceStack.Logging.Log4Netv129.dll b/NuGet/ServiceStack.Logging.Log4Netv129/lib/net35/ServiceStack.Logging.Log4Netv129.dll new file mode 100644 index 0000000..d07adfa Binary files /dev/null and b/NuGet/ServiceStack.Logging.Log4Netv129/lib/net35/ServiceStack.Logging.Log4Netv129.dll differ diff --git a/src/ServiceStack.Logging.Log4Netv129/ServiceStack.Logging.Log4Netv129.nuspec b/NuGet/ServiceStack.Logging.Log4Netv129/servicestack.logging.log4netv129.nuspec similarity index 61% rename from src/ServiceStack.Logging.Log4Netv129/ServiceStack.Logging.Log4Netv129.nuspec rename to NuGet/ServiceStack.Logging.Log4Netv129/servicestack.logging.log4netv129.nuspec index 015902c..f1a38c2 100644 --- a/src/ServiceStack.Logging.Log4Netv129/ServiceStack.Logging.Log4Netv129.nuspec +++ b/NuGet/ServiceStack.Logging.Log4Netv129/servicestack.logging.log4netv129.nuspec @@ -1,25 +1,29 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - log4Net 1.2.9 logging integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework - false - $description$ - https://github.com/ServiceStack/ServiceStack.Logging - https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE - http://www.servicestack.net/logo-100x100.png - servicestack log logging log4net - en-US - servicestack.net 2012 and contributors - - - - - - - + + + + ServiceStack.Logging.Log4Netv129 + 3.9.60 + ServiceStack.Logging.Log4Netv129 + Demis Bellot + Demis Bellot + log4Net 1.2.9 logging integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework + false + + Provides log4net 1.2.9 logging integration for other ServiceStack projects + + https://github.com/ServiceStack/ServiceStack.Logging + https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE + http://www.servicestack.net/logo-100x100.png + servicestack log logging log4net + en-US + servicestack.net 2013 and contributors + + + + + + + + + \ No newline at end of file diff --git a/NuGet/ServiceStack.Logging.NLog/lib/net35/ServiceStack.Logging.NLog.dll b/NuGet/ServiceStack.Logging.NLog/lib/net35/ServiceStack.Logging.NLog.dll new file mode 100644 index 0000000..dd6560f Binary files /dev/null and b/NuGet/ServiceStack.Logging.NLog/lib/net35/ServiceStack.Logging.NLog.dll differ diff --git a/src/ServiceStack.Logging.NLog/ServiceStack.Logging.NLog.nuspec b/NuGet/ServiceStack.Logging.NLog/servicestack.logging.nlog.nuspec similarity index 60% rename from src/ServiceStack.Logging.NLog/ServiceStack.Logging.NLog.nuspec rename to NuGet/ServiceStack.Logging.NLog/servicestack.logging.nlog.nuspec index e98d57b..cec074f 100644 --- a/src/ServiceStack.Logging.NLog/ServiceStack.Logging.NLog.nuspec +++ b/NuGet/ServiceStack.Logging.NLog/servicestack.logging.nlog.nuspec @@ -1,23 +1,29 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - NLog logging integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework - false - $description$ - https://github.com/ServiceStack/ServiceStack.Logging - https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE - http://www.servicestack.net/logo-100x100.png - servicestack log logging nlog - en-US - servicestack.net 2012 and contributors - - - - - + + + + ServiceStack.Logging.NLog + 3.9.60 + ServiceStack.Logging.NLog + Demis Bellot + Demis Bellot + NLog logging integration for ServiceStack, the Opensource .NET and Mono REST Web Services Framework + false + + Provides NLog logging integration for other ServiceStack projects + + https://github.com/ServiceStack/ServiceStack.Logging + https://github.com/ServiceStack/ServiceStack/blob/master/LICENSE + http://www.servicestack.net/logo-100x100.png + servicestack log logging nlog + en-US + servicestack.net 2013 and contributors + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 1c0eb04..dcd2667 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ -## An implementation-free logging API for .Net +# The latest Logging projects have now been merged into the main [ServiceStack](https://github.com/ServiceStack/ServiceStack/) repo. + +---- -For twitter updates follow @demisbellot or @ServiceStack +[Join the ServiceStack Google+ group](http://groups.google.com/group/servicestack) or +follow [@ServiceStack](http://twitter.com/servicestack) for project updates. + +## An implementation-free logging API for .Net **ServiceStack.Logging** is an implementation and dependency-free logging API with adapters for all of .NET's popular logging providers. It allows your business logic to bind to an easily-mockable and testable dependency-free interface whilst providing the flexibility to switch logging providers at runtime. @@ -18,6 +23,8 @@ Currently there are 6 different .NET logging providers available on NuGet: Note: The ConsoleLogger and DebugLogger and are already built-in and bind to .NET Framework's Console and Debug loggers +_Commercial support will be available for ServiceStack, contact team@servicestack.net for details_ + ----- Even in the spirit of **Bind to interfaces, not implemenations**, many .NET projects still have @@ -63,6 +70,11 @@ Then your application logic can bind to and use a lightweight implementation-fre log.Debug("Debug Event Log Entry."); log.Warn("Warning Event Log Entry."); +## Copying +Since September 2013, ServiceStack source code is available under GNU Affero General Public License/FOSS License Exception, see license.txt in the source. Alternative commercial licensing is also available, contact team@servicestack.net for details. +## Contributing +Commits should be made to the **v3-fixes** branch so they can be merged into both **v3** and **master** (v4) release branches. +Contributors need to approve the [Contributor License Agreement](https://docs.google.com/forms/d/16Op0fmKaqYtxGL4sg7w_g-cXXyCoWjzppgkuqzOeKyk/viewform) before any code will be reviewed, see the [Contributing wiki](https://github.com/ServiceStack/ServiceStack/wiki/Contributing) for more details. diff --git a/build/NuGetPack.ps1 b/build/NuGetPack-old.ps1 similarity index 97% rename from build/NuGetPack.ps1 rename to build/NuGetPack-old.ps1 index 8db3c03..49e37a0 100644 --- a/build/NuGetPack.ps1 +++ b/build/NuGetPack-old.ps1 @@ -1,13 +1,13 @@ -param( - [Parameter(Mandatory = $true, ValueFromPipeline = $true)] - [string] - $apiKeys -) - -del *.nupkg - -$nuget = '..\src\.nuget\nuget' - -Get-ChildItem -Path .. -Include *.nuspec -Recurse | % { Start-Process $nuget -ArgumentList "pack $(Join-Path ([IO.Path]::GetDirectoryName($_)) ([IO.Path]::GetFileNameWithoutExtension($_) + '.csproj')) -Build -Prop Configuration=Release -Exclude '**\*.CodeAnalysisLog.xml'" -NoNewWindow -Wait } -Get-ChildItem *.nupkg | % { &$nuget push $_ $apiKey } +param( + [Parameter(Mandatory = $true, ValueFromPipeline = $true)] + [string] + $apiKeys +) + +del *.nupkg + +$nuget = '..\src\.nuget\nuget' + +Get-ChildItem -Path .. -Include *.nuspec -Recurse | % { Start-Process $nuget -ArgumentList "pack $(Join-Path ([IO.Path]::GetDirectoryName($_)) ([IO.Path]::GetFileNameWithoutExtension($_) + '.csproj')) -Build -Prop Configuration=Release -Exclude '**\*.CodeAnalysisLog.xml'" -NoNewWindow -Wait } +Get-ChildItem *.nupkg | % { &$nuget push $_ $apiKey } del *.nupkg \ No newline at end of file diff --git a/build/build.bat b/build/build.bat new file mode 100644 index 0000000..7b52482 --- /dev/null +++ b/build/build.bat @@ -0,0 +1,3 @@ +SET MSBUILD=C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe + +%MSBUILD% Build.proj /target:NuGetPack /property:Configuration=Release;RELEASE=true;PatchVersion=60 \ No newline at end of file diff --git a/build/build.proj b/build/build.proj new file mode 100644 index 0000000..ecb7801 --- /dev/null +++ b/build/build.proj @@ -0,0 +1,183 @@ + + + + + + 3 + 9 + $(BUILD_NUMBER) + + + + $(MSBuildProjectDirectory)/.. + $(BuildSolutionDir)/src + Release + $(BuildSolutionDir)/src/.nuget/nuget.exe + $(BuildSolutionDir)/NuGet/ + $(MajorVersion).$(MinorVersion).$(PatchVersion).0 + -unstable + $(MajorVersion).$(MinorVersion).$(PatchVersion)$(UnstableTag) + + + + + + + + + + + BeforeBuildSolutions; + BuildSolutions + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \d+\.\d+\.\d+\.\d+ + $(Version) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/build.tasks b/build/build.tasks new file mode 100644 index 0000000..e989135 --- /dev/null +++ b/build/build.tasks @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/license.txt b/license.txt new file mode 100644 index 0000000..76e55b1 --- /dev/null +++ b/license.txt @@ -0,0 +1,70 @@ +ServiceStack +Copyright (c) 2013 Service Stack +=============================================================================== + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU Affero General Public License as published by the +Free Software Foundation, either version 3 of the License, see +http://www.gnu.org/licenses/agpl-3.0.html. + +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + +FOSS License Exception +=============================================================================== + +This Exception applies to open source applications built with ServiceStack and +ServiceStack extensions ("The Software"), and to open source Derivative Works of +the Software, that use the Software under the terms of GNU Affero General +Public License, version 3 ("AGPLv3"). The Exception extends AGPLv3 by providing +additional grants that allows developers of FOSS applications to include ServiceStack +with their FOSS applications in combination with other software licensed under +the licenses from the "Open Source License List" below, provided that: + +You obey the AGPLv3 terms for the Software and the Derivative Work, except for +the separate parts of the Derivative Work ("Additions") which constitute independent +work and are not dervied from the Software. + + - All Additions are distributed subject to one of the licenses listed below. + - Your software distribution provides complete source code for the Additions. + - The Derivative Work and its Additions are intended for use in end-user applications + and do not constitute software intended for use by software developers, such as + software libraries, components, and development kits. + - If you violate any of the terms in this Exception, you lose all rights granted + to you by the Exception and revert to the terms of AGPLv3. + +Service Stack reserves all rights not expressly granted in these terms and conditions. + +Open Source License List + +Name Version +Academic Free License 2.0 +Apache Software License 2.0 +Apple Public Source License 2.0 +Artistic license From Perl 5.8.0 +BSD license July 22 1999 +Common Development and Distribution License (CDDL) 1.0 +Common Public License 1.0 +Eclipse Public License 1.0 +Educational Community License 2.0 +European Union Public License (EUPL) 1.1 +GNU General Public License (GPL) 2.0 +GNU Library or "Lesser" General Public License (LGPL) 3.0 +Jabber Open Source License 1.0 +MIT License (As listed in file MIT-License.txt) - +Mozilla Public License (MPL) 1.0/1.1 +Open Software License 2.0 +OpenSSL license (with original SSLeay license) 2003 (1998) +University of Illinois/NCSA Open Source License - +W3C License 2001 +X11 License 2001 +Zlib/libpng License - + + + +Commercial License +=========================================================================== +In addition to this license, ServiceStack is offered under a commerical license. +Contact team@servicestack.net for details. diff --git a/src/.nuget/NuGet.exe b/src/.nuget/NuGet.exe index 34ad49b..ed2b0a2 100644 Binary files a/src/.nuget/NuGet.exe and b/src/.nuget/NuGet.exe differ diff --git a/src/ServiceStack.Logging.Elmah/ElmahInterceptingLogger.cs b/src/ServiceStack.Logging.Elmah/ElmahInterceptingLogger.cs index bb29295..bf0d7a6 100644 --- a/src/ServiceStack.Logging.Elmah/ElmahInterceptingLogger.cs +++ b/src/ServiceStack.Logging.Elmah/ElmahInterceptingLogger.cs @@ -43,37 +43,67 @@ public void DebugFormat(string format, params object[] args) public void Error(object message, Exception exception) { - ErrorLog.GetDefault(HttpContext.Current).Log(new Error(exception, HttpContext.Current)); + try { + ErrorLog.GetDefault(HttpContext.Current).Log(new Error(exception, HttpContext.Current)); + } + catch { + ErrorLog.GetDefault(null).Log(new Error(exception)); + } log.Error(message, exception); } public void Error(object message) { - ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(message.ToString()), HttpContext.Current)); + try { + ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(message.ToString()), HttpContext.Current)); + } + catch { + ErrorLog.GetDefault(null).Log(new Error(new System.ApplicationException(message.ToString()))); + } log.Error(message); } public void ErrorFormat(string format, params object[] args) { - ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(string.Format(format, args)), HttpContext.Current)); + try { + ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(string.Format(format, args)), HttpContext.Current)); + } + catch { + ErrorLog.GetDefault(null).Log(new Error(new System.ApplicationException(string.Format(format, args)))); + } log.ErrorFormat(format, args); } public void Fatal(object message, Exception exception) { - ErrorLog.GetDefault(HttpContext.Current).Log(new Error(exception, HttpContext.Current)); + try { + ErrorLog.GetDefault(HttpContext.Current).Log(new Error(exception, HttpContext.Current)); + } + catch { + ErrorLog.GetDefault(null).Log(new Error(exception)); + } log.Fatal(message, exception); } public void Fatal(object message) { - ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(message.ToString()), HttpContext.Current)); + try { + ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(message.ToString()), HttpContext.Current)); + } + catch { + ErrorLog.GetDefault(null).Log(new Error(new System.ApplicationException(message.ToString()))); + } log.Fatal(message); } public void FatalFormat(string format, params object[] args) { - ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(string.Format(format, args)), HttpContext.Current)); + try { + ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(string.Format(format, args)), HttpContext.Current)); + } + catch { + ErrorLog.GetDefault(null).Log(new Error(new System.ApplicationException(string.Format(format, args)))); + } log.FatalFormat(format, args); } diff --git a/src/ServiceStack.Logging.Elmah/Properties/AssemblyInfo.cs b/src/ServiceStack.Logging.Elmah/Properties/AssemblyInfo.cs index e0d8b05..e2e5e0a 100644 --- a/src/ServiceStack.Logging.Elmah/Properties/AssemblyInfo.cs +++ b/src/ServiceStack.Logging.Elmah/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -36,5 +36,5 @@ // 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.9")] -[assembly: AssemblyFileVersion("1.0.9")] +[assembly: AssemblyVersion("1.0.10")] +[assembly: AssemblyFileVersion("1.0.10")] diff --git a/src/ServiceStack.Logging.Elmah/ServiceStack.Logging.Elmah.csproj b/src/ServiceStack.Logging.Elmah/ServiceStack.Logging.Elmah.csproj index c07822b..478684b 100644 --- a/src/ServiceStack.Logging.Elmah/ServiceStack.Logging.Elmah.csproj +++ b/src/ServiceStack.Logging.Elmah/ServiceStack.Logging.Elmah.csproj @@ -1,75 +1,74 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {EE43BF1E-CF97-4215-A5A3-46D1C363F928} - Library - Properties - ServiceStack.Logging.Elmah - ServiceStack.Logging.Elmah - v3.5 - 512 - - ..\..\src\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - False - ..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Common.dll - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Interfaces.dll - - - False - ..\packages\ServiceStack.Text.3.9.44\lib\net35\ServiceStack.Text.dll - - - - - - - - - - - - - - - - + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {EE43BF1E-CF97-4215-A5A3-46D1C363F928} + Library + Properties + ServiceStack.Logging.Elmah + ServiceStack.Logging.Elmah + v4.0 + 512 + + ..\..\src\ + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + AllRules.ruleset + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll + + + False + ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Common.dll + + + False + ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Interfaces.dll + + + False + ..\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ServiceStack.Logging.Elmah/packages.config b/src/ServiceStack.Logging.Elmah/packages.config index cdd36f1..6aaaaf5 100644 --- a/src/ServiceStack.Logging.Elmah/packages.config +++ b/src/ServiceStack.Logging.Elmah/packages.config @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/src/ServiceStack.Logging.EntLib5/App.config b/src/ServiceStack.Logging.EntLib5/App.config new file mode 100644 index 0000000..ab89f5e --- /dev/null +++ b/src/ServiceStack.Logging.EntLib5/App.config @@ -0,0 +1,49 @@ + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ServiceStack.Logging.EnterpriseLibrary5/EntLib5Factory.cs b/src/ServiceStack.Logging.EntLib5/EntLib5Factory.cs similarity index 97% rename from src/ServiceStack.Logging.EnterpriseLibrary5/EntLib5Factory.cs rename to src/ServiceStack.Logging.EntLib5/EntLib5Factory.cs index b4f6488..f0bb965 100644 --- a/src/ServiceStack.Logging.EnterpriseLibrary5/EntLib5Factory.cs +++ b/src/ServiceStack.Logging.EntLib5/EntLib5Factory.cs @@ -1,68 +1,68 @@ -using System; -using System.Configuration; -using Microsoft.Practices.EnterpriseLibrary.Logging; -using Microsoft.Practices.EnterpriseLibrary.Logging.Configuration; -using Microsoft.Practices.EnterpriseLibrary.Common.Configuration; -using Microsoft.Practices.EnterpriseLibrary.Common.Configuration.Fluent; - -namespace ServiceStack.Logging.EntLib5 -{ - public class EntLib5Factory : LogWriterFactory, ILogFactory - { - /// - /// Initializes a new instance of the class. - /// - public EntLib5Factory() { } - - /// - /// Initializes a new instance of the class. - /// - /// The enterprise library 5.0 configuration file to load and watch. Supercedes any configuration found in the Config file. - public EntLib5Factory(string EntLib5ConfigurationFile) - { - // verify provided file exists - var fi = new System.IO.FileInfo(EntLib5ConfigurationFile); - if (fi.Exists) - { - var builder = new ConfigurationSourceBuilder(); - var EntLib5ConfigurationSrc = new FileConfigurationSource(EntLib5ConfigurationFile, true); - - builder.UpdateConfigurationWithReplace(EntLib5ConfigurationSrc); - EnterpriseLibraryContainer.Current = EnterpriseLibraryContainer.CreateDefaultContainer(EntLib5ConfigurationSrc); - } - } - - /// - /// Initializes a new instance of the class. - /// - /// The enterprise library 5.0 configuration source to load. Supercedes any configuration found in the Config file. - public EntLib5Factory(IConfigurationSource EntLib5ConfigurationSrc) - { - // replace any settings from App.Config with the ones in the provided config source - var builder = new ConfigurationSourceBuilder(); - builder.UpdateConfigurationWithReplace(EntLib5ConfigurationSrc); - EnterpriseLibraryContainer.Current = EnterpriseLibraryContainer.CreateDefaultContainer(EntLib5ConfigurationSrc); - } - - - /// - /// Gets the logger. - /// - /// The type. - /// - public ILog GetLogger(Type type) - { - return new EntLib5Logger(type); - } - - /// - /// Gets the logger. - /// - /// Name of the type. - /// - public ILog GetLogger(string typeName) - { - return new EntLib5Logger(typeName); - } - } -} +using System; +using System.Configuration; +using Microsoft.Practices.EnterpriseLibrary.Logging; +using Microsoft.Practices.EnterpriseLibrary.Logging.Configuration; +using Microsoft.Practices.EnterpriseLibrary.Common.Configuration; +using Microsoft.Practices.EnterpriseLibrary.Common.Configuration.Fluent; + +namespace ServiceStack.Logging.EntLib5 +{ + public class EntLib5Factory : LogWriterFactory, ILogFactory + { + /// + /// Initializes a new instance of the class. + /// + public EntLib5Factory() { } + + /// + /// Initializes a new instance of the class. + /// + /// The enterprise library 5.0 configuration file to load and watch. Supercedes any configuration found in the Config file. + public EntLib5Factory(string EntLib5ConfigurationFile) + { + // verify provided file exists + var fi = new System.IO.FileInfo(EntLib5ConfigurationFile); + if (fi.Exists) + { + var builder = new ConfigurationSourceBuilder(); + var EntLib5ConfigurationSrc = new FileConfigurationSource(EntLib5ConfigurationFile, true); + + builder.UpdateConfigurationWithReplace(EntLib5ConfigurationSrc); + EnterpriseLibraryContainer.Current = EnterpriseLibraryContainer.CreateDefaultContainer(EntLib5ConfigurationSrc); + } + } + + /// + /// Initializes a new instance of the class. + /// + /// The enterprise library 5.0 configuration source to load. Supercedes any configuration found in the Config file. + public EntLib5Factory(IConfigurationSource EntLib5ConfigurationSrc) + { + // replace any settings from App.Config with the ones in the provided config source + var builder = new ConfigurationSourceBuilder(); + builder.UpdateConfigurationWithReplace(EntLib5ConfigurationSrc); + EnterpriseLibraryContainer.Current = EnterpriseLibraryContainer.CreateDefaultContainer(EntLib5ConfigurationSrc); + } + + + /// + /// Gets the logger. + /// + /// The type. + /// + public ILog GetLogger(Type type) + { + return new EntLib5Logger(type); + } + + /// + /// Gets the logger. + /// + /// Name of the type. + /// + public ILog GetLogger(string typeName) + { + return new EntLib5Logger(typeName); + } + } +} diff --git a/src/ServiceStack.Logging.EnterpriseLibrary5/EntLib5Logger.cs b/src/ServiceStack.Logging.EntLib5/EntLib5Logger.cs similarity index 97% rename from src/ServiceStack.Logging.EnterpriseLibrary5/EntLib5Logger.cs rename to src/ServiceStack.Logging.EntLib5/EntLib5Logger.cs index bd8447f..9ad6de4 100644 --- a/src/ServiceStack.Logging.EnterpriseLibrary5/EntLib5Logger.cs +++ b/src/ServiceStack.Logging.EntLib5/EntLib5Logger.cs @@ -1,448 +1,448 @@ -using System; -using System.Diagnostics; -using Microsoft.Practices.EnterpriseLibrary.Logging; - -namespace ServiceStack.Logging.EntLib5 -{ - /// Wrapper over the Enterprise Library 5.0 Logging Application Block - public class EntLib5Logger : ILog - { - private readonly LogWriter logWriter; - - /// - /// Initializes a new instance of the class. - /// - public EntLib5Logger() - { - var factory = new EntLib5Factory(); - logWriter = factory.CreateDefault(); - } - - /// - /// Initializes a new instance of the class. - /// - /// The type name. - public EntLib5Logger(string typeName) - { - var factory = new EntLib5Factory(); - logWriter = factory.CreateDefault(); - logWriter.SetContextItem("type", typeName); - } - - /// - /// Initializes a new instance of the class. - /// - /// The type. - public EntLib5Logger(Type type) - { - var factory = new EntLib5Factory(); - logWriter = factory.CreateDefault(); - logWriter.SetContextItem("type", type.Name); - } - - - /// - /// Specifies whether the Debug listener this functional - /// - public bool IsDebugEnabled - { - get - { -#if DEBUG - return true; -#else - return false; -#endif - } - } - - #region DEBUG Handlers - - /// - /// Logs a Debug message. - /// - /// The message. - public void Debug(object message) - { - if (IsDebugEnabled) - { - System.Diagnostics.Debug.WriteLine(message); - } - else - { - if (logWriter.IsLoggingEnabled()) - WriteMessage(message, TraceEventType.Verbose, null, null); - } - } - - /// - /// Logs a Debug message and category. - /// - /// The message. - /// The category. - public void Debug(object message, string category) - { - if (IsDebugEnabled) - { - System.Diagnostics.Debug.WriteLine(message, category); - } - else - { - if (logWriter.IsLoggingEnabled()) - WriteMessage(message, TraceEventType.Verbose, category, null); - } - } - - /// - /// Logs a Debug message and exception. - /// - /// The message. - /// The exception. - public void Debug(object message, Exception exception) - { - if (IsDebugEnabled) - { - System.Diagnostics.Debug.WriteLine(message); - } - else - { - if (logWriter.IsLoggingEnabled()) - WriteMessage(message, TraceEventType.Verbose, null, exception); - } - } - - /// - /// Logs a Debug message, category and exception. - /// - /// The message. - /// The category. - /// The exception. - public void Debug(object message, string category, Exception exception) - { - if (IsDebugEnabled) - { - System.Diagnostics.Debug.WriteLine(message, category); - } - else - { - if (logWriter.IsLoggingEnabled()) - WriteMessage(message, TraceEventType.Verbose, category, exception); - } - } - - /// - /// Logs a Debug format message. - /// - /// The format. - /// The args. - public void DebugFormat(string format, params object[] args) - { - if (IsDebugEnabled) - { - System.Diagnostics.Debug.Print(format, args); - } - else - { - throw new NotSupportedException("The DebugFormat method is not supported. Modify the Log Message Format using a formatter in the loggingConfiguration section."); - } - } - - #endregion - - #region ERROR Handlers - - /// - /// Logs an Error message. - /// - /// The message. - public void Error(object message) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Error, null, null); - } - } - - /// - /// Logs an Error message and category. - /// - /// The message. - /// The category. - public void Error(object message, string category) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Error, category, null); - } - } - - /// - /// Logs an Error message and exception. - /// - /// The message. - /// The exception. - public void Error(object message, Exception exception) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Error, null, exception); - } - } - - /// - /// Logs an Error message, category and exception. - /// - /// The message. - /// The category. - /// The exception. - public void Error(object message, string category, Exception exception) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Error, category, exception); - } - } - - /// - /// Logs a Error format message. - /// - /// The format. - /// The args. - public void ErrorFormat(string format, params object[] args) - { - if (logWriter.IsLoggingEnabled()) - { - throw new NotSupportedException("The ErrorFormat method is not supported. Modify the Log Message Format using a formatter in the loggingConfiguration section."); - } - } - - #endregion - - #region FATAL Handlers - - /// - /// Logs a Fatal Error message. - /// - /// The message. - public void Fatal(object message) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Critical, null, null); - } - } - - /// - /// Logs a Fatal Error message and category. - /// - /// The message. - /// The category. - public void Fatal(object message, string category) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Critical, category, null); - } - } - - /// - /// Logs a Fatal Error message and exception. - /// - /// The message. - /// The exception. - public void Fatal(object message, Exception exception) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Critical, null, exception); - } - } - - /// - /// Logs a Fatal Error message, category and exception. - /// - /// The message. - /// The category. - /// The exception. - public void Fatal(object message, string category, Exception exception) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Critical, category, exception); - } - } - - /// - /// Logs a Error format message. - /// - /// The format. - /// The args. - public void FatalFormat(string format, params object[] args) - { - if (logWriter.IsLoggingEnabled()) - { - throw new NotSupportedException("The FatalFormat method is not supported. Modify the Log Message Format using a formatter in the loggingConfiguration section."); - } - } - - #endregion - - #region INFO Handlers - - /// - /// Logs an Info message. - /// - /// The message. - public void Info(object message) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Information, null, null); - } - } - - /// - /// Logs an Info message and category. - /// - /// The message. - /// The category. - public void Info(object message, string category) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Information, category, null); - } - } - - /// - /// Logs an Info message and exception. - /// - /// The message. - /// The exception. - public void Info(object message, Exception exception) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Information, null, exception); - } - } - - /// - /// Logs an Info message, category and exception. - /// - /// The message. - /// The category. - /// The exception. - public void Info(object message, string category, Exception exception) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Information, category, exception); - } - } - - /// - /// Logs an Info format message. - /// - /// The format. - /// The args. - public void InfoFormat(string format, params object[] args) - { - if (logWriter.IsLoggingEnabled()) - { - throw new NotSupportedException("The InfoFormat method is not supported. Modify the Log Message Format using a formatter in the loggingConfiguration section."); - } - } - - #endregion - - #region WARN Handlers - - /// - /// Logs a Warning message. - /// - /// The message. - public void Warn(object message) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Warning, null, null); - } - } - - /// - /// Logs a Warning message and category. - /// - /// The message. - /// The category. - public void Warn(object message, string category) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Warning, category, null); - } - } - - /// - /// Logs a Warning message and exception. - /// - /// The message. - /// The exception. - public void Warn(object message, Exception exception) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Warning, null, exception); - } - } - - /// - /// Logs a Warning message, category and exception. - /// - /// The message. - /// The category. - /// The exception. - public void Warn(object message, string category, Exception exception) - { - if (logWriter.IsLoggingEnabled()) - { - WriteMessage(message, TraceEventType.Warning, category, exception); - } - } - - /// - /// Logs a Warning format message. - /// - /// The format. - /// The args. - public void WarnFormat(string format, params object[] args) - { - if (logWriter.IsLoggingEnabled()) - { - throw new NotSupportedException("The WarnFormat method is not supported. Modify the Log Message Format using a formatter in the loggingConfiguration section."); - } - } - - #endregion - - private void WriteMessage(object message, TraceEventType eventType, object category = null, Exception exception = null) - { - var entry = new LogEntry(); - entry.Severity = eventType; - - //Add Message - if (message != null) - entry.Message = message.ToString(); - - //Add category - if (category != null) - entry.Categories.Add(category.ToString()); - - //Add exception, user name, detailed date & time if needed - entry.ExtendedProperties.Add("Exception", exception); - entry.TimeStamp = DateTime.UtcNow; - - logWriter.Write(entry); - } - } -} +using System; +using System.Diagnostics; +using Microsoft.Practices.EnterpriseLibrary.Logging; + +namespace ServiceStack.Logging.EntLib5 +{ + /// Wrapper over the Enterprise Library 5.0 Logging Application Block + public class EntLib5Logger : ILog + { + private readonly LogWriter logWriter; + + /// + /// Initializes a new instance of the class. + /// + public EntLib5Logger() + { + var factory = new EntLib5Factory(); + logWriter = factory.CreateDefault(); + } + + /// + /// Initializes a new instance of the class. + /// + /// The type name. + public EntLib5Logger(string typeName) + { + var factory = new EntLib5Factory(); + logWriter = factory.CreateDefault(); + logWriter.SetContextItem("type", typeName); + } + + /// + /// Initializes a new instance of the class. + /// + /// The type. + public EntLib5Logger(Type type) + { + var factory = new EntLib5Factory(); + logWriter = factory.CreateDefault(); + logWriter.SetContextItem("type", type.Name); + } + + + /// + /// Specifies whether the Debug listener this functional + /// + public bool IsDebugEnabled + { + get + { +#if DEBUG + return true; +#else + return false; +#endif + } + } + + #region DEBUG Handlers + + /// + /// Logs a Debug message. + /// + /// The message. + public void Debug(object message) + { + if (IsDebugEnabled) + { + System.Diagnostics.Debug.WriteLine(message); + } + else + { + if (logWriter.IsLoggingEnabled()) + WriteMessage(message, TraceEventType.Verbose, null, null); + } + } + + /// + /// Logs a Debug message and category. + /// + /// The message. + /// The category. + public void Debug(object message, string category) + { + if (IsDebugEnabled) + { + System.Diagnostics.Debug.WriteLine(message, category); + } + else + { + if (logWriter.IsLoggingEnabled()) + WriteMessage(message, TraceEventType.Verbose, category, null); + } + } + + /// + /// Logs a Debug message and exception. + /// + /// The message. + /// The exception. + public void Debug(object message, Exception exception) + { + if (IsDebugEnabled) + { + System.Diagnostics.Debug.WriteLine(message); + } + else + { + if (logWriter.IsLoggingEnabled()) + WriteMessage(message, TraceEventType.Verbose, null, exception); + } + } + + /// + /// Logs a Debug message, category and exception. + /// + /// The message. + /// The category. + /// The exception. + public void Debug(object message, string category, Exception exception) + { + if (IsDebugEnabled) + { + System.Diagnostics.Debug.WriteLine(message, category); + } + else + { + if (logWriter.IsLoggingEnabled()) + WriteMessage(message, TraceEventType.Verbose, category, exception); + } + } + + /// + /// Logs a Debug format message. + /// + /// The format. + /// The args. + public void DebugFormat(string format, params object[] args) + { + if (IsDebugEnabled) + { + System.Diagnostics.Debug.Print(format, args); + } + else + { + throw new NotSupportedException("The DebugFormat method is not supported. Modify the Log Message Format using a formatter in the loggingConfiguration section."); + } + } + + #endregion + + #region ERROR Handlers + + /// + /// Logs an Error message. + /// + /// The message. + public void Error(object message) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Error, null, null); + } + } + + /// + /// Logs an Error message and category. + /// + /// The message. + /// The category. + public void Error(object message, string category) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Error, category, null); + } + } + + /// + /// Logs an Error message and exception. + /// + /// The message. + /// The exception. + public void Error(object message, Exception exception) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Error, null, exception); + } + } + + /// + /// Logs an Error message, category and exception. + /// + /// The message. + /// The category. + /// The exception. + public void Error(object message, string category, Exception exception) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Error, category, exception); + } + } + + /// + /// Logs a Error format message. + /// + /// The format. + /// The args. + public void ErrorFormat(string format, params object[] args) + { + if (logWriter.IsLoggingEnabled()) + { + throw new NotSupportedException("The ErrorFormat method is not supported. Modify the Log Message Format using a formatter in the loggingConfiguration section."); + } + } + + #endregion + + #region FATAL Handlers + + /// + /// Logs a Fatal Error message. + /// + /// The message. + public void Fatal(object message) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Critical, null, null); + } + } + + /// + /// Logs a Fatal Error message and category. + /// + /// The message. + /// The category. + public void Fatal(object message, string category) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Critical, category, null); + } + } + + /// + /// Logs a Fatal Error message and exception. + /// + /// The message. + /// The exception. + public void Fatal(object message, Exception exception) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Critical, null, exception); + } + } + + /// + /// Logs a Fatal Error message, category and exception. + /// + /// The message. + /// The category. + /// The exception. + public void Fatal(object message, string category, Exception exception) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Critical, category, exception); + } + } + + /// + /// Logs a Error format message. + /// + /// The format. + /// The args. + public void FatalFormat(string format, params object[] args) + { + if (logWriter.IsLoggingEnabled()) + { + throw new NotSupportedException("The FatalFormat method is not supported. Modify the Log Message Format using a formatter in the loggingConfiguration section."); + } + } + + #endregion + + #region INFO Handlers + + /// + /// Logs an Info message. + /// + /// The message. + public void Info(object message) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Information, null, null); + } + } + + /// + /// Logs an Info message and category. + /// + /// The message. + /// The category. + public void Info(object message, string category) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Information, category, null); + } + } + + /// + /// Logs an Info message and exception. + /// + /// The message. + /// The exception. + public void Info(object message, Exception exception) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Information, null, exception); + } + } + + /// + /// Logs an Info message, category and exception. + /// + /// The message. + /// The category. + /// The exception. + public void Info(object message, string category, Exception exception) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Information, category, exception); + } + } + + /// + /// Logs an Info format message. + /// + /// The format. + /// The args. + public void InfoFormat(string format, params object[] args) + { + if (logWriter.IsLoggingEnabled()) + { + throw new NotSupportedException("The InfoFormat method is not supported. Modify the Log Message Format using a formatter in the loggingConfiguration section."); + } + } + + #endregion + + #region WARN Handlers + + /// + /// Logs a Warning message. + /// + /// The message. + public void Warn(object message) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Warning, null, null); + } + } + + /// + /// Logs a Warning message and category. + /// + /// The message. + /// The category. + public void Warn(object message, string category) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Warning, category, null); + } + } + + /// + /// Logs a Warning message and exception. + /// + /// The message. + /// The exception. + public void Warn(object message, Exception exception) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Warning, null, exception); + } + } + + /// + /// Logs a Warning message, category and exception. + /// + /// The message. + /// The category. + /// The exception. + public void Warn(object message, string category, Exception exception) + { + if (logWriter.IsLoggingEnabled()) + { + WriteMessage(message, TraceEventType.Warning, category, exception); + } + } + + /// + /// Logs a Warning format message. + /// + /// The format. + /// The args. + public void WarnFormat(string format, params object[] args) + { + if (logWriter.IsLoggingEnabled()) + { + throw new NotSupportedException("The WarnFormat method is not supported. Modify the Log Message Format using a formatter in the loggingConfiguration section."); + } + } + + #endregion + + private void WriteMessage(object message, TraceEventType eventType, object category = null, Exception exception = null) + { + var entry = new LogEntry(); + entry.Severity = eventType; + + //Add Message + if (message != null) + entry.Message = message.ToString(); + + //Add category + if (category != null) + entry.Categories.Add(category.ToString()); + + //Add exception, user name, detailed date & time if needed + entry.ExtendedProperties.Add("Exception", exception); + entry.TimeStamp = DateTime.UtcNow; + + logWriter.Write(entry); + } + } +} diff --git a/src/ServiceStack.Logging.EnterpriseLibrary5/Properties/AssemblyInfo.cs b/src/ServiceStack.Logging.EntLib5/Properties/AssemblyInfo.cs similarity index 93% rename from src/ServiceStack.Logging.EnterpriseLibrary5/Properties/AssemblyInfo.cs rename to src/ServiceStack.Logging.EntLib5/Properties/AssemblyInfo.cs index 7f5e5bd..95a62cf 100644 --- a/src/ServiceStack.Logging.EnterpriseLibrary5/Properties/AssemblyInfo.cs +++ b/src/ServiceStack.Logging.EntLib5/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -36,5 +36,5 @@ // 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")] +[assembly: AssemblyVersion("3.9.60.0")] +[assembly: AssemblyFileVersion("3.9.60.0")] diff --git a/src/ServiceStack.Logging.EnterpriseLibrary5/SerializableConfigurationSource.cs b/src/ServiceStack.Logging.EntLib5/SerializableConfigurationSource.cs similarity index 94% rename from src/ServiceStack.Logging.EnterpriseLibrary5/SerializableConfigurationSource.cs rename to src/ServiceStack.Logging.EntLib5/SerializableConfigurationSource.cs index 0dfa3bd..0c245b8 100644 --- a/src/ServiceStack.Logging.EnterpriseLibrary5/SerializableConfigurationSource.cs +++ b/src/ServiceStack.Logging.EntLib5/SerializableConfigurationSource.cs @@ -1,69 +1,69 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.IO; -using System.Reflection; -using System.Xml; -using System.Xml.Linq; -using Microsoft.Practices.EnterpriseLibrary.Common.Configuration; - -namespace ServiceStack.Logging.EnterpriseLibrary5 -{ - public class SerializableConfigurationSource : IConfigurationSource - { - readonly Dictionary sections = new Dictionary(); - - public ConfigurationSection GetSection(string sectionName) - { - ConfigurationSection configSection; - - if (sections.TryGetValue(sectionName, out configSection)) - { - SerializableConfigurationSection section = configSection as SerializableConfigurationSection; - - if (section != null) - { - using (StringWriter xml = new StringWriter()) - using (XmlWriter xmlwriter = XmlWriter.Create(xml)) - { - section.WriteXml(xmlwriter); - xmlwriter.Flush(); - - MethodInfo methodInfo = section.GetType().GetMethod("DeserializeSection", BindingFlags.NonPublic | BindingFlags.Instance); - methodInfo.Invoke(section, new object[] { XDocument.Parse(xml.ToString()).CreateReader() }); - - return configSection; - } - } - } - - return null; - } - - public void Add(string sectionName, ConfigurationSection configurationSection) - { - sections[sectionName] = configurationSection; - } - - public void AddSectionChangeHandler(string sectionName, ConfigurationChangedEventHandler handler) - { - throw new NotImplementedException(); - } - - public void Remove(string sectionName) - { - sections.Remove(sectionName); - } - - public void RemoveSectionChangeHandler(string sectionName, ConfigurationChangedEventHandler handler) - { - throw new NotImplementedException(); - } - - public event EventHandler SourceChanged; - - public void Dispose() { } - - } - -} +using System; +using System.Collections.Generic; +using System.Configuration; +using System.IO; +using System.Reflection; +using System.Xml; +using System.Xml.Linq; +using Microsoft.Practices.EnterpriseLibrary.Common.Configuration; + +namespace ServiceStack.Logging.EntLib5 +{ + public class SerializableConfigurationSource : IConfigurationSource + { + readonly Dictionary sections = new Dictionary(); + + public ConfigurationSection GetSection(string sectionName) + { + ConfigurationSection configSection; + + if (sections.TryGetValue(sectionName, out configSection)) + { + SerializableConfigurationSection section = configSection as SerializableConfigurationSection; + + if (section != null) + { + using (StringWriter xml = new StringWriter()) + using (XmlWriter xmlwriter = XmlWriter.Create(xml)) + { + section.WriteXml(xmlwriter); + xmlwriter.Flush(); + + MethodInfo methodInfo = section.GetType().GetMethod("DeserializeSection", BindingFlags.NonPublic | BindingFlags.Instance); + methodInfo.Invoke(section, new object[] { XDocument.Parse(xml.ToString()).CreateReader() }); + + return configSection; + } + } + } + + return null; + } + + public void Add(string sectionName, ConfigurationSection configurationSection) + { + sections[sectionName] = configurationSection; + } + + public void AddSectionChangeHandler(string sectionName, ConfigurationChangedEventHandler handler) + { + throw new NotImplementedException(); + } + + public void Remove(string sectionName) + { + sections.Remove(sectionName); + } + + public void RemoveSectionChangeHandler(string sectionName, ConfigurationChangedEventHandler handler) + { + throw new NotImplementedException(); + } + + public event EventHandler SourceChanged; + + public void Dispose() { } + + } + +} diff --git a/src/ServiceStack.Logging.EnterpriseLibrary5/ServiceStack.Logging.EntLib5.csproj b/src/ServiceStack.Logging.EntLib5/ServiceStack.Logging.EntLib5.csproj similarity index 88% rename from src/ServiceStack.Logging.EnterpriseLibrary5/ServiceStack.Logging.EntLib5.csproj rename to src/ServiceStack.Logging.EntLib5/ServiceStack.Logging.EntLib5.csproj index 9a56801..09c8d0a 100644 --- a/src/ServiceStack.Logging.EnterpriseLibrary5/ServiceStack.Logging.EntLib5.csproj +++ b/src/ServiceStack.Logging.EntLib5/ServiceStack.Logging.EntLib5.csproj @@ -8,9 +8,9 @@ {EDD72ADC-327C-4152-B84B-B48552311534} Library Properties - ServiceStack.Logging.EnterpriseLibrary5 - ServiceStack.Logging.EnterpriseLibrary5 - v3.5 + ServiceStack.Logging.EntLib5 + ServiceStack.Logging.EntLib5 + v4.0 512 ..\ true @@ -57,17 +57,17 @@ ..\packages\Unity.Interception.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Interception.Configuration.dll - + False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Interfaces.dll - + False - ..\packages\ServiceStack.Text.3.9.44\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll @@ -86,7 +86,6 @@ - diff --git a/src/ServiceStack.Logging.EnterpriseLibrary5/packages.config b/src/ServiceStack.Logging.EntLib5/packages.config similarity index 79% rename from src/ServiceStack.Logging.EnterpriseLibrary5/packages.config rename to src/ServiceStack.Logging.EntLib5/packages.config index 16a5492..f39b56a 100644 --- a/src/ServiceStack.Logging.EnterpriseLibrary5/packages.config +++ b/src/ServiceStack.Logging.EntLib5/packages.config @@ -3,8 +3,8 @@ - - + + \ No newline at end of file diff --git a/src/ServiceStack.Logging.EventLog/EventLogger.cs b/src/ServiceStack.Logging.EventLog/EventLogger.cs index ab6617c..7b09124 100644 --- a/src/ServiceStack.Logging.EventLog/EventLogger.cs +++ b/src/ServiceStack.Logging.EventLog/EventLogger.cs @@ -74,8 +74,8 @@ private void Write(object message, Exception execption, EventLogEntryType eventL execption = execption.InnerException; } - eventLogger.Source = eventLogName; - eventLogger.WriteEntry(String.Format(ERROR_MSG, eventLogSource, sb), eventLogType); + eventLogger.Source = eventLogSource; + eventLogger.WriteEntry(String.Format(ERROR_MSG, eventLogName, sb), eventLogType); } /// diff --git a/src/ServiceStack.Logging.EventLog/Properties/AssemblyInfo.cs b/src/ServiceStack.Logging.EventLog/Properties/AssemblyInfo.cs index 4ecf214..1665844 100644 --- a/src/ServiceStack.Logging.EventLog/Properties/AssemblyInfo.cs +++ b/src/ServiceStack.Logging.EventLog/Properties/AssemblyInfo.cs @@ -14,7 +14,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Demis Bellot")] [assembly: AssemblyProduct("ServiceStack.Logging.EventLog")] -[assembly: AssemblyCopyright("Copyright © ServiceStack 2013")] +[assembly: AssemblyCopyright("Copyright � ServiceStack 2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -36,5 +36,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.9")] -[assembly: AssemblyFileVersion("1.0.9")] +[assembly: AssemblyVersion("1.0.10")] +[assembly: AssemblyFileVersion("1.0.10")] diff --git a/src/ServiceStack.Logging.EventLog/ServiceStack.Logging.EventLog.csproj b/src/ServiceStack.Logging.EventLog/ServiceStack.Logging.EventLog.csproj index b104005..4e4835d 100644 --- a/src/ServiceStack.Logging.EventLog/ServiceStack.Logging.EventLog.csproj +++ b/src/ServiceStack.Logging.EventLog/ServiceStack.Logging.EventLog.csproj @@ -1,126 +1,126 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {D920BA88-E394-4C75-94E3-78D7298A8457} - Library - Properties - ServiceStack.Logging.EventLog - ServiceStack.Logging.EventLog - - - - - - - - - - - 3.5 - - - false - v3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - ..\..\src\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset - - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Common.dll - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Interfaces.dll - - - False - ..\packages\ServiceStack.Text.3.9.44\lib\net35\ServiceStack.Text.dll - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {D920BA88-E394-4C75-94E3-78D7298A8457} + Library + Properties + ServiceStack.Logging.EventLog + ServiceStack.Logging.EventLog + + + + + + + + + + + 3.5 + + + false + v4.0 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + ..\..\src\ + true + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + AllRules.ruleset + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + AllRules.ruleset + + + + False + ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Common.dll + + + False + ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Interfaces.dll + + + False + ..\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll + + + + + + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 2.0 %28x86%29 + true + + + False + .NET Framework 3.0 %28x86%29 + false + + + False + .NET Framework 3.5 + false + + + False + .NET Framework 3.5 SP1 + false + + + + + + + + \ No newline at end of file diff --git a/src/ServiceStack.Logging.EventLog/packages.config b/src/ServiceStack.Logging.EventLog/packages.config index 57d17b1..464bef6 100644 --- a/src/ServiceStack.Logging.EventLog/packages.config +++ b/src/ServiceStack.Logging.EventLog/packages.config @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/src/ServiceStack.Logging.Log4Net/Properties/AssemblyInfo.cs b/src/ServiceStack.Logging.Log4Net/Properties/AssemblyInfo.cs index eddef1c..84ed382 100644 --- a/src/ServiceStack.Logging.Log4Net/Properties/AssemblyInfo.cs +++ b/src/ServiceStack.Logging.Log4Net/Properties/AssemblyInfo.cs @@ -14,7 +14,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Demis Bellot")] [assembly: AssemblyProduct("ServiceStack.Logging.Log4Net")] -[assembly: AssemblyCopyright("Copyright © ServiceStack 2013")] +[assembly: AssemblyCopyright("Copyright � ServiceStack 2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -36,5 +36,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.9")] -[assembly: AssemblyFileVersion("1.0.9")] +[assembly: AssemblyVersion("1.0.10")] +[assembly: AssemblyFileVersion("1.0.10")] diff --git a/src/ServiceStack.Logging.Log4Net/ServiceStack.Logging.Log4Net.csproj b/src/ServiceStack.Logging.Log4Net/ServiceStack.Logging.Log4Net.csproj index 58a7c7f..3010f6b 100644 --- a/src/ServiceStack.Logging.Log4Net/ServiceStack.Logging.Log4Net.csproj +++ b/src/ServiceStack.Logging.Log4Net/ServiceStack.Logging.Log4Net.csproj @@ -1,129 +1,129 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {C44A6E80-326E-4036-8906-62E881F4727D} - Library - Properties - ServiceStack.Logging.Log4Net - ServiceStack.Logging.Log4Net - - - - - - - - - - - 3.5 - - - false - v3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - ..\..\src\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset - - - - ..\packages\log4net.2.0.0\lib\net35-full\log4net.dll - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Common.dll - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Interfaces.dll - - - False - ..\packages\ServiceStack.Text.3.9.44\lib\net35\ServiceStack.Text.dll - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {C44A6E80-326E-4036-8906-62E881F4727D} + Library + Properties + ServiceStack.Logging.Log4Net + ServiceStack.Logging.Log4Net + + + + + + + + + + + 3.5 + + + false + v4.0 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + ..\..\src\ + true + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + AllRules.ruleset + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + AllRules.ruleset + + + + ..\packages\log4net.2.0.0\lib\net35-full\log4net.dll + + + False + ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Common.dll + + + False + ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Interfaces.dll + + + False + ..\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll + + + + + + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 2.0 %28x86%29 + true + + + False + .NET Framework 3.0 %28x86%29 + false + + + False + .NET Framework 3.5 + false + + + False + .NET Framework 3.5 SP1 + false + + + + + + + + \ No newline at end of file diff --git a/src/ServiceStack.Logging.Log4Net/packages.config b/src/ServiceStack.Logging.Log4Net/packages.config index 30d38e3..a34e4db 100644 --- a/src/ServiceStack.Logging.Log4Net/packages.config +++ b/src/ServiceStack.Logging.Log4Net/packages.config @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/src/ServiceStack.Logging.Log4Netv1210/Log4NetFactory.cs b/src/ServiceStack.Logging.Log4Netv1210/Log4NetFactory.cs deleted file mode 100644 index 9b7c980..0000000 --- a/src/ServiceStack.Logging.Log4Netv1210/Log4NetFactory.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System; -using System.IO; - -namespace ServiceStack.Logging.Log4Net -{ - /// - /// ILogFactory that creates an Log4Net ILog logger - /// - public class Log4NetFactory : ILogFactory - { - /// - /// Initializes a new instance of the class. - /// - public Log4NetFactory() : this(false) { } - - /// - /// Initializes a new instance of the class. - /// - /// if set to true [will use the xml definition in App.Config to configure log4 net]. - public Log4NetFactory(bool configureLog4Net) - { - if (configureLog4Net) - { - log4net.Config.XmlConfigurator.Configure(); - } - } - - /// - /// Initializes a new instance of the class. - /// - /// The log4 net configuration file to load and watch. If not found configures from App.Config. - public Log4NetFactory(string log4NetConfigurationFile) - { - //Restart logging if necessary - log4net.Repository.ILoggerRepository rootRepository = log4net.LogManager.GetRepository(); - if (rootRepository != null) - rootRepository.Shutdown(); - - if (File.Exists(log4NetConfigurationFile)) - log4net.Config.XmlConfigurator.ConfigureAndWatch(new FileInfo(log4NetConfigurationFile)); - else - log4net.Config.XmlConfigurator.Configure(); - } - - /// - /// Gets the logger. - /// - /// The type. - /// - public ILog GetLogger(Type type) - { - return new Log4NetLogger(type); - } - - /// - /// Gets the logger. - /// - /// Name of the type. - /// - public ILog GetLogger(string typeName) - { - return new Log4NetLogger(typeName); - } - } -} diff --git a/src/ServiceStack.Logging.Log4Netv1210/Log4NetLogger.cs b/src/ServiceStack.Logging.Log4Netv1210/Log4NetLogger.cs deleted file mode 100644 index 0d76d9f..0000000 --- a/src/ServiceStack.Logging.Log4Netv1210/Log4NetLogger.cs +++ /dev/null @@ -1,188 +0,0 @@ -using System; - -namespace ServiceStack.Logging.Log4Net -{ - /// - /// Wrapper over the log4net.1.2.10 and above logger - /// - public class Log4NetLogger : ILog - { - private readonly log4net.ILog _log; - - public Log4NetLogger(string typeName) - { - _log = log4net.LogManager.GetLogger(typeName); - } - - /// - /// Initializes a new instance of the class. - /// - /// The type. - public Log4NetLogger(Type type) - { - _log = log4net.LogManager.GetLogger(type); - } - - public bool IsDebugEnabled { get { return _log.IsDebugEnabled; } } - - /// - /// Logs a Debug message. - /// - /// The message. - public void Debug(object message) - { - if (_log.IsDebugEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Debug, message, null); - } - - /// - /// Logs a Debug message and exception. - /// - /// The message. - /// The exception. - public void Debug(object message, Exception exception) - { - if (_log.IsDebugEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Debug, message, exception); - } - - /// - /// Logs a Debug format message. - /// - /// The format. - /// The args. - public void DebugFormat(string format, params object[] args) - { - if (_log.IsDebugEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Debug, String.Format (format, args), null); - } - - /// - /// Logs a Error message. - /// - /// The message. - public void Error(object message) - { - if (_log.IsErrorEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Error, message, null); - } - - /// - /// Logs a Error message and exception. - /// - /// The message. - /// The exception. - public void Error(object message, Exception exception) - { - if (_log.IsErrorEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Error, message, exception); - } - - /// - /// Logs a Error format message. - /// - /// The format. - /// The args. - public void ErrorFormat(string format, params object[] args) - { - if (_log.IsErrorEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Error, String.Format (format, args), null); - } - - /// - /// Logs a Fatal message. - /// - /// The message. - public void Fatal(object message) - { - if (_log.IsFatalEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Fatal, message, null); - } - - /// - /// Logs a Fatal message and exception. - /// - /// The message. - /// The exception. - public void Fatal(object message, Exception exception) - { - if (_log.IsFatalEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Fatal, message, exception); - } - - /// - /// Logs a Error format message. - /// - /// The format. - /// The args. - public void FatalFormat(string format, params object[] args) - { - if (_log.IsFatalEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Fatal, String.Format(format, args), null); - } - - /// - /// Logs an Info message and exception. - /// - /// The message. - public void Info(object message) - { - if (_log.IsInfoEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Info, message, null); - } - - /// - /// Logs an Info message and exception. - /// - /// The message. - /// The exception. - public void Info(object message, Exception exception) - { - if (_log.IsInfoEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Info, message, exception); - } - - /// - /// Logs an Info format message. - /// - /// The format. - /// The args. - public void InfoFormat(string format, params object[] args) - { - if (_log.IsInfoEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Info, String.Format (format, args), null); - } - - /// - /// Logs a Warning message. - /// - /// The message. - public void Warn(object message) - { - if (_log.IsWarnEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Warn, message, null); - } - - /// - /// Logs a Warning message and exception. - /// - /// The message. - /// The exception. - public void Warn(object message, Exception exception) - { - if (_log.IsWarnEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Warn, message, exception); - } - - /// - /// Logs a Warning format message. - /// - /// The format. - /// The args. - public void WarnFormat(string format, params object[] args) - { - if (_log.IsWarnEnabled) - _log.Logger.Log(typeof(Log4NetLogger), log4net.Core.Level.Warn, String.Format(format, args), null); - } - } -} \ No newline at end of file diff --git a/src/ServiceStack.Logging.Log4Netv1210/Properties/AssemblyInfo.cs b/src/ServiceStack.Logging.Log4Netv1210/Properties/AssemblyInfo.cs deleted file mode 100644 index eddef1c..0000000 --- a/src/ServiceStack.Logging.Log4Netv1210/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,40 +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("ServiceStack.Logging.Log4Net")] -[assembly: AssemblyDescription(@"Provides log4net logging integration for other ServiceStack projects - Includes: - - ServiceStack.Logging.Log4Net.dll - Dependencies: - - ServiceStack.Interfaces.dll")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Demis Bellot")] -[assembly: AssemblyProduct("ServiceStack.Logging.Log4Net")] -[assembly: AssemblyCopyright("Copyright © ServiceStack 2013")] -[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("d575bdba-a6db-464c-8c41-bd0694b79b02")] - -// 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 Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.9")] -[assembly: AssemblyFileVersion("1.0.9")] diff --git a/src/ServiceStack.Logging.Log4Netv1210/ServiceStack.Logging.Log4Netv1210.csproj b/src/ServiceStack.Logging.Log4Netv1210/ServiceStack.Logging.Log4Netv1210.csproj deleted file mode 100644 index ee6b727..0000000 --- a/src/ServiceStack.Logging.Log4Netv1210/ServiceStack.Logging.Log4Netv1210.csproj +++ /dev/null @@ -1,129 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {6A5E3F1C-5F68-4228-805C-2F2374DCC5C0} - Library - Properties - ServiceStack.Logging.Log4Net - ServiceStack.Logging.Log4Netv1210 - - - - - - - - - - - 3.5 - - - false - v3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - ..\..\src\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset - - - - ..\..\lib\log4net.1.2.10.dll - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Common.dll - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Interfaces.dll - - - False - ..\packages\ServiceStack.Text.3.9.44\lib\net35\ServiceStack.Text.dll - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - - \ No newline at end of file diff --git a/src/ServiceStack.Logging.Log4Netv1210/packages.config b/src/ServiceStack.Logging.Log4Netv1210/packages.config deleted file mode 100644 index 57d17b1..0000000 --- a/src/ServiceStack.Logging.Log4Netv1210/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/ServiceStack.Logging.Log4Netv129/Log4NetFactory.cs b/src/ServiceStack.Logging.Log4Netv129/Log4NetFactory.cs deleted file mode 100644 index ac11072..0000000 --- a/src/ServiceStack.Logging.Log4Netv129/Log4NetFactory.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; - -namespace ServiceStack.Logging.Log4Net -{ - /// - /// Wrapper over the log4net.1.2.10 and above logger - /// - public class Log4NetFactory : ILogFactory - { - /// - /// Initializes a new instance of the class. - /// - public Log4NetFactory() : this(false) { } - - /// - /// Initializes a new instance of the class. - /// - /// if set to true [will use the xml definition in App.Config to configure log4 net]. - public Log4NetFactory(bool configureLog4Net) - { - if (configureLog4Net) - { - log4net.Config.XmlConfigurator.Configure(); - } - } - - /// - /// Gets the logger. - /// - /// The type. - /// - public ILog GetLogger(Type type) - { - return new Log4NetLogger(type); - } - - /// - /// Gets the logger. - /// - /// Name of the type. - /// - public ILog GetLogger(string typeName) - { - return new Log4NetLogger(typeName); - } - } -} diff --git a/src/ServiceStack.Logging.Log4Netv129/Log4NetLogger.cs b/src/ServiceStack.Logging.Log4Netv129/Log4NetLogger.cs deleted file mode 100644 index 811436b..0000000 --- a/src/ServiceStack.Logging.Log4Netv129/Log4NetLogger.cs +++ /dev/null @@ -1,179 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ServiceStack.Logging.Log4Net -{ - /// - /// Log4Net v1.2.9 and below ILog logger - /// - public class Log4NetLogger : ILog - { - private readonly log4net.ILog log; - - /// - /// Initializes a new instance of the class. - /// - /// Name of the type. - public Log4NetLogger(string typeName) - { - log = log4net.LogManager.GetLogger(typeName); - } - - /// - /// Initializes a new instance of the class. - /// - /// The type. - public Log4NetLogger(Type type) - { - log = log4net.LogManager.GetLogger(type); - } - - public bool IsDebugEnabled { get { return log.IsDebugEnabled; } } - - /// - /// Logs a Debug message. - /// - /// The message. - public void Debug(object message) - { - log.Debug(message); - } - - /// - /// Logs a Debug message and exception. - /// - /// The message. - /// The exception. - public void Debug(object message, Exception exception) - { - log.Debug(message, exception); - } - - /// - /// Logs a Debug format message. - /// - /// The format. - /// The args. - public void DebugFormat(string format, params object[] args) - { - log.DebugFormat(format, args); - } - - /// - /// Logs a Error message. - /// - /// The message. - public void Error(object message) - { - log.Error(message); - } - - /// - /// Logs a Error message and exception. - /// - /// The message. - /// The exception. - public void Error(object message, Exception exception) - { - log.Error(message, exception); - } - - /// - /// Logs a Error format message. - /// - /// The format. - /// The args. - public void ErrorFormat(string format, params object[] args) - { - log.ErrorFormat(format, args); - } - - /// - /// Logs a Fatal message. - /// - /// The message. - public void Fatal(object message) - { - log.Fatal(message); - } - - /// - /// Logs a Fatal message and exception. - /// - /// The message. - /// The exception. - public void Fatal(object message, Exception exception) - { - log.Fatal(message, exception); - } - - /// - /// Logs a Error format message. - /// - /// The format. - /// The args. - public void FatalFormat(string format, params object[] args) - { - log.FatalFormat(format, args); - } - - /// - /// Logs an Info message and exception. - /// - /// The message. - public void Info(object message) - { - log.Info(message); - } - - /// - /// Logs an Info message and exception. - /// - /// The message. - /// The exception. - public void Info(object message, Exception exception) - { - log.Info(message, exception); - } - - /// - /// Logs an Info format message. - /// - /// The format. - /// The args. - public void InfoFormat(string format, params object[] args) - { - log.InfoFormat(format, args); - } - - /// - /// Logs a Warning message. - /// - /// The message. - public void Warn(object message) - { - log.Warn(message); - } - - /// - /// Logs a Warning message and exception. - /// - /// The message. - /// The exception. - public void Warn(object message, Exception exception) - { - log.Warn(message, exception); - } - - /// - /// Logs a Warning format message. - /// - /// The format. - /// The args. - public void WarnFormat(string format, params object[] args) - { - log.WarnFormat(format, args); - } - } -} diff --git a/src/ServiceStack.Logging.Log4Netv129/Properties/AssemblyInfo.cs b/src/ServiceStack.Logging.Log4Netv129/Properties/AssemblyInfo.cs deleted file mode 100644 index 97b254c..0000000 --- a/src/ServiceStack.Logging.Log4Netv129/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,40 +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("ServiceStack.Logging.Log4Netv129")] -[assembly: AssemblyDescription(@"Provides log4net 1.2.9 logging integration for other ServiceStack projects - Includes: - - ServiceStack.Logging.Log4Netv129.dll - Dependencies: - - ServiceStack.Interfaces.dll")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Demis Bellot")] -[assembly: AssemblyProduct("ServiceStack.Logging.Log4Netv129")] -[assembly: AssemblyCopyright("Copyright © ServiceStack 2013")] -[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("3a98bbf3-94ef-40a8-9cd4-febb9752dd2b")] - -// 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 Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.9")] -[assembly: AssemblyFileVersion("1.0.9")] diff --git a/src/ServiceStack.Logging.Log4Netv129/ServiceStack.Logging.Log4Netv129.csproj b/src/ServiceStack.Logging.Log4Netv129/ServiceStack.Logging.Log4Netv129.csproj deleted file mode 100644 index 333af66..0000000 --- a/src/ServiceStack.Logging.Log4Netv129/ServiceStack.Logging.Log4Netv129.csproj +++ /dev/null @@ -1,130 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {0E1FF796-55CF-4F9B-BA72-484FC9D65065} - Library - Properties - ServiceStack.Logging.Log4Net - ServiceStack.Logging.Log4Netv129 - - - - - - - - - - - 3.5 - - - false - v3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - ..\..\src\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset - - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Common.dll - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Interfaces.dll - - - False - ..\packages\ServiceStack.Text.3.9.44\lib\net35\ServiceStack.Text.dll - - - - - - False - ..\..\lib\log4net.1.2.9.dll - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - - \ No newline at end of file diff --git a/src/ServiceStack.Logging.Log4Netv129/packages.config b/src/ServiceStack.Logging.Log4Netv129/packages.config deleted file mode 100644 index 57d17b1..0000000 --- a/src/ServiceStack.Logging.Log4Netv129/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/ServiceStack.Logging.NLog/Properties/AssemblyInfo.cs b/src/ServiceStack.Logging.NLog/Properties/AssemblyInfo.cs index 762268c..74f0093 100755 --- a/src/ServiceStack.Logging.NLog/Properties/AssemblyInfo.cs +++ b/src/ServiceStack.Logging.NLog/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -37,5 +37,5 @@ // 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.9")] -[assembly: AssemblyFileVersion("1.0.9")] +[assembly: AssemblyVersion("1.0.10")] +[assembly: AssemblyFileVersion("1.0.10")] diff --git a/src/ServiceStack.Logging.NLog/ServiceStack.Logging.NLog.csproj b/src/ServiceStack.Logging.NLog/ServiceStack.Logging.NLog.csproj index 50457fc..0c44e9b 100755 --- a/src/ServiceStack.Logging.NLog/ServiceStack.Logging.NLog.csproj +++ b/src/ServiceStack.Logging.NLog/ServiceStack.Logging.NLog.csproj @@ -1,77 +1,77 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {6B31F200-073C-46D4-B389-05646E035939} - Library - Properties - ServiceStack.Logging.NLog - ServiceStack.Logging.NLog - v3.5 - 512 - ..\..\src\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - False - ..\packages\NLog.2.0.1.2\lib\net35\NLog.dll - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Common.dll - - - False - ..\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Interfaces.dll - - - False - ..\packages\ServiceStack.Text.3.9.44\lib\net35\ServiceStack.Text.dll - - - - - - - - - - - - - - - - - - - - + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {6B31F200-073C-46D4-B389-05646E035939} + Library + Properties + ServiceStack.Logging.NLog + ServiceStack.Logging.NLog + v4.0 + 512 + ..\..\src\ + true + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\packages\NLog.2.0.1.2\lib\net35\NLog.dll + + + False + ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Common.dll + + + False + ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Interfaces.dll + + + False + ..\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ServiceStack.Logging.NLog/packages.config b/src/ServiceStack.Logging.NLog/packages.config index 351b99e..b2f314d 100644 --- a/src/ServiceStack.Logging.NLog/packages.config +++ b/src/ServiceStack.Logging.NLog/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/src/ServiceStack.Logging.sln b/src/ServiceStack.Logging.sln index 9040e4b..71f7e97 100644 --- a/src/ServiceStack.Logging.sln +++ b/src/ServiceStack.Logging.sln @@ -1,27 +1,31 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Logging.EventLog", "ServiceStack.Logging.EventLog\ServiceStack.Logging.EventLog.csproj", "{D920BA88-E394-4C75-94E3-78D7298A8457}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Logging.Log4Net", "ServiceStack.Logging.Log4Net\ServiceStack.Logging.Log4Net.csproj", "{C44A6E80-326E-4036-8906-62E881F4727D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Logging.Log4Netv129", "ServiceStack.Logging.Log4Netv129\ServiceStack.Logging.Log4Netv129.csproj", "{0E1FF796-55CF-4F9B-BA72-484FC9D65065}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Logging.Tests", "..\tests\ServiceStack.Logging.Tests\ServiceStack.Logging.Tests.csproj", "{DDDA27EC-5855-4E89-9971-C117EC08BDE3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Logging.NLog", "ServiceStack.Logging.NLog\ServiceStack.Logging.NLog.csproj", "{6B31F200-073C-46D4-B389-05646E035939}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Logging.Elmah", "ServiceStack.Logging.Elmah\ServiceStack.Logging.Elmah.csproj", "{EE43BF1E-CF97-4215-A5A3-46D1C363F928}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CA7CF53F-9C02-4A5B-B9AF-390B1F7B095C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{CA7CF53F-9C02-4A5B-B9AF-390B1F7B095C}" ProjectSection(SolutionItems) = preProject - .nuget\NuGet.exe = .nuget\NuGet.exe - .nuget\NuGet.targets = .nuget\NuGet.targets + ..\build\build.bat = ..\build\build.bat + ..\build\build.proj = ..\build\build.proj + ..\build\build.tasks = ..\build\build.tasks + ..\NuGet\ServiceStack.Logging.Elmah\servicestack.logging.elmah.nuspec = ..\NuGet\ServiceStack.Logging.Elmah\servicestack.logging.elmah.nuspec + ..\NuGet\ServiceStack.Logging.EntLib5\servicestack.logging.entlib5.nuspec = ..\NuGet\ServiceStack.Logging.EntLib5\servicestack.logging.entlib5.nuspec + ..\NuGet\ServiceStack.Logging.EventLog\servicestack.logging.eventlog.nuspec = ..\NuGet\ServiceStack.Logging.EventLog\servicestack.logging.eventlog.nuspec + ..\NuGet\ServiceStack.Logging.Log4Net\servicestack.logging.log4net.nuspec = ..\NuGet\ServiceStack.Logging.Log4Net\servicestack.logging.log4net.nuspec + ..\NuGet\ServiceStack.Logging.Log4Netv1210\servicestack.logging.log4netv1210.nuspec = ..\NuGet\ServiceStack.Logging.Log4Netv1210\servicestack.logging.log4netv1210.nuspec + ..\NuGet\ServiceStack.Logging.Log4Netv129\servicestack.logging.log4netv129.nuspec = ..\NuGet\ServiceStack.Logging.Log4Netv129\servicestack.logging.log4netv129.nuspec + ..\NuGet\ServiceStack.Logging.NLog\servicestack.logging.nlog.nuspec = ..\NuGet\ServiceStack.Logging.NLog\servicestack.logging.nlog.nuspec EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Logging.Log4Netv1210", "ServiceStack.Logging.Log4Netv1210\ServiceStack.Logging.Log4Netv1210.csproj", "{6A5E3F1C-5F68-4228-805C-2F2374DCC5C0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Logging.EntLib5", "ServiceStack.Logging.EnterpriseLibrary5\ServiceStack.Logging.EntLib5.csproj", "{EDD72ADC-327C-4152-B84B-B48552311534}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Logging.EntLib5", "ServiceStack.Logging.EntLib5\ServiceStack.Logging.EntLib5.csproj", "{EDD72ADC-327C-4152-B84B-B48552311534}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -37,10 +41,6 @@ Global {C44A6E80-326E-4036-8906-62E881F4727D}.Debug|Any CPU.Build.0 = Debug|Any CPU {C44A6E80-326E-4036-8906-62E881F4727D}.Release|Any CPU.ActiveCfg = Release|Any CPU {C44A6E80-326E-4036-8906-62E881F4727D}.Release|Any CPU.Build.0 = Release|Any CPU - {0E1FF796-55CF-4F9B-BA72-484FC9D65065}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E1FF796-55CF-4F9B-BA72-484FC9D65065}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E1FF796-55CF-4F9B-BA72-484FC9D65065}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E1FF796-55CF-4F9B-BA72-484FC9D65065}.Release|Any CPU.Build.0 = Release|Any CPU {DDDA27EC-5855-4E89-9971-C117EC08BDE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DDDA27EC-5855-4E89-9971-C117EC08BDE3}.Debug|Any CPU.Build.0 = Debug|Any CPU {DDDA27EC-5855-4E89-9971-C117EC08BDE3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -53,10 +53,6 @@ Global {EE43BF1E-CF97-4215-A5A3-46D1C363F928}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE43BF1E-CF97-4215-A5A3-46D1C363F928}.Release|Any CPU.ActiveCfg = Release|Any CPU {EE43BF1E-CF97-4215-A5A3-46D1C363F928}.Release|Any CPU.Build.0 = Release|Any CPU - {6A5E3F1C-5F68-4228-805C-2F2374DCC5C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A5E3F1C-5F68-4228-805C-2F2374DCC5C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A5E3F1C-5F68-4228-805C-2F2374DCC5C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A5E3F1C-5F68-4228-805C-2F2374DCC5C0}.Release|Any CPU.Build.0 = Release|Any CPU {EDD72ADC-327C-4152-B84B-B48552311534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EDD72ADC-327C-4152-B84B-B48552311534}.Debug|Any CPU.Build.0 = Debug|Any CPU {EDD72ADC-327C-4152-B84B-B48552311534}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/tests/ServiceStack.Logging.Tests/ServiceStack.Logging.Tests.csproj b/tests/ServiceStack.Logging.Tests/ServiceStack.Logging.Tests.csproj index 0f4ed61..889f9b7 100644 --- a/tests/ServiceStack.Logging.Tests/ServiceStack.Logging.Tests.csproj +++ b/tests/ServiceStack.Logging.Tests/ServiceStack.Logging.Tests.csproj @@ -24,7 +24,7 @@ false - v3.5 + v4.0 publish\ true Disk @@ -100,17 +100,17 @@ ..\..\src\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll - + False - ..\..\src\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Common.dll + ..\..\src\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Common.dll - + False - ..\..\src\packages\ServiceStack.Common.3.9.44\lib\net35\ServiceStack.Interfaces.dll + ..\..\src\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Interfaces.dll - + False - ..\..\src\packages\ServiceStack.Text.3.9.44\lib\net35\ServiceStack.Text.dll + ..\..\src\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll @@ -168,8 +168,8 @@ {EE43BF1E-CF97-4215-A5A3-46D1C363F928} ServiceStack.Logging.Elmah - - {EDD72ADC-327C-4152-B84B-B48552311534} + + {edd72adc-327c-4152-b84b-b48552311534} ServiceStack.Logging.EntLib5 diff --git a/tests/ServiceStack.Logging.Tests/packages.config b/tests/ServiceStack.Logging.Tests/packages.config index e7993c8..1c6550b 100644 --- a/tests/ServiceStack.Logging.Tests/packages.config +++ b/tests/ServiceStack.Logging.Tests/packages.config @@ -7,8 +7,8 @@ - - + + \ No newline at end of file