Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Fix license headers, change to Common NotNull #145

Merged
merged 1 commit into from
Mar 5, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Microsoft.Framework.Logging.Console/Internal/IConsole.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
5 changes: 4 additions & 1 deletion src/Microsoft.Framework.Logging.Console/LogConsole.cs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
5 changes: 4 additions & 1 deletion src/Microsoft.Framework.Logging.Interfaces/ILogValues.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
5 changes: 4 additions & 1 deletion src/Microsoft.Framework.Logging.Interfaces/LogFormatter.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 0 additions & 12 deletions src/Microsoft.Framework.Logging.Serilog/NotNullAttribute.cs

This file was deleted.

5 changes: 2 additions & 3 deletions src/Microsoft.Framework.Logging.Serilog/SerilogLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.Framework.Logging.Serilog/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down