Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Commit 98a4953

Browse files
author
Nate McMaster
committed
Use Directory.Build.props/targets
1 parent 04fe120 commit 98a4953

15 files changed

+68
-74
lines changed

‎appveyor.yml renamed to ‎.appveyor.yml

File renamed without changes.

‎Directory.Build.props

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project>
2+
<Import Project="build\dependencies.props" />
3+
<Import Project="version.xml" />
4+
5+
<PropertyGroup>
6+
<Product>Microsoft ASP.NET Core</Product>
7+
<RepositoryUrl>https://github.com/aspnet/javascriptservices</RepositoryUrl>
8+
<RepositoryType>git</RepositoryType>
9+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
10+
<SignAssembly>true</SignAssembly>
11+
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
12+
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
13+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
14+
</PropertyGroup>
15+
</Project>

‎Directory.Build.targets

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<Project>
2+
</Project>

‎JavaScriptServices.sln

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.4
4+
VisualStudioVersion = 15.0.26730.10
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27304DDE-AFB2-4F8B-B765-E3E2F11E886C}"
7+
ProjectSection(SolutionItems) = preProject
8+
src\Directory.Build.props = src\Directory.Build.props
9+
src\Directory.Build.targets = src\Directory.Build.targets
10+
EndProjectSection
711
EndProject
812
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeServices", "src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj", "{66B77203-1469-41DF-92F2-2BE6900BD36F}"
913
EndProject
@@ -30,10 +34,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeServicesExamples", "sam
3034
EndProject
3135
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{1598B415-73F1-4B37-B3B4-0A10677ABB2D}"
3236
EndProject
33-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E415FE14-13B0-469F-836D-95059E6BAA6E}"
37+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{645F7363-1240-4FB6-9422-B32A327C979F}"
3438
ProjectSection(SolutionItems) = preProject
35-
src\build\common.props = src\build\common.props
36-
src\build\Key.snk = src\build\Key.snk
39+
Directory.Build.props = Directory.Build.props
40+
Directory.Build.targets = Directory.Build.targets
3741
EndProjectSection
3842
EndProject
3943
Global
@@ -79,4 +83,7 @@ Global
7983
{DE479DC3-1461-4EAD-A188-4AF7AA4AE344} = {E6A161EA-646C-4033-9090-95BE809AB8D9}
8084
{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE} = {E6A161EA-646C-4033-9090-95BE809AB8D9}
8185
EndGlobalSection
86+
GlobalSection(ExtensibilityGlobals) = postSolution
87+
SolutionGuid = {DDF59B0D-2DEC-45D6-8667-DCB767487101}
88+
EndGlobalSection
8289
EndGlobal

‎build/common.props

-23
This file was deleted.

‎samples/misc/LatencyTest/LatencyTest.csproj

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\..\build\common.props" />
4-
53
<PropertyGroup>
64
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
75
<IsPackable>false</IsPackable>

‎samples/misc/NodeServicesExamples/NodeServicesExamples.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
3-
<Import Project="..\..\..\build\common.props" />
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
42

53
<PropertyGroup>
64
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>

‎samples/misc/Webpack/Webpack.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
3-
<Import Project="..\..\..\build\common.props" />
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
42

53
<PropertyGroup>
64
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>

‎src/Directory.Build.props

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project>
2+
<Import Project="..\Directory.Build.props" />
3+
4+
<PropertyGroup>
5+
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
6+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7+
<PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<None Remove="node_modules\**\*" />
12+
<EmbeddedResource Include="Content\**\*" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
17+
</ItemGroup>
18+
</Project>

‎src/Directory.Build.targets

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
3+
<Import Project="..\Directory.Build.targets" />
4+
5+
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
6+
<Exec Command="npm install" />
7+
<Exec Command="node node_modules/webpack/bin/webpack.js" />
8+
</Target>
9+
10+
</Project>

‎src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\common.props" />
4-
53
<PropertyGroup>
64
<Description>Socket-based RPC for Microsoft.AspNetCore.NodeServices.</Description>
75
<TargetFramework>netstandard2.0</TargetFramework>
8-
<PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
9-
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
106
</PropertyGroup>
117

128
<ItemGroup>
13-
<None Remove="node_modules\**\*" />
14-
<EmbeddedResource Include="Content\**\*" />
9+
<ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
1510
</ItemGroup>
1611

1712
<ItemGroup>
18-
<ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
1913
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="$(ThreadingDataflowVersion)" />
2014
</ItemGroup>
2115

22-
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
23-
<Exec Command="npm install" />
24-
<Exec Command="node node_modules/webpack/bin/webpack.js" />
25-
</Target>
26-
2716
</Project>

‎src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj

-15
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\common.props" />
4-
53
<PropertyGroup>
64
<Description>Invoke Node.js modules at runtime in ASP.NET Core applications.</Description>
75
<TargetFramework>netstandard2.0</TargetFramework>
8-
<PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
9-
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
10-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
116
</PropertyGroup>
127

13-
<ItemGroup>
14-
<None Remove="node_modules\**\*" />
15-
<EmbeddedResource Include="Content\**\*" />
16-
</ItemGroup>
17-
188
<ItemGroup>
199
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(AspNetCoreVersion)" />
2010
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
2111
<PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
2212
</ItemGroup>
2313

24-
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
25-
<Exec Command="npm install" />
26-
<Exec Command="node node_modules/webpack/bin/webpack.js" />
27-
</Target>
28-
2914
</Project>

‎src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj

+3-12
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\common.props" />
4-
53
<PropertyGroup>
64
<Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
75
<TargetFramework>netstandard2.0</TargetFramework>
8-
<PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
9-
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
10-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
116
</PropertyGroup>
127

138
<ItemGroup>
14-
<None Remove="node_modules\**\*" />
15-
<EmbeddedResource Include="Content\**\*" />
169
<ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
1713
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="$(AspNetCoreVersion)" />
1814
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="$(AspNetCoreVersion)" />
1915
</ItemGroup>
2016

21-
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
22-
<Exec Command="npm install" />
23-
<Exec Command="node node_modules/webpack/bin/webpack.js" />
24-
</Target>
25-
2617
</Project>

‎templates/Directory.Build.props

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<!-- The file is intentionally left blank to prevent templates from importing other MSBuild files. -->
3+
</Project>

‎templates/Directory.Build.targets

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<!-- The file is intentionally left blank to prevent templates from importing other MSBuild files. -->
3+
</Project>

0 commit comments

Comments
 (0)