diff --git a/.gitignore b/.gitignore index 0d2dd9c..0531f8e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,10 @@ -.vs -*.xproj.user +[Oo]bj/ +[Bb]in/ +packages/ +artifacts/ +*.user +*.suo +node_modules project.lock.json +.vs/ npm-debug.log diff --git a/Microsoft.AspNet.AngularServices/project.json b/Microsoft.AspNet.AngularServices/project.json index 8fca29b..7ae3acc 100644 --- a/Microsoft.AspNet.AngularServices/project.json +++ b/Microsoft.AspNet.AngularServices/project.json @@ -1,20 +1,17 @@ { "version": "1.0.0-alpha7", - "description": "Microsoft.AspNet.AngularServices Class Library", - "authors": [ - "Microsoft" - ], - "tags": [ - "" - ], - "projectUrl": "", - "licenseUrl": "", + "description": "Helpers for building Angular 2 applications on ASP.NET 5.", + "authors": [ "Microsoft" ], + "repository": { + "type": "git", + "url": "git://github.com/aspnet/nodeservices" + }, "tooling": { "defaultNamespace": "Microsoft.AspNet.AngularServices" }, "frameworks": { - "dnx451": {}, - "dnxcore50": { + "net451": { }, + "dotnet5.4": { "dependencies": { "Microsoft.CSharp": "4.0.1-beta-*", "System.Collections": "4.0.11-beta-*", @@ -26,11 +23,11 @@ } }, "dependencies": { + "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final", "Microsoft.AspNet.NodeServices": "1.0.0-alpha7", - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*", "Microsoft.AspNet.SpaServices": "1.0.0-alpha7" }, "resource": [ "Content/**/*" ] -} \ No newline at end of file +} diff --git a/Microsoft.AspNet.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/Microsoft.AspNet.NodeServices/HostingModels/OutOfProcessNodeInstance.cs index 70103fe..25de761 100644 --- a/Microsoft.AspNet.NodeServices/HostingModels/OutOfProcessNodeInstance.cs +++ b/Microsoft.AspNet.NodeServices/HostingModels/OutOfProcessNodeInstance.cs @@ -66,7 +66,7 @@ namespace Microsoft.AspNet.NodeServices { } var nodePathValue = existingNodePath + Path.Combine(this._projectPath, "node_modules"); - #if DNX451 + #if NET451 startInfo.EnvironmentVariables.Add("NODE_PATH", nodePathValue); #else startInfo.Environment.Add("NODE_PATH", nodePathValue); diff --git a/Microsoft.AspNet.NodeServices/project.json b/Microsoft.AspNet.NodeServices/project.json index f278161..16f59e0 100644 --- a/Microsoft.AspNet.NodeServices/project.json +++ b/Microsoft.AspNet.NodeServices/project.json @@ -1,36 +1,33 @@ { "version": "1.0.0-alpha7", - "description": "Microsoft.AspNet.NodeServices", - "authors": [ - "Microsoft" - ], - "tags": [ - "" - ], - "projectUrl": "", - "licenseUrl": "", + "description": "Invoke Node.js modules at runtime in ASP.NET 5 applications.", + "authors": [ "Microsoft" ], + "repository": { + "type": "git", + "url": "git://github.com/aspnet/nodeservices" + }, "dependencies": { - "System.Net.Http": "4.0.1-beta-*", - "Newtonsoft.Json": "8.0.1-beta3", "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final", - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final" + "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final", + "Newtonsoft.Json": "8.0.1-beta3", + "System.Net.Http": "4.0.1-beta-*" }, "frameworks": { - "dnx451": {}, - "dnxcore50": { + "net451": { }, + "dotnet5.4": { "dependencies": { "Microsoft.CSharp": "4.0.1-beta-*", "System.Collections": "4.0.11-beta-*", - "System.Linq": "4.0.1-beta-*", - "System.Threading": "4.0.11-beta-*", - "System.Text.RegularExpressions": "4.0.11-beta-*", + "System.Console": "4.0.0-beta-*", "System.Diagnostics.Process": "4.1.0-beta-*", "System.IO.FileSystem": "4.0.1-beta-*", - "System.Console": "4.0.0-beta-*" + "System.Linq": "4.0.1-beta-*", + "System.Text.RegularExpressions": "4.0.11-beta-*", + "System.Threading": "4.0.11-beta-*" } } }, "resource": [ "Content/**/*" ] -} \ No newline at end of file +} diff --git a/Microsoft.AspNet.ReactServices/project.json b/Microsoft.AspNet.ReactServices/project.json index 98cf6eb..d4bf665 100644 --- a/Microsoft.AspNet.ReactServices/project.json +++ b/Microsoft.AspNet.ReactServices/project.json @@ -1,20 +1,22 @@ { "version": "1.0.0-alpha7", - "description": "Microsoft.AspNet.ReactServices Class Library", - "authors": [ - "Microsoft" - ], - "tags": [ - "" - ], - "projectUrl": "", - "licenseUrl": "", + "description": "Helpers for building React applications on ASP.NET 5.", + "authors": [ "Microsoft" ], + "repository": { + "type": "git", + "url": "git://github.com/aspnet/nodeservices" + }, "tooling": { "defaultNamespace": "Microsoft.AspNet.ReactServices" }, + "dependencies": { + "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final", + "Microsoft.AspNet.NodeServices": "1.0.0-alpha7", + "Microsoft.AspNet.SpaServices": "1.0.0-alpha7" + }, "frameworks": { - "dnx451": {}, - "dnxcore50": { + "net451": { }, + "dotnet5.4": { "dependencies": { "Microsoft.CSharp": "4.0.1-beta-*", "System.Collections": "4.0.11-beta-*", @@ -24,12 +26,7 @@ } } }, - "dependencies": { - "Microsoft.AspNet.NodeServices": "1.0.0-alpha7", - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*", - "Microsoft.AspNet.SpaServices": "1.0.0-alpha7" - }, "resource": [ "Content/**/*" ] -} \ No newline at end of file +} diff --git a/Microsoft.AspNet.SpaServices/Microsoft.AspNet.SpaServices.xproj b/Microsoft.AspNet.SpaServices/Microsoft.AspNet.SpaServices.xproj new file mode 100644 index 0000000..da79f58 --- /dev/null +++ b/Microsoft.AspNet.SpaServices/Microsoft.AspNet.SpaServices.xproj @@ -0,0 +1,19 @@ + + + + 14.0.23107 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 4624f728-6dff-44b6-93b5-3c7d9c94bf3f + Microsoft.AspNet.SpaServices + ..\artifacts\obj\$(MSBuildProjectName) + ..\artifacts\bin\$(MSBuildProjectName)\ + + + + 2.0 + + + \ No newline at end of file diff --git a/Microsoft.AspNet.SpaServices/project.json b/Microsoft.AspNet.SpaServices/project.json index 4813c74..0edec8e 100644 --- a/Microsoft.AspNet.SpaServices/project.json +++ b/Microsoft.AspNet.SpaServices/project.json @@ -10,14 +10,14 @@ "projectUrl": "", "licenseUrl": "", "dependencies": { - "Microsoft.AspNet.Mvc": "6.0.0-rc1-*", - "Microsoft.AspNet.Routing": "1.0.0-rc1-*" + "Microsoft.AspNet.Mvc": "6.0.0-rc1-final", + "Microsoft.AspNet.Routing": "1.0.0-rc1-final" }, "frameworks": { - "dnx451": {}, - "dnxcore50": { + "net451": { }, + "dotnet5.4": { "dependencies": { } } } -} \ No newline at end of file +} diff --git a/NodeServices.sln b/NodeServices.sln index b79e3b1..12f1f68 100644 --- a/NodeServices.sln +++ b/NodeServices.sln @@ -22,6 +22,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.AngularSer EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ReactServices", "Microsoft.AspNet.ReactServices\Microsoft.AspNet.ReactServices.xproj", "{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.SpaServices", "Microsoft.AspNet.SpaServices\Microsoft.AspNet.SpaServices.xproj", "{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -52,6 +54,10 @@ Global {B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Debug|Any CPU.Build.0 = Debug|Any CPU {B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Release|Any CPU.ActiveCfg = Release|Any CPU {B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Release|Any CPU.Build.0 = Release|Any CPU + {4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE