Move PageGenerator to the tools dir

Fixes #294

DiagnosticsPages.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{509A6F36-AD80-4A18-B5B1-717D38DFF29D}"
 EndProject
@@ -12,7 +12,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagno
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DeveloperExceptionPageSample", "samples\DeveloperExceptionPageSample\DeveloperExceptionPageSample.xproj", "{589AC17F-9455-4764-8F82-FCD2AE58DA14}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PageGenerator", "src\PageGenerator\PageGenerator.xproj", "{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PageGenerator", "tools\PageGenerator\PageGenerator.xproj", "{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0557697-8D86-4DF3-A385-B0BFA9596189}"
 	ProjectSection(SolutionItems) = preProject
@@ -51,6 +51,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagno
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DiagnosticsViewPage.Sources", "src\Microsoft.AspNetCore.DiagnosticsViewPage.Sources\Microsoft.AspNetCore.DiagnosticsViewPage.Sources.xproj", "{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B9729160-50A4-49C5-8BB2-4944492AEA30}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -285,7 +287,7 @@ Global
 		{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416} = {ACAA0157-A8C4-4152-93DE-90CCDF304087}
 		{68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D}
 		{589AC17F-9455-4764-8F82-FCD2AE58DA14} = {ACAA0157-A8C4-4152-93DE-90CCDF304087}
-		{4D4A785A-ECB9-4916-A88F-0FD306EE3B74} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D}
+		{4D4A785A-ECB9-4916-A88F-0FD306EE3B74} = {B9729160-50A4-49C5-8BB2-4944492AEA30}
 		{994351B4-7B2A-4139-8B72-72C5BB5CC618} = {2AF90579-B118-4583-AE88-672EFACB5BC4}
 		{427CDB36-78B0-4583-9EBC-7F283DE60355} = {ACAA0157-A8C4-4152-93DE-90CCDF304087}
 		{4F5A6A72-FFE4-49C4-B4C6-58132CFCB9FE} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D}

NuGetPackageVerifier.json

@@ -14,8 +14,7 @@
     "adx-nonshipping": {
         "rules": [],
         "packages": {
-            "Microsoft.AspNetCore.DiagnosticsViewPage.Sources": { },
+            "Microsoft.AspNetCore.DiagnosticsViewPage.Sources": { }
-            "PageGenerator": { }
         }
     },
     "Default": { // Rules to run for packages not listed in any other set.

src/PageGenerator/project.json

@@ -1,31 +0,0 @@
-{
-  "version": "1.1.0-*",
-  "description": "Builds the pages for the Diagnostics projects. Runs in build.cmd.",
-  "buildOptions": {
-    "warningsAsErrors": true,
-    "emitEntryPoint": true,
-    "keyFile": "../../tools/Key.snk"
-  },
-  "packOptions": {
-    "repository": {
-      "type": "git",
-      "url": "git://github.com/aspnet/diagnostics"
-    }
-  },
-  "dependencies": {
-    "Microsoft.AspNetCore.Razor": "1.1.0-*"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "dependencies": {
-        "Microsoft.NETCore.App": {
-          "version": "1.0.0-*",
-          "type": "platform"
-        }
-      }
-    }
-  },
-  "commands": {
-    "run": "PageGenerator"
-  }
-}

tools/PageGenerator/Program.cs

@@ -22,8 +22,7 @@ namespace PageGenerator
             }
             var diagnosticsDir = args[0];
 
-            var viewDirectories = Directory.EnumerateDirectories(
+            var viewDirectories = Directory.EnumerateDirectories(diagnosticsDir, "Views", SearchOption.AllDirectories);
-                Path.GetDirectoryName(diagnosticsDir), "Views", SearchOption.AllDirectories);
 
             var fileCount = 0;
             foreach (var viewDir in viewDirectories)
@@ -42,8 +41,8 @@ namespace PageGenerator
                 foreach (var fileName in cshtmlFiles)
                 {
                     Console.WriteLine("    Generating code file for view {0}...", Path.GetFileName(fileName));
-                    var nameSpace = viewDir.Split(Path.DirectorySeparatorChar)[1];
+                    var rootNamespace = Path.GetDirectoryName(diagnosticsDir);
-                    GenerateCodeFile(fileName, $"{nameSpace}.Views");
+                    GenerateCodeFile(fileName, $"{rootNamespace}.Views");
                     Console.WriteLine("      Done!");
                     fileCount++;
                 }
@@ -116,7 +115,6 @@ namespace PageGenerator
             //"s
 
             var invalidChars = new List<char>(Path.GetInvalidFileNameChars());
-            Console.WriteLine($"InvalidChars are {invalidChars}");
             invalidChars.Add('+');
             invalidChars.Add(' ');
             //These are already in the list on windows, but for other platforms

tools/PageGenerator/project.json

@@ -0,0 +1,18 @@
+{
+  "version": "1.1.0-*",
+  "description": "Builds the pages for the Diagnostics projects. Runs in build.cmd.",
+  "buildOptions": {
+    "warningsAsErrors": true,
+    "emitEntryPoint": true
+  },
+  "dependencies": {
+    "Microsoft.AspNetCore.Razor": "1.0.0",
+    "Microsoft.NETCore.App": {
+      "version": "1.0.0",
+      "type": "platform"
+    }
+  },
+  "frameworks": {
+    "netcoreapp1.0": {}
+  }
+}