From 1918f9c30ee48876915eea94144cc1a2ed2b1966 Mon Sep 17 00:00:00 2001 From: lianwei Date: Sat, 27 Jun 2015 20:32:31 +0800 Subject: [PATCH] Resolve Ken's comments, rename Namespace for docfx project to Microsoft.DocAsCode while keeping AssemblyName as docfx --- .gitignore | 10 ---------- .../Microsoft.DocAsCode.EntityModel/Constants.cs | 6 ------ src/BackEnd/docfx/ConfigModel.cs | 2 +- src/BackEnd/docfx/ConsoleExtension.cs | 2 +- src/BackEnd/docfx/Glob/ConfigModelHelper.cs | 2 +- src/BackEnd/docfx/Glob/GlobUtility.cs | 16 ++++++++-------- src/BackEnd/docfx/HelpTextGenerator.cs | 2 +- src/BackEnd/docfx/Options.cs | 2 +- src/BackEnd/docfx/OptionsAttributes.cs | 2 +- src/BackEnd/docfx/Program.cs | 2 +- src/BackEnd/docfx/Properties/AssemblyInfo.cs | 2 +- src/BackEnd/docfx/SubCommands/HelpSubCommand.cs | 2 +- src/BackEnd/docfx/SubCommands/ISubCommand.cs | 2 +- src/BackEnd/docfx/SubCommands/InitSubCommand.cs | 2 +- .../docfx/SubCommands/MetadataSubCommand.cs | 2 +- .../docfx/SubCommands/SubCommandFactory.cs | 2 +- .../docfx/SubCommands/WebsiteSubCommand.cs | 2 +- src/BackEnd/docfx/docfx.csproj | 1 + 18 files changed, 23 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 790aece0b4f..cdf8c0634d0 100644 --- a/.gitignore +++ b/.gitignore @@ -33,14 +33,4 @@ log.txt debugSettings.json launchSettings.json project.lock.json -nuget.exe *.sublime-workspace - - -############################ -# wix intermediate files # -############################ -Installer/obj/ -Installer/*.wixpdb -Installer/*.wixobj -Installer/*.msi diff --git a/src/BackEnd/Microsoft.DocAsCode.EntityModel/Constants.cs b/src/BackEnd/Microsoft.DocAsCode.EntityModel/Constants.cs index e23f32b4a6f..0261708c9cf 100644 --- a/src/BackEnd/Microsoft.DocAsCode.EntityModel/Constants.cs +++ b/src/BackEnd/Microsoft.DocAsCode.EntityModel/Constants.cs @@ -1,11 +1,5 @@ namespace Microsoft.DocAsCode.EntityModel { - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - using System.Threading.Tasks; - public static class Constants { public const string YamlExtension = ".yml"; diff --git a/src/BackEnd/docfx/ConfigModel.cs b/src/BackEnd/docfx/ConfigModel.cs index ecd83ef9787..525ca157393 100644 --- a/src/BackEnd/docfx/ConfigModel.cs +++ b/src/BackEnd/docfx/ConfigModel.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using Microsoft.DocAsCode.EntityModel; using Newtonsoft.Json; diff --git a/src/BackEnd/docfx/ConsoleExtension.cs b/src/BackEnd/docfx/ConsoleExtension.cs index f1417206890..c3c1b5b99d8 100644 --- a/src/BackEnd/docfx/ConsoleExtension.cs +++ b/src/BackEnd/docfx/ConsoleExtension.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using Microsoft.DocAsCode.EntityModel; using Newtonsoft.Json; diff --git a/src/BackEnd/docfx/Glob/ConfigModelHelper.cs b/src/BackEnd/docfx/Glob/ConfigModelHelper.cs index 0e687f996a7..6986bfbc502 100644 --- a/src/BackEnd/docfx/Glob/ConfigModelHelper.cs +++ b/src/BackEnd/docfx/Glob/ConfigModelHelper.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using Microsoft.DocAsCode.EntityModel; using Microsoft.DocAsCode.Utility; diff --git a/src/BackEnd/docfx/Glob/GlobUtility.cs b/src/BackEnd/docfx/Glob/GlobUtility.cs index 7df0feae2d1..4837c1e7808 100644 --- a/src/BackEnd/docfx/Glob/GlobUtility.cs +++ b/src/BackEnd/docfx/Glob/GlobUtility.cs @@ -1,12 +1,12 @@ -using Microsoft.DocAsCode.EntityModel; -using Microsoft.DocAsCode.Utility; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; - -namespace docfx +namespace Microsoft.DocAsCode { + using Microsoft.DocAsCode.EntityModel; + using Microsoft.DocAsCode.Utility; + using System; + using System.Collections.Generic; + using System.IO; + using System.Linq; + internal class GlobUtility { /// diff --git a/src/BackEnd/docfx/HelpTextGenerator.cs b/src/BackEnd/docfx/HelpTextGenerator.cs index 94d76d74374..b2651ffba0b 100644 --- a/src/BackEnd/docfx/HelpTextGenerator.cs +++ b/src/BackEnd/docfx/HelpTextGenerator.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using CommandLine; using CommandLine.Text; diff --git a/src/BackEnd/docfx/Options.cs b/src/BackEnd/docfx/Options.cs index 008b002bb2e..05479ab8ecd 100644 --- a/src/BackEnd/docfx/Options.cs +++ b/src/BackEnd/docfx/Options.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using CommandLine; using Microsoft.DocAsCode.EntityModel; diff --git a/src/BackEnd/docfx/OptionsAttributes.cs b/src/BackEnd/docfx/OptionsAttributes.cs index 2afae876d87..b5b531e39f4 100644 --- a/src/BackEnd/docfx/OptionsAttributes.cs +++ b/src/BackEnd/docfx/OptionsAttributes.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using System; diff --git a/src/BackEnd/docfx/Program.cs b/src/BackEnd/docfx/Program.cs index 507889fff11..160c3dcccfa 100644 --- a/src/BackEnd/docfx/Program.cs +++ b/src/BackEnd/docfx/Program.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using CommandLine; using Microsoft.DocAsCode.EntityModel; diff --git a/src/BackEnd/docfx/Properties/AssemblyInfo.cs b/src/BackEnd/docfx/Properties/AssemblyInfo.cs index add0079821a..7b6c21b7387 100644 --- a/src/BackEnd/docfx/Properties/AssemblyInfo.cs +++ b/src/BackEnd/docfx/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using docfx; +using Microsoft.DocAsCode; using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/src/BackEnd/docfx/SubCommands/HelpSubCommand.cs b/src/BackEnd/docfx/SubCommands/HelpSubCommand.cs index ab02a7a2438..4705e04f753 100644 --- a/src/BackEnd/docfx/SubCommands/HelpSubCommand.cs +++ b/src/BackEnd/docfx/SubCommands/HelpSubCommand.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using Microsoft.DocAsCode.EntityModel; using System; diff --git a/src/BackEnd/docfx/SubCommands/ISubCommand.cs b/src/BackEnd/docfx/SubCommands/ISubCommand.cs index 7e07832841d..9b4b7fda5db 100644 --- a/src/BackEnd/docfx/SubCommands/ISubCommand.cs +++ b/src/BackEnd/docfx/SubCommands/ISubCommand.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using Microsoft.DocAsCode.EntityModel; diff --git a/src/BackEnd/docfx/SubCommands/InitSubCommand.cs b/src/BackEnd/docfx/SubCommands/InitSubCommand.cs index f886222d31a..8355ce76a10 100644 --- a/src/BackEnd/docfx/SubCommands/InitSubCommand.cs +++ b/src/BackEnd/docfx/SubCommands/InitSubCommand.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using Microsoft.DocAsCode.EntityModel; using Newtonsoft.Json; diff --git a/src/BackEnd/docfx/SubCommands/MetadataSubCommand.cs b/src/BackEnd/docfx/SubCommands/MetadataSubCommand.cs index 2f93a028aa6..8841cae354a 100644 --- a/src/BackEnd/docfx/SubCommands/MetadataSubCommand.cs +++ b/src/BackEnd/docfx/SubCommands/MetadataSubCommand.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using Microsoft.DocAsCode.EntityModel; using Microsoft.DocAsCode.Utility; diff --git a/src/BackEnd/docfx/SubCommands/SubCommandFactory.cs b/src/BackEnd/docfx/SubCommands/SubCommandFactory.cs index 3b99c4cc594..4fb8dddb37d 100644 --- a/src/BackEnd/docfx/SubCommands/SubCommandFactory.cs +++ b/src/BackEnd/docfx/SubCommands/SubCommandFactory.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using System; diff --git a/src/BackEnd/docfx/SubCommands/WebsiteSubCommand.cs b/src/BackEnd/docfx/SubCommands/WebsiteSubCommand.cs index d4f1b63c791..55dc81bfda5 100644 --- a/src/BackEnd/docfx/SubCommands/WebsiteSubCommand.cs +++ b/src/BackEnd/docfx/SubCommands/WebsiteSubCommand.cs @@ -1,4 +1,4 @@ -namespace docfx +namespace Microsoft.DocAsCode { using Microsoft.DocAsCode.EntityModel; using Microsoft.DocAsCode.EntityModel.MarkdownIndexer; diff --git a/src/BackEnd/docfx/docfx.csproj b/src/BackEnd/docfx/docfx.csproj index d4519a016a2..9bceec6836f 100644 --- a/src/BackEnd/docfx/docfx.csproj +++ b/src/BackEnd/docfx/docfx.csproj @@ -5,6 +5,7 @@ {AB97BEDF-D207-42E9-A56F-C9DD395BFCDD} Exe Properties + Microsoft.DocAsCode