X Tutup
Skip to content

Commit 5c1f362

Browse files
henkmollemahenkmollema
committed
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
1 parent 5ff3e9a commit 5c1f362

File tree

9 files changed

+106
-58
lines changed

9 files changed

+106
-58
lines changed

‎.gitignore‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
1-
.vs
2-
*.xproj.user
1+
[Oo]bj/
2+
[Bb]in/
3+
TestResults/
4+
.nuget/
5+
_ReSharper.*/
6+
packages/
7+
artifacts/
8+
PublishProfiles/
9+
*.user
10+
*.suo
11+
*.cache
12+
*.docstates
13+
_ReSharper.*
14+
nuget.exe
15+
*net45.csproj
16+
*net451.csproj
17+
*k10.csproj
18+
*.psess
19+
*.vsp
20+
*.pidb
21+
*.userprefs
22+
*DS_Store
23+
*.ncrunchsolution
24+
*.*sdf
25+
*.ipch
26+
*.sln.ide
27+
node_modules
28+
*.sln.ide
329
project.lock.json
4-
npm-debug.log
30+
.vs/
31+
npm-debug.log

‎Microsoft.AspNet.AngularServices/project.json‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
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": "ASP.NET 5 server-side Angular services.",
4+
"repository": {
5+
"type": "git",
6+
"url": "git://github.com/aspnet/nodeservices"
7+
},
128
"tooling": {
139
"defaultNamespace": "Microsoft.AspNet.AngularServices"
1410
},
1511
"frameworks": {
16-
"dnx451": {},
17-
"dnxcore50": {
12+
"net451": { },
13+
"dotnet5.4": {
1814
"dependencies": {
1915
"Microsoft.CSharp": "4.0.1-beta-*",
2016
"System.Collections": "4.0.11-beta-*",
@@ -25,11 +21,11 @@
2521
}
2622
},
2723
"dependencies": {
24+
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final",
2825
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
29-
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
3026
"Microsoft.AspNet.SpaServices": "1.0.0-alpha7"
3127
},
3228
"resource": [
3329
"Content/**/*"
3430
]
35-
}
31+
}

‎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: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,32 @@
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": "ASP.NET 5 Node.js services.",
4+
"repository": {
5+
"type": "git",
6+
"url": "git://github.com/aspnet/nodeservices"
7+
},
128
"dependencies": {
13-
"System.Net.Http": "4.0.1-beta-*",
14-
"Newtonsoft.Json": "8.0.1-beta3",
159
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
16-
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final"
10+
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final",
11+
"Newtonsoft.Json": "8.0.1-beta3",
12+
"System.Net.Http": "4.0.1-beta-*"
1713
},
1814
"frameworks": {
19-
"dnx451": {},
20-
"dnxcore50": {
15+
"net451": { },
16+
"dotnet5.4": {
2117
"dependencies": {
2218
"Microsoft.CSharp": "4.0.1-beta-*",
2319
"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-*",
20+
"System.Console": "4.0.0-beta-*",
2721
"System.Diagnostics.Process": "4.1.0-beta-*",
2822
"System.IO.FileSystem": "4.0.1-beta-*",
29-
"System.Console": "4.0.0-beta-*"
23+
"System.Linq": "4.0.1-beta-*",
24+
"System.Text.RegularExpressions": "4.0.11-beta-*",
25+
"System.Threading": "4.0.11-beta-*"
3026
}
3127
}
3228
},
3329
"resource": [
3430
"Content/**/*"
3531
]
36-
}
32+
}

‎Microsoft.AspNet.ReactServices/project.json‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
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": "ASP.NET 5 server-side React services,",
4+
"repository": {
5+
"type": "git",
6+
"url": "git://github.com/aspnet/nodeservices"
7+
},
128
"tooling": {
139
"defaultNamespace": "Microsoft.AspNet.ReactServices"
1410
},
11+
"dependencies": {
12+
"Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final",
13+
"Microsoft.AspNet.NodeServices": "1.0.0-alpha7",
14+
"Microsoft.AspNet.SpaServices": "1.0.0-alpha7"
15+
},
1516
"frameworks": {
16-
"dnx451": {},
17-
"dnxcore50": {
17+
"net451": { },
18+
"dotnet5.4": {
1819
"dependencies": {
1920
"Microsoft.CSharp": "4.0.1-beta-*",
2021
"System.Collections": "4.0.11-beta-*",
@@ -24,12 +25,7 @@
2425
}
2526
}
2627
},
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-
},
3228
"resource": [
3329
"Content/**/*"
3430
]
35-
}
31+
}

‎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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{78DAC76C-1092-45AB-BF0D-594B8C7B6569}"
1313
ProjectSection(SolutionItems) = preProject
1414
global.json = global.json
15+
NuGet.config = NuGet.config
1516
EndProjectSection
1617
EndProject
1718
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
2223
EndProject
2324
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.ReactServices", "Microsoft.AspNet.ReactServices\Microsoft.AspNet.ReactServices.xproj", "{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}"
2425
EndProject
26+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.SpaServices", "Microsoft.AspNet.SpaServices\Microsoft.AspNet.SpaServices.xproj", "{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}"
27+
EndProject
2528
Global
2629
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2730
Debug|Any CPU = Debug|Any CPU
@@ -52,6 +55,10 @@ Global
5255
{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
5356
{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
5457
{B04381DE-991F-4831-A0B5-FE1BD3EF80C4}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{4624F728-6DFF-44B6-93B5-3C7D9C94BF3F}.Release|Any CPU.Build.0 = Release|Any CPU
5562
EndGlobalSection
5663
GlobalSection(SolutionProperties) = preSolution
5764
HideSolutionNode = FALSE

‎NuGet.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
6+
</packageSources>
7+
</configuration>

0 commit comments

Comments
 (0)
X Tutup