Merge pull request #339 from piotrpMSFT/piotrp/ProjectModelNamespace

Fix Microsoft.DotNet.ProjectModel namespace
This commit is contained in:
Piotr Puszkiewicz 2015-11-27 20:28:15 -08:00
commit bfc4d46bee
57 changed files with 87 additions and 87 deletions

View file

@ -4,7 +4,7 @@ using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using Microsoft.DotNet.Cli.Utils.CommandParsing;
using Microsoft.Extensions.ProjectModel;
using Microsoft.DotNet.ProjectModel;
namespace Microsoft.DotNet.Cli.Utils
{

View file

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.CommandLine;
using System.Linq;
using Microsoft.Extensions.ProjectModel;
using Microsoft.DotNet.ProjectModel;
namespace Microsoft.DotNet.Cli.Compiler.Common
{

View file

@ -12,7 +12,7 @@ using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.Host.Mef;
using Microsoft.CodeAnalysis.Text;
using Microsoft.Extensions.ProjectModel;
using Microsoft.DotNet.ProjectModel;
using NuGet.Frameworks;
namespace Microsoft.DotNet.ProjectModel.Workspaces

View file

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public class CommonCompilerOptions
{

View file

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace Microsoft.Extensions.ProjectModel.Compilation
namespace Microsoft.DotNet.ProjectModel.Compilation
{
public struct LibraryAsset
{

View file

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
namespace Microsoft.Extensions.ProjectModel.Compilation
namespace Microsoft.DotNet.ProjectModel.Compilation
{
[DebuggerDisplay("{DebuggerDisplay,nq}")]
public class LibraryExport

View file

@ -6,12 +6,12 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.Extensions.ProjectModel.Resolution;
using Microsoft.Extensions.ProjectModel.Utilities;
using Microsoft.DotNet.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Resolution;
using Microsoft.DotNet.ProjectModel.Utilities;
using NuGet.Frameworks;
namespace Microsoft.Extensions.ProjectModel.Compilation
namespace Microsoft.DotNet.ProjectModel.Compilation
{
public class LibraryExporter
{

View file

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
/// <summary>
/// Represents a single diagnostic message, such as a compilation error or a project.json parsing error.

View file

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
/// <summary>
/// Specifies the severity of a <see cref="DiagnosticMessage"/>.

View file

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public class EnvironmentNames
{

View file

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public static partial class ErrorCodes
{

View file

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public static partial class ErrorCodes
{

View file

@ -4,7 +4,7 @@
using System;
using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public sealed class FileFormatException : Exception
{

View file

@ -5,7 +5,7 @@ using System.Collections.Generic;
using System.IO;
using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Extensions.ProjectModel.Files
namespace Microsoft.DotNet.ProjectModel.Files
{
internal static class NamedResourceReader
{

View file

@ -4,7 +4,7 @@
using System.Linq;
using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Extensions.ProjectModel.Files
namespace Microsoft.DotNet.ProjectModel.Files
{
public class PackIncludeEntry
{

View file

@ -8,7 +8,7 @@ using System.Linq;
using Microsoft.Extensions.FileSystemGlobbing;
using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Extensions.ProjectModel.Files
namespace Microsoft.DotNet.ProjectModel.Files
{
public class PatternGroup
{

View file

@ -7,7 +7,7 @@ using System.IO;
using System.Linq;
using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Extensions.ProjectModel.Files
namespace Microsoft.DotNet.ProjectModel.Files
{
internal static class PatternsCollectionHelper
{

View file

@ -7,7 +7,7 @@ using System.Linq;
using System.Threading;
using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Extensions.ProjectModel.Files
namespace Microsoft.DotNet.ProjectModel.Files
{
public class ProjectFilesCollection
{

View file

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.IO;
using Microsoft.Extensions.JsonParser.Sources;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public class GlobalSettings
{

View file

@ -3,7 +3,7 @@
using System;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
public struct LibraryDependencyType
{

View file

@ -3,7 +3,7 @@
using System;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
[Flags]
public enum LibraryDependencyTypeFlag

View file

@ -6,7 +6,7 @@ using Microsoft.Extensions.Internal;
using NuGet;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
public struct LibraryIdentity : IEquatable<LibraryIdentity>
{

View file

@ -6,7 +6,7 @@ using System.Text;
using Microsoft.Extensions.Internal;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
public struct LibraryRange : IEquatable<LibraryRange>
{

View file

@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
public struct LibraryType : IEquatable<LibraryType>
{

View file

@ -5,10 +5,10 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Microsoft.Extensions.ProjectModel.Utilities;
using Microsoft.DotNet.ProjectModel.Utilities;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
public class LockFile
{

View file

@ -3,7 +3,7 @@
using System.Collections.Generic;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
public class LockFileItem
{

View file

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
public class LockFileLookup
{

View file

@ -4,7 +4,7 @@
using System.Collections.Generic;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
public class LockFilePackageLibrary
{

View file

@ -3,7 +3,7 @@
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
public class LockFileProjectLibrary
{

View file

@ -5,13 +5,13 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Microsoft.DotNet.ProjectModel.Utilities;
using Microsoft.Extensions.JsonParser.Sources;
using Microsoft.Extensions.ProjectModel.Utilities;
using NuGet.Frameworks;
using NuGet.Packaging.Core;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
internal static class LockFileReader
{

View file

@ -4,7 +4,7 @@
using System.Collections.Generic;
using NuGet.Frameworks;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
public class LockFileTarget
{

View file

@ -7,7 +7,7 @@ using NuGet.Frameworks;
using NuGet.Packaging.Core;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Graph
namespace Microsoft.DotNet.ProjectModel.Graph
{
public class LockFileTargetLibrary
{

View file

@ -4,11 +4,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.DotNet.ProjectModel.Graph;
using Microsoft.Extensions.Internal;
using Microsoft.Extensions.ProjectModel.Graph;
using NuGet.Frameworks;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
/// <summary>
/// Represents the result of resolving the library

View file

@ -2,9 +2,9 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Generic;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Graph;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public class PackageDescription : LibraryDescription
{

View file

@ -4,12 +4,12 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.Extensions.ProjectModel.Files;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Files;
using Microsoft.DotNet.ProjectModel.Graph;
using NuGet.Frameworks;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public class Project
{

View file

@ -5,11 +5,11 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Microsoft.Extensions.ProjectModel.Compilation;
using Microsoft.Extensions.ProjectModel.Resolution;
using Microsoft.DotNet.ProjectModel.Compilation;
using Microsoft.DotNet.ProjectModel.Resolution;
using NuGet.Frameworks;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
// NOTE(anurse): Copied from ApplicationHostContext in DNX. This name seemed more appropriate for this :)
public class ProjectContext

View file

@ -6,12 +6,12 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using Microsoft.DotNet.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Resolution;
using Microsoft.Extensions.Internal;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.Extensions.ProjectModel.Resolution;
using NuGet.Frameworks;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public class ProjectContextBuilder
{

View file

@ -3,9 +3,9 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Graph;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public class ProjectDescription : LibraryDescription
{

View file

@ -4,7 +4,7 @@
using System.Collections.Generic;
using NuGet.Frameworks;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public class ProjectFileDependencyGroup
{

View file

@ -5,14 +5,14 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Microsoft.DotNet.ProjectModel.Files;
using Microsoft.DotNet.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Utilities;
using Microsoft.Extensions.JsonParser.Sources;
using Microsoft.Extensions.ProjectModel.Files;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.Extensions.ProjectModel.Utilities;
using NuGet.Frameworks;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public class ProjectReader
{

View file

@ -3,7 +3,7 @@
using System.IO;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public static class ProjectRootResolver
{

View file

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
namespace Microsoft.Extensions.ProjectModel.Resolution
namespace Microsoft.DotNet.ProjectModel.Resolution
{
internal class FrameworkInformation
{

View file

@ -7,10 +7,10 @@ using System.IO;
using System.Linq;
using System.Runtime.Versioning;
using System.Xml.Linq;
using Microsoft.Extensions.ProjectModel.Utilities;
using Microsoft.DotNet.ProjectModel.Utilities;
using NuGet.Frameworks;
namespace Microsoft.Extensions.ProjectModel.Resolution
namespace Microsoft.DotNet.ProjectModel.Resolution
{
public class FrameworkReferenceResolver
{

View file

@ -3,11 +3,11 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.Extensions.ProjectModel.Utilities;
using Microsoft.DotNet.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Utilities;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Resolution
namespace Microsoft.DotNet.ProjectModel.Resolution
{
public class LibraryManager
{

View file

@ -5,11 +5,11 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Graph;
using NuGet.Packaging;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Resolution
namespace Microsoft.DotNet.ProjectModel.Resolution
{
public class PackageDependencyProvider
{

View file

@ -5,11 +5,11 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Versioning;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Graph;
using NuGet;
using NuGet.Frameworks;
namespace Microsoft.Extensions.ProjectModel.Resolution
namespace Microsoft.DotNet.ProjectModel.Resolution
{
public class ProjectDependencyProvider
{

View file

@ -4,12 +4,12 @@
using System;
using System.Linq;
using System.Runtime.Versioning;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Graph;
using NuGet;
using NuGet.Frameworks;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Resolution
namespace Microsoft.DotNet.ProjectModel.Resolution
{
public class ReferenceAssemblyDependencyResolver
{

View file

@ -2,10 +2,10 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Linq;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Graph;
using NuGet.Frameworks;
namespace Microsoft.Extensions.ProjectModel.Resolution
namespace Microsoft.DotNet.ProjectModel.Resolution
{
public static class UnresolvedDependencyProvider
{

View file

@ -3,7 +3,7 @@
using System.Runtime.InteropServices;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public static class RuntimeIdentifier
{

View file

@ -2,10 +2,10 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Generic;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Graph;
using NuGet.Frameworks;
namespace Microsoft.Extensions.ProjectModel
namespace Microsoft.DotNet.ProjectModel
{
public class TargetFrameworkInformation
{

View file

@ -5,7 +5,7 @@ using System;
using System.IO;
using System.Runtime.InteropServices;
namespace Microsoft.Extensions.ProjectModel.Utilities
namespace Microsoft.DotNet.ProjectModel.Utilities
{
internal static class PathUtility
{

View file

@ -6,7 +6,7 @@ using System.Runtime.Loader;
using System.Text;
using NuGet.Versioning;
namespace Microsoft.Extensions.ProjectModel.Utilities
namespace Microsoft.DotNet.ProjectModel.Utilities
{
public static class VersionUtility
{

View file

@ -12,7 +12,7 @@ using System.Text;
using Microsoft.DotNet.Cli.Compiler.Common;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.Extensions.ProjectModel;
using Microsoft.DotNet.ProjectModel;
namespace Microsoft.DotNet.Tools.Compiler.Csc
{

View file

@ -11,8 +11,8 @@ using Microsoft.Dnx.Runtime.Common.CommandLine;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Cli.Compiler.Common;
using Microsoft.DotNet.Tools.Common;
using Microsoft.Extensions.ProjectModel;
using Microsoft.Extensions.ProjectModel.Compilation;
using Microsoft.DotNet.ProjectModel;
using Microsoft.DotNet.ProjectModel.Compilation;
using NuGet.Frameworks;
namespace Microsoft.DotNet.Tools.Compiler

View file

@ -7,18 +7,18 @@ using System.IO;
using System.Linq;
using System.Text;
using Microsoft.Extensions.ProjectModel;
using Microsoft.DotNet.ProjectModel;
using NuGet;
using Microsoft.Dnx.Runtime.Common.CommandLine;
using Microsoft.DotNet.Cli.Utils;
using NuGet.Packaging.Core;
using Microsoft.Extensions.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Graph;
using NuGet.Versioning;
using NuGet.Frameworks;
using Microsoft.Extensions.ProjectModel.Files;
using Microsoft.DotNet.ProjectModel.Files;
using Microsoft.Extensions.FileSystemGlobbing;
using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
using Microsoft.Extensions.ProjectModel.Utilities;
using Microsoft.DotNet.ProjectModel.Utilities;
namespace Microsoft.DotNet.Tools.Compiler
{

View file

@ -8,8 +8,8 @@ using System.Linq;
using System.Runtime.InteropServices;
using Microsoft.Dnx.Runtime.Common.CommandLine;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.Extensions.ProjectModel;
using Microsoft.Extensions.ProjectModel.Compilation;
using Microsoft.DotNet.ProjectModel;
using Microsoft.DotNet.ProjectModel.Compilation;
using NuGet.Frameworks;
namespace Microsoft.DotNet.Tools.Publish

View file

@ -7,7 +7,7 @@ using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.Extensions.ProjectModel;
using Microsoft.DotNet.ProjectModel;
using NuGet.Frameworks;
namespace Microsoft.DotNet.Tools.Run