Skip to content

Commit 75b959d

Browse files
SteveSandersonMSSteveSandersonMS
committed
Merge pull request aspnet#23 from henkmollema/projectjson
Target dotnet TFM's for class libraries
2 parents 2e0aed8 + c56282a commit 75b959d

8 files changed

Lines changed: 79 additions & 57 deletions

File tree

‎.gitignore‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
.vs
2-
*.xproj.user
1+
[Oo]bj/
2+
[Bb]in/
3+
packages/
4+
artifacts/
5+
*.user
6+
*.suo
7+
node_modules
38
project.lock.json
9+
.vs/
410
npm-debug.log

‎Microsoft.AspNet.AngularServices/project.json‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
{
22
"version": "1.0.0-alpha7",
3-
"description": "Microsoft.AspNet.AngularServices Class Library",
4-
"authors": [
5-
"Microsoft"
6-
],
7-
"tags": [
8-
""
9-
],
10-
"projectUrl": "",
11-
"licenseUrl": "",
3+
"description": "Helpers for building Angular 2 applications on ASP.NET 5.",
4+
"authors": [ "Microsoft" ],
5+
"repository": {
6+
"type": "git",
7+
"url": "git://github.com/aspnet/nodeservices"
8+
},
129
"tooling": {
1310
"defaultNamespace": "Microsoft.AspNet.AngularServices"
1411
},
1512
"frameworks": {
16-
"dnx451": {},
17-
"dnxcore50": {
13+
"net451": { },
14+
"dotnet5.4": {
1815
"dependencies": {
1916
"Microsoft.CSharp": "4.0.1-beta-*",
2017
"System.Collections": "4.0.11-beta-*",
@@ -26,11 +23,11 @@
2623
}
2724
},
2825
"dependencies": {
26+
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final",
2927
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
30-
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
3128
"Microsoft.AspNet.SpaServices": "1.0.0-alpha7"
3229
},
3330
"resource": [
3431
"Content/**/*"
3532
]
36-
}
33+
}

‎Microsoft.AspNet.NodeServices/HostingModels/OutOfProcessNodeInstance.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected async Task EnsureReady() {
6666
}
6767

6868
var nodePathValue = existingNodePath + Path.Combine(this._projectPath, "node_modules");
69-
#if DNX451
69+
#if NET451
7070
startInfo.EnvironmentVariables.Add("NODE_PATH", nodePathValue);
7171
#else
7272
startInfo.Environment.Add("NODE_PATH", nodePathValue);

‎Microsoft.AspNet.NodeServices/project.json‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,33 @@
11
{
22
"version": "1.0.0-alpha7",
3-
"description": "Microsoft.AspNet.NodeServices",
4-
"authors": [
5-
"Microsoft"
6-
],
7-
"tags": [
8-
""
9-
],
10-
"projectUrl": "",
11-
"licenseUrl": "",
3+
"description": "Invoke Node.js modules at runtime in ASP.NET 5 applications.",
4+
"authors": [ "Microsoft" ],
5+
"repository": {
6+
"type": "git",
7+
"url": "git://github.com/aspnet/nodeservices"
8+
},
129
"dependencies": {
13-
"System.Net.Http": "4.0.1-beta-*",
14-
"Newtonsoft.Json": "8.0.1-beta3",
1510
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
16-
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final"
11+
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final",
12+
"Newtonsoft.Json": "8.0.1-beta3",
13+
"System.Net.Http": "4.0.1-beta-*"
1714
},
1815
"frameworks": {
19-
"dnx451": {},
20-
"dnxcore50": {
16+
"net451": { },
17+
"dotnet5.4": {
2118
"dependencies": {
2219
"Microsoft.CSharp": "4.0.1-beta-*",
2320
"System.Collections": "4.0.11-beta-*",
24-
"System.Linq": "4.0.1-beta-*",
25-
"System.Threading": "4.0.11-beta-*",
26-
"System.Text.RegularExpressions": "4.0.11-beta-*",
21+
"System.Console": "4.0.0-beta-*",
2722
"System.Diagnostics.Process": "4.1.0-beta-*",
2823
"System.IO.FileSystem": "4.0.1-beta-*",
29-
"System.Console": "4.0.0-beta-*"
24+
"System.Linq": "4.0.1-beta-*",
25+
"System.Text.RegularExpressions": "4.0.11-beta-*",
26+
"System.Threading": "4.0.11-beta-*"
3027
}
3128
}
3229
},
3330
"resource": [
3431
"Content/**/*"
3532
]
36-
}
33+
}

‎Microsoft.AspNet.ReactServices/project.json‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
{
22
"version": "1.0.0-alpha7",
3-
"description": "Microsoft.AspNet.ReactServices Class Library",
4-
"authors": [
5-
"Microsoft"
6-
],
7-
"tags": [
8-
""
9-
],
10-
"projectUrl": "",
11-
"licenseUrl": "",
3+
"description": "Helpers for building React applications on ASP.NET 5.",
4+
"authors": [ "Microsoft" ],
5+
"repository": {
6+
"type": "git",
7+
"url": "git://github.com/aspnet/nodeservices"
8+
},
129
"tooling": {
1310
"defaultNamespace": "Microsoft.AspNet.ReactServices"
1411
},
12+
"dependencies": {
13+
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final",
14+
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
15+
"Microsoft.AspNet.SpaServices": "1.0.0-alpha7"
16+
},
1517
"frameworks": {
16-
"dnx451": {},
17-
"dnxcore50": {
18+
"net451": { },
19+
"dotnet5.4": {
1820
"dependencies": {
1921
"Microsoft.CSharp": "4.0.1-beta-*",
2022
"System.Collections": "4.0.11-beta-*",
@@ -24,12 +26,7 @@
2426
}
2527
}
2628
},
27-
"dependencies": {
28-
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
29-
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
30-
"Microsoft.AspNet.SpaServices": "1.0.0-alpha7"
31-
},
3229
"resource": [
3330
"Content/**/*"
3431
]
35-
}
32+
}

‎Microsoft.AspNet.SpaServices/Microsoft.AspNet.SpaServices.xproj‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0.23107" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.23107</VisualStudioVersion>
5+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
6+
</PropertyGroup>
7+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
8+
<PropertyGroup Label="Globals">
9+
<ProjectGuid>4624f728-6dff-44b6-93b5-3c7d9c94bf3f</ProjectGuid>
10+
<RootNamespace>Microsoft.AspNet.SpaServices</RootNamespace>
11+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
12+
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
13+
</PropertyGroup>
14+
15+
<PropertyGroup>
16+
<SchemaVersion>2.0</SchemaVersion>
17+
</PropertyGroup>
18+
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
19+
</Project>

‎Microsoft.AspNet.SpaServices/project.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"projectUrl": "",
1111
"licenseUrl": "",
1212
"dependencies": {
13-
"Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
14-
"Microsoft.AspNet.Routing": "1.0.0-rc1-*"
13+
"Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
14+
"Microsoft.AspNet.Routing": "1.0.0-rc1-final"
1515
},
1616
"frameworks": {
17-
"dnx451": {},
18-
"dnxcore50": {
17+
"net451": { },
18+
"dotnet5.4": {
1919
"dependencies": {
2020
}
2121
}
2222
}
23-
}
23+
}

‎NodeServices.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.AngularSer
2222
EndProject
2323
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ReactServices", "Microsoft.AspNet.ReactServices\Microsoft.AspNet.ReactServices.xproj", "{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}"
2424
EndProject
25+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.SpaServices", "Microsoft.AspNet.SpaServices\Microsoft.AspNet.SpaServices.xproj", "{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}"
26+
EndProject
2527
Global
2628
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2729
Debug|Any CPU = Debug|Any CPU
@@ -52,6 +54,10 @@ Global
5254
{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
5355
{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
5456
{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Release|Any CPU.Build.0 = Release|Any CPU
5561
EndGlobalSection
5662
GlobalSection(SolutionProperties) = preSolution
5763
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)