diff --git a/.gitignore b/.gitignore
index 0d2dd9c..f4e4990 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,31 @@
-.vs
-*.xproj.user
+[Oo]bj/
+[Bb]in/
+TestResults/
+.nuget/
+_ReSharper.*/
+packages/
+artifacts/
+PublishProfiles/
+*.user
+*.suo
+*.cache
+*.docstates
+_ReSharper.*
+nuget.exe
+*net45.csproj
+*net451.csproj
+*k10.csproj
+*.psess
+*.vsp
+*.pidb
+*.userprefs
+*DS_Store
+*.ncrunchsolution
+*.*sdf
+*.ipch
+*.sln.ide
+node_modules
+*.sln.ide
project.lock.json
-npm-debug.log
+.vs/
+npm-debug.log
\ No newline at end of file
diff --git a/Microsoft.AspNet.AngularServices/project.json b/Microsoft.AspNet.AngularServices/project.json
index 01fbeb6..f112b42 100644
--- a/Microsoft.AspNet.AngularServices/project.json
+++ b/Microsoft.AspNet.AngularServices/project.json
@@ -1,20 +1,16 @@
{
"version": "1.0.0-alpha7",
- "description": "Microsoft.AspNet.AngularServices Class Library",
- "authors": [
- "Microsoft"
- ],
- "tags": [
- ""
- ],
- "projectUrl": "",
- "licenseUrl": "",
+ "description": "ASP.NET 5 server-side Angular services.",
+ "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-*",
@@ -25,11 +21,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..9da3393 100644
--- a/Microsoft.AspNet.NodeServices/project.json
+++ b/Microsoft.AspNet.NodeServices/project.json
@@ -1,36 +1,32 @@
{
"version": "1.0.0-alpha7",
- "description": "Microsoft.AspNet.NodeServices",
- "authors": [
- "Microsoft"
- ],
- "tags": [
- ""
- ],
- "projectUrl": "",
- "licenseUrl": "",
+ "description": "ASP.NET 5 Node.js services.",
+ "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..418ab07 100644
--- a/Microsoft.AspNet.ReactServices/project.json
+++ b/Microsoft.AspNet.ReactServices/project.json
@@ -1,20 +1,21 @@
{
"version": "1.0.0-alpha7",
- "description": "Microsoft.AspNet.ReactServices Class Library",
- "authors": [
- "Microsoft"
- ],
- "tags": [
- ""
- ],
- "projectUrl": "",
- "licenseUrl": "",
+ "description": "ASP.NET 5 server-side React services,",
+ "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 +25,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..4da941e 100644
--- a/NodeServices.sln
+++ b/NodeServices.sln
@@ -12,6 +12,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{78DAC76C-1092-45AB-BF0D-594B8C7B6569}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
+ NuGet.config = NuGet.config
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore", "samples\angular\MusicStore\MusicStore.xproj", "{1A74148F-9DC0-435D-B5AC-7D1B0D3D5E0B}"
@@ -22,6 +23,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 +55,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
diff --git a/NuGet.config b/NuGet.config
new file mode 100644
index 0000000..b004e5c
--- /dev/null
+++ b/NuGet.config
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file