Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
.vs
*.xproj.user
[Oo]bj/
[Bb]in/
packages/
artifacts/
*.user
*.suo
node_modules
project.lock.json
.vs/
npm-debug.log
23 changes: 10 additions & 13 deletions Microsoft.AspNet.AngularServices/project.json
Original file line number Diff line number Diff line change
@@ -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": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This information seems to get lost. Can we retain it?

"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-*",
Expand All @@ -25,11 +22,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/**/*"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ protected async Task EnsureReady() {
}

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);
Expand Down
35 changes: 16 additions & 19 deletions Microsoft.AspNet.NodeServices/project.json
Original file line number Diff line number Diff line change
@@ -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": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This information seems to get lost. Can we retain it?

"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/**/*"
]
}
}
31 changes: 14 additions & 17 deletions Microsoft.AspNet.ReactServices/project.json
Original file line number Diff line number Diff line change
@@ -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": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This information seems to get lost. Can we retain it?

"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-*",
Expand All @@ -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/**/*"
]
}
}
19 changes: 19 additions & 0 deletions Microsoft.AspNet.SpaServices/Microsoft.AspNet.SpaServices.xproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.23107" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.23107</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>4624f728-6dff-44b6-93b5-3c7d9c94bf3f</ProjectGuid>
<RootNamespace>Microsoft.AspNet.SpaServices</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
10 changes: 5 additions & 5 deletions Microsoft.AspNet.SpaServices/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
}
}
}
}
}
6 changes: 6 additions & 0 deletions NodeServices.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down