Merge pull request #23 from henkmollema/projectjson

Target dotnet TFM's for class libraries
dotnet · Dec 14, 2015 · 75b959d · 75b959d
2 parents 2e0aed8 + c56282a
commit 75b959d
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 57 deletions.
diff --git 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
@@ -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/**/*"
   ]
-}
+}
diff --git a/Microsoft.AspNet.NodeServices/HostingModels/OutOfProcessNodeInstance.cs b/Microsoft.AspNet.NodeServices/HostingModels/OutOfProcessNodeInstance.cs
@@ -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);

diff --git 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/**/*"
   ]
-}
+}
diff --git 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/**/*"
   ]
-}
+}
diff --git a/Microsoft.AspNet.SpaServices/Microsoft.AspNet.SpaServices.xproj b/Microsoft.AspNet.SpaServices/Microsoft.AspNet.SpaServices.xproj
@@ -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>
diff --git 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": {
       }
     }
   }
-}
+}
diff --git 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