diff --git a/Microsoft.AspNet.NodeServices.Angular/.gitignore b/Microsoft.AspNet.AngularServices/.gitignore similarity index 100% rename from Microsoft.AspNet.NodeServices.Angular/.gitignore rename to Microsoft.AspNet.AngularServices/.gitignore diff --git a/Microsoft.AspNet.NodeServices.Angular/AngularPrerenderTagHelper.cs b/Microsoft.AspNet.AngularServices/AngularPrerenderTagHelper.cs similarity index 96% rename from Microsoft.AspNet.NodeServices.Angular/AngularPrerenderTagHelper.cs rename to Microsoft.AspNet.AngularServices/AngularPrerenderTagHelper.cs index a5ffe68..bacb3dc 100644 --- a/Microsoft.AspNet.NodeServices.Angular/AngularPrerenderTagHelper.cs +++ b/Microsoft.AspNet.AngularServices/AngularPrerenderTagHelper.cs @@ -3,9 +3,10 @@ using System.Threading.Tasks; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Extensions; +using Microsoft.AspNet.NodeServices; using Microsoft.Dnx.Runtime; -namespace Microsoft.AspNet.NodeServices.Angular +namespace Microsoft.AspNet.AngularServices { [HtmlTargetElement(Attributes = PrerenderModuleAttributeName)] public class AngularPrerenderTagHelper : TagHelper diff --git a/Microsoft.AspNet.NodeServices.Angular/AngularRenderer.cs b/Microsoft.AspNet.AngularServices/AngularRenderer.cs similarity index 92% rename from Microsoft.AspNet.NodeServices.Angular/AngularRenderer.cs rename to Microsoft.AspNet.AngularServices/AngularRenderer.cs index 511a53c..5c52cb6 100644 --- a/Microsoft.AspNet.NodeServices.Angular/AngularRenderer.cs +++ b/Microsoft.AspNet.AngularServices/AngularRenderer.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; +using Microsoft.AspNet.NodeServices; -namespace Microsoft.AspNet.NodeServices.Angular +namespace Microsoft.AspNet.AngularServices { public static class AngularRenderer { diff --git a/Microsoft.AspNet.NodeServices.Angular/Content/Node/angular-rendering.js b/Microsoft.AspNet.AngularServices/Content/Node/angular-rendering.js similarity index 100% rename from Microsoft.AspNet.NodeServices.Angular/Content/Node/angular-rendering.js rename to Microsoft.AspNet.AngularServices/Content/Node/angular-rendering.js diff --git a/Microsoft.AspNet.NodeServices.Angular/Microsoft.AspNet.NodeServices.Angular.xproj b/Microsoft.AspNet.AngularServices/Microsoft.AspNet.AngularServices.xproj similarity index 93% rename from Microsoft.AspNet.NodeServices.Angular/Microsoft.AspNet.NodeServices.Angular.xproj rename to Microsoft.AspNet.AngularServices/Microsoft.AspNet.AngularServices.xproj index a8b1bbe..984caa4 100644 --- a/Microsoft.AspNet.NodeServices.Angular/Microsoft.AspNet.NodeServices.Angular.xproj +++ b/Microsoft.AspNet.AngularServices/Microsoft.AspNet.AngularServices.xproj @@ -7,7 +7,7 @@ 421807e6-b62c-417b-b901-46c5dedaa8f1 - Microsoft.AspNet.NodeServices.Angular + Microsoft.AspNet.AngularServices ..\artifacts\obj\$(MSBuildProjectName) ..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/Microsoft.AspNet.NodeServices.React/project.json b/Microsoft.AspNet.AngularServices/project.json similarity index 74% rename from Microsoft.AspNet.NodeServices.React/project.json rename to Microsoft.AspNet.AngularServices/project.json index 9b765c8..f3bf8a2 100644 --- a/Microsoft.AspNet.NodeServices.React/project.json +++ b/Microsoft.AspNet.AngularServices/project.json @@ -1,6 +1,6 @@ { - "version": "1.0.0-alpha5", - "description": "Microsoft.AspNet.NodeServices.React Class Library", + "version": "1.0.0-alpha6", + "description": "Microsoft.AspNet.AngularServices Class Library", "authors": [ "Microsoft" ], @@ -10,7 +10,7 @@ "projectUrl": "", "licenseUrl": "", "tooling": { - "defaultNamespace": "Microsoft.AspNet.NodeServices.React" + "defaultNamespace": "Microsoft.AspNet.AngularServices" }, "frameworks": { "dnx451": {}, @@ -25,7 +25,7 @@ } }, "dependencies": { - "Microsoft.AspNet.NodeServices": "1.0.0-alpha5", + "Microsoft.AspNet.NodeServices": "1.0.0-alpha6", "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta8" }, diff --git a/Microsoft.AspNet.NodeServices/project.json b/Microsoft.AspNet.NodeServices/project.json index 1d42c81..7825b83 100644 --- a/Microsoft.AspNet.NodeServices/project.json +++ b/Microsoft.AspNet.NodeServices/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-alpha5", + "version": "1.0.0-alpha6", "description": "Microsoft.AspNet.NodeServices", "authors": [ "Microsoft" diff --git a/Microsoft.AspNet.NodeServices.React/.gitignore b/Microsoft.AspNet.ReactServices/.gitignore similarity index 100% rename from Microsoft.AspNet.NodeServices.React/.gitignore rename to Microsoft.AspNet.ReactServices/.gitignore diff --git a/Microsoft.AspNet.NodeServices.React/Content/Node/react-rendering.js b/Microsoft.AspNet.ReactServices/Content/Node/react-rendering.js similarity index 100% rename from Microsoft.AspNet.NodeServices.React/Content/Node/react-rendering.js rename to Microsoft.AspNet.ReactServices/Content/Node/react-rendering.js diff --git a/Microsoft.AspNet.NodeServices.React/Microsoft.AspNet.NodeServices.React.xproj b/Microsoft.AspNet.ReactServices/Microsoft.AspNet.ReactServices.xproj similarity index 93% rename from Microsoft.AspNet.NodeServices.React/Microsoft.AspNet.NodeServices.React.xproj rename to Microsoft.AspNet.ReactServices/Microsoft.AspNet.ReactServices.xproj index 2e0a0c8..6da829c 100644 --- a/Microsoft.AspNet.NodeServices.React/Microsoft.AspNet.NodeServices.React.xproj +++ b/Microsoft.AspNet.ReactServices/Microsoft.AspNet.ReactServices.xproj @@ -7,7 +7,7 @@ b04381de-991f-4831-a0b5-fe1bd3ef80c4 - Microsoft.AspNet.NodeServices.React + Microsoft.AspNet.ReactServices ..\artifacts\obj\$(MSBuildProjectName) ..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/Microsoft.AspNet.NodeServices.React/ReactPrerenderTagHelper.cs b/Microsoft.AspNet.ReactServices/ReactPrerenderTagHelper.cs similarity index 96% rename from Microsoft.AspNet.NodeServices.React/ReactPrerenderTagHelper.cs rename to Microsoft.AspNet.ReactServices/ReactPrerenderTagHelper.cs index b2df3b8..2419403 100644 --- a/Microsoft.AspNet.NodeServices.React/ReactPrerenderTagHelper.cs +++ b/Microsoft.AspNet.ReactServices/ReactPrerenderTagHelper.cs @@ -2,10 +2,10 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Extensions; +using Microsoft.AspNet.NodeServices; using Microsoft.Dnx.Runtime; -namespace Microsoft.AspNet.NodeServices.React +namespace Microsoft.AspNet.ReactServices { [HtmlTargetElement(Attributes = PrerenderModuleAttributeName)] public class ReactPrerenderTagHelper : TagHelper diff --git a/Microsoft.AspNet.NodeServices.React/ReactRenderer.cs b/Microsoft.AspNet.ReactServices/ReactRenderer.cs similarity index 91% rename from Microsoft.AspNet.NodeServices.React/ReactRenderer.cs rename to Microsoft.AspNet.ReactServices/ReactRenderer.cs index 222d031..e97f39e 100644 --- a/Microsoft.AspNet.NodeServices.React/ReactRenderer.cs +++ b/Microsoft.AspNet.ReactServices/ReactRenderer.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; +using Microsoft.AspNet.NodeServices; -namespace Microsoft.AspNet.NodeServices.React +namespace Microsoft.AspNet.ReactServices { public static class ReactRenderer { diff --git a/Microsoft.AspNet.NodeServices.Angular/project.json b/Microsoft.AspNet.ReactServices/project.json similarity index 73% rename from Microsoft.AspNet.NodeServices.Angular/project.json rename to Microsoft.AspNet.ReactServices/project.json index df9e8f8..d102fce 100644 --- a/Microsoft.AspNet.NodeServices.Angular/project.json +++ b/Microsoft.AspNet.ReactServices/project.json @@ -1,6 +1,6 @@ { - "version": "1.0.0-alpha5", - "description": "Microsoft.AspNet.NodeServices.Angular Class Library", + "version": "1.0.0-alpha6", + "description": "Microsoft.AspNet.ReactServices Class Library", "authors": [ "Microsoft" ], @@ -10,7 +10,7 @@ "projectUrl": "", "licenseUrl": "", "tooling": { - "defaultNamespace": "Microsoft.AspNet.NodeServices.Angular" + "defaultNamespace": "Microsoft.AspNet.ReactServices" }, "frameworks": { "dnx451": {}, @@ -25,7 +25,7 @@ } }, "dependencies": { - "Microsoft.AspNet.NodeServices": "1.0.0-alpha5", + "Microsoft.AspNet.NodeServices": "1.0.0-alpha6", "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta8" }, diff --git a/NodeServices.sln b/NodeServices.sln index 1ded2ba..b79e3b1 100644 --- a/NodeServices.sln +++ b/NodeServices.sln @@ -18,9 +18,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore", "samples\angul EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ReactGrid", "samples\react\ReactGrid\ReactGrid.xproj", "{ABF90A5B-F4E0-438C-A6E4-9549FB43690B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.NodeServices.Angular", "Microsoft.AspNet.NodeServices.Angular\Microsoft.AspNet.NodeServices.Angular.xproj", "{421807E6-B62C-417B-B901-46C5DEDAA8F1}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.AngularServices", "Microsoft.AspNet.AngularServices\Microsoft.AspNet.AngularServices.xproj", "{421807E6-B62C-417B-B901-46C5DEDAA8F1}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.NodeServices.React", "Microsoft.AspNet.NodeServices.React\Microsoft.AspNet.NodeServices.React.xproj", "{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ReactServices", "Microsoft.AspNet.ReactServices\Microsoft.AspNet.ReactServices.xproj", "{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/angular/MusicStore/Views/_ViewImports.cshtml b/samples/angular/MusicStore/Views/_ViewImports.cshtml index 808b5ca..24b10f4 100755 --- a/samples/angular/MusicStore/Views/_ViewImports.cshtml +++ b/samples/angular/MusicStore/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ @using MusicStore @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers" -@addTagHelper "*, Microsoft.AspNet.NodeServices.Angular" +@addTagHelper "*, Microsoft.AspNet.AngularServices" diff --git a/samples/angular/MusicStore/project.json b/samples/angular/MusicStore/project.json index 07f8327..7c9b638 100755 --- a/samples/angular/MusicStore/project.json +++ b/samples/angular/MusicStore/project.json @@ -19,8 +19,7 @@ "EntityFramework.SQLite": "7.0.0-beta8", "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta8", "AutoMapper": "4.0.0-alpha1", - "Microsoft.AspNet.NodeServices.Angular": "1.0.0-alpha5", - "Microsoft.AspNet.NodeServices": "1.0.0-alpha5" + "Microsoft.AspNet.AngularServices": "1.0.0-alpha6" }, "commands": { "web": "Microsoft.AspNet.Server.Kestrel" diff --git a/samples/misc/ES2015Transpilation/project.json b/samples/misc/ES2015Transpilation/project.json index b4b2604..55d2806 100755 --- a/samples/misc/ES2015Transpilation/project.json +++ b/samples/misc/ES2015Transpilation/project.json @@ -16,7 +16,7 @@ "Microsoft.Framework.Logging": "1.0.0-beta8", "Microsoft.Framework.Logging.Console": "1.0.0-beta8", "Microsoft.Framework.Logging.Debug": "1.0.0-beta8", - "Microsoft.AspNet.NodeServices": "1.0.0-alpha5" + "Microsoft.AspNet.NodeServices": "1.0.0-alpha6" }, "commands": { "web": "Microsoft.AspNet.Server.Kestrel" diff --git a/samples/react/ReactGrid/Views/_ViewImports.cshtml b/samples/react/ReactGrid/Views/_ViewImports.cshtml index 8237608..5fb3147 100755 --- a/samples/react/ReactGrid/Views/_ViewImports.cshtml +++ b/samples/react/ReactGrid/Views/_ViewImports.cshtml @@ -1,3 +1,3 @@ @using ReactExample @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers" -@addTagHelper "*, Microsoft.AspNet.NodeServices.React" +@addTagHelper "*, Microsoft.AspNet.ReactServices" diff --git a/samples/react/ReactGrid/project.json b/samples/react/ReactGrid/project.json index 275ce96..d219855 100755 --- a/samples/react/ReactGrid/project.json +++ b/samples/react/ReactGrid/project.json @@ -16,7 +16,7 @@ "Microsoft.Framework.Logging": "1.0.0-beta8", "Microsoft.Framework.Logging.Console": "1.0.0-beta8", "Microsoft.Framework.Logging.Debug": "1.0.0-beta8", - "Microsoft.AspNet.NodeServices.React": "1.0.0-alpha5" + "Microsoft.AspNet.ReactServices": "1.0.0-alpha6" }, "commands": { "web": "Microsoft.AspNet.Server.Kestrel"