diff --git a/src/Microsoft.Framework.Logging.Console/Internal/IConsole.cs b/src/Microsoft.Framework.Logging.Console/Internal/IConsole.cs index 5b2b6902..6ee9fba1 100644 --- a/src/Microsoft.Framework.Logging.Console/Internal/IConsole.cs +++ b/src/Microsoft.Framework.Logging.Console/Internal/IConsole.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; namespace Microsoft.Framework.Logging.Console.Internal { diff --git a/src/Microsoft.Framework.Logging.Console/LogConsole.cs b/src/Microsoft.Framework.Logging.Console/LogConsole.cs index b1fa8864..669ef329 100644 --- a/src/Microsoft.Framework.Logging.Console/LogConsole.cs +++ b/src/Microsoft.Framework.Logging.Console/LogConsole.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; using System.IO; using Microsoft.Framework.Logging.Console.Internal; diff --git a/src/Microsoft.Framework.Logging.Interfaces/ILogValues.cs b/src/Microsoft.Framework.Logging.Interfaces/ILogValues.cs index 8f111441..5f9fad7b 100644 --- a/src/Microsoft.Framework.Logging.Interfaces/ILogValues.cs +++ b/src/Microsoft.Framework.Logging.Interfaces/ILogValues.cs @@ -1,4 +1,7 @@ -using System.Collections.Generic; +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Collections.Generic; namespace Microsoft.Framework.Logging { diff --git a/src/Microsoft.Framework.Logging.Interfaces/LogFormatter.cs b/src/Microsoft.Framework.Logging.Interfaces/LogFormatter.cs index dcd573fb..093ed1fb 100644 --- a/src/Microsoft.Framework.Logging.Interfaces/LogFormatter.cs +++ b/src/Microsoft.Framework.Logging.Interfaces/LogFormatter.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/src/Microsoft.Framework.Logging.Serilog/NotNullAttribute.cs b/src/Microsoft.Framework.Logging.Serilog/NotNullAttribute.cs deleted file mode 100644 index d92c1117..00000000 --- a/src/Microsoft.Framework.Logging.Serilog/NotNullAttribute.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; - -namespace JetBrains.Annotations -{ - [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] - internal sealed class NotNullAttribute : Attribute - { - } -} \ No newline at end of file diff --git a/src/Microsoft.Framework.Logging.Serilog/SerilogLogger.cs b/src/Microsoft.Framework.Logging.Serilog/SerilogLogger.cs index 8f3012d3..57e08d43 100644 --- a/src/Microsoft.Framework.Logging.Serilog/SerilogLogger.cs +++ b/src/Microsoft.Framework.Logging.Serilog/SerilogLogger.cs @@ -2,10 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using JetBrains.Annotations; -using Serilog.Events; +using Microsoft.Framework.Internal; using Serilog.Core; - +using Serilog.Events; using SLogger = Serilog.ILogger; namespace Microsoft.Framework.Logging.Serilog diff --git a/src/Microsoft.Framework.Logging.Serilog/SerilogLoggerFactoryExtensions.cs b/src/Microsoft.Framework.Logging.Serilog/SerilogLoggerFactoryExtensions.cs index 537366ed..d95a2b7a 100644 --- a/src/Microsoft.Framework.Logging.Serilog/SerilogLoggerFactoryExtensions.cs +++ b/src/Microsoft.Framework.Logging.Serilog/SerilogLoggerFactoryExtensions.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Serilog; +using Microsoft.Framework.Internal; using Microsoft.Framework.Logging.Serilog; -using JetBrains.Annotations; +using Serilog; namespace Microsoft.Framework.Logging { diff --git a/src/Microsoft.Framework.Logging.Serilog/SerilogLoggerProvider.cs b/src/Microsoft.Framework.Logging.Serilog/SerilogLoggerProvider.cs index 078ec6d2..eb531581 100644 --- a/src/Microsoft.Framework.Logging.Serilog/SerilogLoggerProvider.cs +++ b/src/Microsoft.Framework.Logging.Serilog/SerilogLoggerProvider.cs @@ -5,10 +5,10 @@ #if ASPNET50 using System.Runtime.Remoting; using System.Runtime.Remoting.Messaging; +using Microsoft.Framework.Internal; #else using System.Threading; #endif -using JetBrains.Annotations; using Serilog.Core; using Serilog.Events; diff --git a/src/Microsoft.Framework.Logging.Serilog/project.json b/src/Microsoft.Framework.Logging.Serilog/project.json index c86371a7..5e86986a 100644 --- a/src/Microsoft.Framework.Logging.Serilog/project.json +++ b/src/Microsoft.Framework.Logging.Serilog/project.json @@ -2,6 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.Framework.Logging.Interfaces": "1.0.0-*", + "Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }, "Serilog": "1.4.14" }, "frameworks": { diff --git a/src/Microsoft.Framework.Logging.TraceSource/TraceSourceFactoryExtensions.cs b/src/Microsoft.Framework.Logging.TraceSource/TraceSourceFactoryExtensions.cs index 6597cec4..bd699360 100644 --- a/src/Microsoft.Framework.Logging.TraceSource/TraceSourceFactoryExtensions.cs +++ b/src/Microsoft.Framework.Logging.TraceSource/TraceSourceFactoryExtensions.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; using System.Diagnostics; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.Framework.Logging/LoggingServiceCollectionExtensions.cs b/src/Microsoft.Framework.Logging/LoggingServiceCollectionExtensions.cs index 6a69286c..5f2c4c25 100644 --- a/src/Microsoft.Framework.Logging/LoggingServiceCollectionExtensions.cs +++ b/src/Microsoft.Framework.Logging/LoggingServiceCollectionExtensions.cs @@ -1,4 +1,7 @@ -using Microsoft.Framework.Logging; +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.Framework.Logging; namespace Microsoft.Framework.DependencyInjection {