Target dotnet TFM's for class libraries

- Target `net451` and `dotnet5.4`
- Add SPA services project to solution (with .xproj)
- Add NuGet.config
- Update .gitignore
This commit is contained in:
Henk Mollema
2015-12-10 16:38:29 +01:00
parent 5ff3e9a051
commit 5c1f362c84
9 changed files with 106 additions and 58 deletions

31
.gitignore vendored
View File

@@ -1,4 +1,31 @@
.vs [Oo]bj/
*.xproj.user [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 project.lock.json
.vs/
npm-debug.log npm-debug.log

View File

@@ -1,20 +1,16 @@
{ {
"version": "1.0.0-alpha7", "version": "1.0.0-alpha7",
"description": "Microsoft.AspNet.AngularServices Class Library", "description": "ASP.NET 5 server-side Angular services.",
"authors": [ "repository": {
"Microsoft" "type": "git",
], "url": "git://github.com/aspnet/nodeservices"
"tags": [ },
""
],
"projectUrl": "",
"licenseUrl": "",
"tooling": { "tooling": {
"defaultNamespace": "Microsoft.AspNet.AngularServices" "defaultNamespace": "Microsoft.AspNet.AngularServices"
}, },
"frameworks": { "frameworks": {
"dnx451": {}, "net451": { },
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-beta-*", "Microsoft.CSharp": "4.0.1-beta-*",
"System.Collections": "4.0.11-beta-*", "System.Collections": "4.0.11-beta-*",
@@ -25,8 +21,8 @@
} }
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final",
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7", "Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
"Microsoft.AspNet.SpaServices": "1.0.0-alpha7" "Microsoft.AspNet.SpaServices": "1.0.0-alpha7"
}, },
"resource": [ "resource": [

View File

@@ -66,7 +66,7 @@ namespace Microsoft.AspNet.NodeServices {
} }
var nodePathValue = existingNodePath + Path.Combine(this._projectPath, "node_modules"); var nodePathValue = existingNodePath + Path.Combine(this._projectPath, "node_modules");
#if DNX451 #if NET451
startInfo.EnvironmentVariables.Add("NODE_PATH", nodePathValue); startInfo.EnvironmentVariables.Add("NODE_PATH", nodePathValue);
#else #else
startInfo.Environment.Add("NODE_PATH", nodePathValue); startInfo.Environment.Add("NODE_PATH", nodePathValue);

View File

@@ -1,32 +1,28 @@
{ {
"version": "1.0.0-alpha7", "version": "1.0.0-alpha7",
"description": "Microsoft.AspNet.NodeServices", "description": "ASP.NET 5 Node.js services.",
"authors": [ "repository": {
"Microsoft" "type": "git",
], "url": "git://github.com/aspnet/nodeservices"
"tags": [ },
""
],
"projectUrl": "",
"licenseUrl": "",
"dependencies": { "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.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": { "frameworks": {
"dnx451": {}, "net451": { },
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-beta-*", "Microsoft.CSharp": "4.0.1-beta-*",
"System.Collections": "4.0.11-beta-*", "System.Collections": "4.0.11-beta-*",
"System.Linq": "4.0.1-beta-*", "System.Console": "4.0.0-beta-*",
"System.Threading": "4.0.11-beta-*",
"System.Text.RegularExpressions": "4.0.11-beta-*",
"System.Diagnostics.Process": "4.1.0-beta-*", "System.Diagnostics.Process": "4.1.0-beta-*",
"System.IO.FileSystem": "4.0.1-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-*"
} }
} }
}, },

View File

@@ -1,20 +1,21 @@
{ {
"version": "1.0.0-alpha7", "version": "1.0.0-alpha7",
"description": "Microsoft.AspNet.ReactServices Class Library", "description": "ASP.NET 5 server-side React services,",
"authors": [ "repository": {
"Microsoft" "type": "git",
], "url": "git://github.com/aspnet/nodeservices"
"tags": [ },
""
],
"projectUrl": "",
"licenseUrl": "",
"tooling": { "tooling": {
"defaultNamespace": "Microsoft.AspNet.ReactServices" "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": { "frameworks": {
"dnx451": {}, "net451": { },
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-beta-*", "Microsoft.CSharp": "4.0.1-beta-*",
"System.Collections": "4.0.11-beta-*", "System.Collections": "4.0.11-beta-*",
@@ -24,11 +25,6 @@
} }
} }
}, },
"dependencies": {
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
"Microsoft.AspNet.SpaServices": "1.0.0-alpha7"
},
"resource": [ "resource": [
"Content/**/*" "Content/**/*"
] ]

View File

@@ -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>

View File

@@ -10,12 +10,12 @@
"projectUrl": "", "projectUrl": "",
"licenseUrl": "", "licenseUrl": "",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Mvc": "6.0.0-rc1-*", "Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
"Microsoft.AspNet.Routing": "1.0.0-rc1-*" "Microsoft.AspNet.Routing": "1.0.0-rc1-final"
}, },
"frameworks": { "frameworks": {
"dnx451": {}, "net451": { },
"dnxcore50": { "dotnet5.4": {
"dependencies": { "dependencies": {
} }
} }

View File

@@ -12,6 +12,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{78DAC76C-1092-45AB-BF0D-594B8C7B6569}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{78DAC76C-1092-45AB-BF0D-594B8C7B6569}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
global.json = global.json global.json = global.json
NuGet.config = NuGet.config
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MusicStore", "samples\angular\MusicStore\MusicStore.xproj", "{1A74148F-9DC0-435D-B5AC-7D1B0D3D5E0B}" 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 EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ReactServices", "Microsoft.AspNet.ReactServices\Microsoft.AspNet.ReactServices.xproj", "{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ReactServices", "Microsoft.AspNet.ReactServices\Microsoft.AspNet.ReactServices.xproj", "{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.SpaServices", "Microsoft.AspNet.SpaServices\Microsoft.AspNet.SpaServices.xproj", "{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU 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}.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.ActiveCfg = Release|Any CPU
{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Release|Any CPU.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

7
NuGet.config Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>