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

Commit

Permalink
Renaming Microsoft.Framework.* -> Microsoft.Extensions.*
Browse files Browse the repository at this point in the history
  • Loading branch information
pranavkm committed Oct 3, 2015
1 parent 49f0855 commit 7ec1ceb
Show file tree
Hide file tree
Showing 81 changed files with 140 additions and 140 deletions.
18 changes: 9 additions & 9 deletions Logging.sln
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Logging", "src\Microsoft.Framework.Logging\Microsoft.Framework.Logging.xproj", "{19D1B6C5-8A62-4387-8816-C54874D1DF5F}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Logging", "src\Microsoft.Extensions.Logging\Microsoft.Extensions.Logging.xproj", "{19D1B6C5-8A62-4387-8816-C54874D1DF5F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{09920C51-6220-4D8D-94DC-E70C13446187}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Logging.Test", "test\Microsoft.Framework.Logging.Test\Microsoft.Framework.Logging.Test.xproj", "{96B1D6A8-7E40-43C7-813F-898DC8192DDE}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Logging.Test", "test\Microsoft.Extensions.Logging.Test\Microsoft.Extensions.Logging.Test.xproj", "{96B1D6A8-7E40-43C7-813F-898DC8192DDE}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Logging.Abstractions", "src\Microsoft.Framework.Logging.Abstractions\Microsoft.Framework.Logging.Abstractions.xproj", "{8221FA95-4B1A-44BF-925F-8AC1A317CC7C}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Logging.Abstractions", "src\Microsoft.Extensions.Logging.Abstractions\Microsoft.Extensions.Logging.Abstractions.xproj", "{8221FA95-4B1A-44BF-925F-8AC1A317CC7C}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Logging.NLog", "src\Microsoft.Framework.Logging.NLog\Microsoft.Framework.Logging.NLog.xproj", "{718CBC9D-1E65-447D-A64A-7AC467FB5D6A}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Logging.NLog", "src\Microsoft.Extensions.Logging.NLog\Microsoft.Extensions.Logging.NLog.xproj", "{718CBC9D-1E65-447D-A64A-7AC467FB5D6A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8C1F5D80-88EA-4961-84DC-7AC6E13951F4}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SampleApp", "samples\SampleApp\SampleApp.xproj", "{550E0247-0BDD-4016-A29B-250F075686FD}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Logging.Console", "src\Microsoft.Framework.Logging.Console\Microsoft.Framework.Logging.Console.xproj", "{75A4DE6D-BBAA-4D59-829D-94009E759A18}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Logging.Console", "src\Microsoft.Extensions.Logging.Console\Microsoft.Extensions.Logging.Console.xproj", "{75A4DE6D-BBAA-4D59-829D-94009E759A18}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{699DB330-0095-4266-B7B0-3EAB3710CA49}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Logging.TraceSource", "src\Microsoft.Framework.Logging.TraceSource\Microsoft.Framework.Logging.TraceSource.xproj", "{1A3EB66F-9E64-4676-852F-24995549ED8A}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Logging.TraceSource", "src\Microsoft.Extensions.Logging.TraceSource\Microsoft.Extensions.Logging.TraceSource.xproj", "{1A3EB66F-9E64-4676-852F-24995549ED8A}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Logging.Debug", "src\Microsoft.Framework.Logging.Debug\Microsoft.Framework.Logging.Debug.xproj", "{FFEDC225-D5BD-44E0-B7A6-A98FCFECC694}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Logging.Debug", "src\Microsoft.Extensions.Logging.Debug\Microsoft.Extensions.Logging.Debug.xproj", "{FFEDC225-D5BD-44E0-B7A6-A98FCFECC694}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Logging.EventLog", "src\Microsoft.Framework.Logging.EventLog\Microsoft.Framework.Logging.EventLog.xproj", "{5D211C4A-6421-48F8-8AF9-D3BDC7DECD97}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Logging.EventLog", "src\Microsoft.Extensions.Logging.EventLog\Microsoft.Extensions.Logging.EventLog.xproj", "{5D211C4A-6421-48F8-8AF9-D3BDC7DECD97}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
14 changes: 7 additions & 7 deletions NuGetPackageVerifier.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
"StrictSemanticVersionValidationRule"
],
"packages": {
"Microsoft.Framework.Logging": { },
"Microsoft.Framework.Logging.Abstractions": { },
"Microsoft.Framework.Logging.Console": { },
"Microsoft.Framework.Logging.Debug": { },
"Microsoft.Framework.Logging.EventLog": { },
"Microsoft.Framework.Logging.TraceSource": { }
"Microsoft.Extensions.Logging": { },
"Microsoft.Extensions.Logging.Abstractions": { },
"Microsoft.Extensions.Logging.Console": { },
"Microsoft.Extensions.Logging.Debug": { },
"Microsoft.Extensions.Logging.EventLog": { },
"Microsoft.Extensions.Logging.TraceSource": { }
}
},
"adx-nonshipping": {
"rules": [],
"packages": {
"Microsoft.Framework.Logging.NLog": { }
"Microsoft.Extensions.Logging.NLog": { }
}
},
"Default": { // Rules to run for packages not listed in any other set.
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Logging
=======

**Package**: `Microsoft.Framework.Logging`
NuGet (`master`): [![](http://img.shields.io/nuget/v/Microsoft.Framework.Logging.svg?style=flat-square)](http://www.nuget.org/packages/Microsoft.Framework.Logging) [![](http://img.shields.io/nuget/dt/Microsoft.Framework.Logging.svg?style=flat-square)](http://www.nuget.org/packages/Microsoft.Framework.Logging)
MyGet (`dev`): [![](http://img.shields.io/myget/aspnetvnext/v/Microsoft.Framework.Logging.svg?style=flat-square)](https://www.myget.org/gallery/aspnetvnext)
**Package**: `Microsoft.Extensions.Logging`
NuGet (`master`): [![](http://img.shields.io/nuget/v/Microsoft.Extensions.Logging.svg?style=flat-square)](http://www.nuget.org/packages/Microsoft.Extensions.Logging) [![](http://img.shields.io/nuget/dt/Microsoft.Extensions.Logging.svg?style=flat-square)](http://www.nuget.org/packages/Microsoft.Extensions.Logging)
MyGet (`dev`): [![](http://img.shields.io/myget/aspnetvnext/v/Microsoft.Extensions.Logging.svg?style=flat-square)](https://www.myget.org/gallery/aspnetvnext)

AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/i0hdtuq4m6pwfp2s/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Logging/branch/dev)
Travis: [![Travis](https://travis-ci.org/aspnet/Logging.svg?branch=dev)](https://travis-ci.org/aspnet/Logging)
Expand All @@ -14,7 +14,7 @@ This project is part of ASP.NET 5. You can find samples, documentation and getti

### Providers

Community projects adapt _Microsoft.Framework.Logging_ for use with different back-ends.
Community projects adapt _Microsoft.Extensions.Logging_ for use with different back-ends.

* [Serilog](https://github.com/serilog/serilog-framework-logging) - provider for the Serilog library
* [elmah.io](https://github.com/elmahio/Elmah.Io.Framework.Logging) - provider for the elmah.io service
Expand Down
6 changes: 3 additions & 3 deletions samples/SampleApp/Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using Microsoft.Framework.Logging;
using ILogger = Microsoft.Framework.Logging.ILogger;
using System;
using Microsoft.Extensions.Logging;
using ILogger = Microsoft.Extensions.Logging.ILogger;

namespace SampleApp
{
Expand Down
8 changes: 4 additions & 4 deletions samples/SampleApp/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"SampleApp": "SampleApp"
},
"dependencies": {
"Microsoft.Framework.Logging": "1.0.0-*",
"Microsoft.Framework.Logging.Console": "1.0.0-*"
"Microsoft.Extensions.Logging": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*"
},
"frameworks": {
"dnx451": {
"dependencies": {
"Microsoft.Framework.Logging.EventLog": "1.0.0-*",
"Microsoft.Framework.Logging.NLog": "1.0.0-*"
"Microsoft.Extensions.Logging.EventLog": "1.0.0-*",
"Microsoft.Extensions.Logging.NLog": "1.0.0-*"
}
},
"dnxcore50": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.Collections.Generic;

namespace Microsoft.Framework.Logging
namespace Microsoft.Extensions.Logging
{
public interface ILogValues
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;

namespace Microsoft.Framework.Logging
namespace Microsoft.Extensions.Logging
{
/// <summary>
/// A generic interface for logging.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;

namespace Microsoft.Framework.Logging
namespace Microsoft.Extensions.Logging
{
/// <summary>
/// Used to create logger instances of the given name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;

namespace Microsoft.Framework.Logging
namespace Microsoft.Extensions.Logging
{
/// <summary>
/// A generic interface for logging where the category name is taken from the specified TCategoryName.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;

namespace Microsoft.Framework.Logging
namespace Microsoft.Extensions.Logging
{
/// <summary>
/// Used to create logger instances of the given name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Collections.Concurrent;
using System.Collections.Generic;

namespace Microsoft.Framework.Logging.Internal
namespace Microsoft.Extensions.Logging.Internal
{
/// <summary>
/// LogValues to enable formatting options supported by <see cref="string.Format"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Globalization;
using System.Text;

namespace Microsoft.Framework.Logging.Internal
namespace Microsoft.Extensions.Logging.Internal
{
/// <summary>
/// Formatter to convert the named format items like {NamedformatItem} to <see cref="string.Format"/> format.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Microsoft.Framework.Internal;
using Microsoft.Extensions.Internal;

namespace Microsoft.Framework.Logging
namespace Microsoft.Extensions.Logging
{
/// <summary>
/// Formatters for common logging scenarios.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

namespace Microsoft.Framework.Logging
namespace Microsoft.Extensions.Logging
{
public enum LogLevel
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

using System;
using System.Globalization;
using Microsoft.Framework.Internal;
using Microsoft.Framework.Logging.Internal;
using Microsoft.Extensions.Internal;
using Microsoft.Extensions.Logging.Internal;

namespace Microsoft.Framework.Logging
namespace Microsoft.Extensions.Logging
{
/// <summary>
/// ILogger extension methods for common scenarios.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using Microsoft.Framework.Internal;
using Microsoft.Extensions.Internal;

namespace Microsoft.Framework.Logging
namespace Microsoft.Extensions.Logging
{
/// <summary>
/// ILoggerFactory extension methods for common scenarios.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
},
"description": "Logging interface definitions.",
"dependencies": {
"Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" },
"Microsoft.Framework.TypeNameHelper.Sources": { "type": "build", "version": "1.0.0-*" }
"Microsoft.Extensions.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" },
"Microsoft.Extensions.TypeNameHelper.Sources": { "type": "build", "version": "1.0.0-*" }
},
"frameworks": {
"net45": { },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
using System;
using System.Collections;
using System.Text;
using Microsoft.Framework.Logging.Console.Internal;
using Microsoft.Extensions.Logging.Console.Internal;

namespace Microsoft.Framework.Logging.Console
namespace Microsoft.Extensions.Logging.Console
{
public class ConsoleLogger : ILogger
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using Microsoft.Framework.Logging.Console;
using Microsoft.Extensions.Logging.Console;

namespace Microsoft.Framework.Logging
namespace Microsoft.Extensions.Logging
{
public static class ConsoleLoggerExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;

namespace Microsoft.Framework.Logging.Console
namespace Microsoft.Extensions.Logging.Console
{
public class ConsoleLoggerProvider : ILoggerProvider
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System;

namespace Microsoft.Framework.Logging.Console.Internal
namespace Microsoft.Extensions.Logging.Console.Internal
{
public interface IConsole
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

using System;
using System.IO;
using Microsoft.Framework.Logging.Console.Internal;
using Microsoft.Extensions.Logging.Console.Internal;

namespace Microsoft.Framework.Logging.Console
namespace Microsoft.Extensions.Logging.Console
{
public class LogConsole : IConsole
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"description": "Console logger implementation.",
"dependencies": {
"Microsoft.Framework.Logging.Abstractions": "1.0.0-*"
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*"
},
"frameworks": {
"net45": { },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. 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;

namespace Microsoft.Framework.Logging.Debug
namespace Microsoft.Extensions.Logging.Debug
{
/// <summary>
/// A logger that writes messages in the debug output window only when a debugger is attached.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

// We need to define the DEBUG symbol because we want the logger
// to work even when this package is compiled on release. Otherwise,
// the call to Debug.WriteLine will not be in the release binary
#define DEBUG

namespace Microsoft.Framework.Logging.Debug
namespace Microsoft.Extensions.Logging.Debug
{
public partial class DebugLogger
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using Microsoft.Framework.Logging.Debug;
using Microsoft.Extensions.Logging.Debug;

namespace Microsoft.Framework.Logging
namespace Microsoft.Extensions.Logging
{
/// <summary>
/// Extension methods for the <see cref="ILoggerFactory"/> class.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. 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.Debug
namespace Microsoft.Extensions.Logging.Debug
{
/// <summary>
/// The provider for the <see cref="DebugLogger"/>.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
Expand All @@ -8,7 +8,7 @@
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>ffedc225-d5bd-44e0-b7a6-a98fcfecc694</ProjectGuid>
<RootNamespace>Microsoft.Framework.Logging.Debug</RootNamespace>
<RootNamespace>Microsoft.Extensions.Logging.Debug</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"url": "git://github.com/aspnet/logging"
},
"dependencies": {
"Microsoft.Framework.Logging.Abstractions": "1.0.0-*"
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*"
},

"frameworks": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. 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;

namespace Microsoft.Framework.Logging.EventLog
namespace Microsoft.Extensions.Logging.EventLog
{
/// <summary>
/// A logger that writes messages to Windows Event Log.
Expand Down
Loading

0 comments on commit 7ec1ceb

Please sign in to comment.