Skip to content

Commit 64ed1c7

Browse files
natemcmasternatemcmaster
authored
Use Directory.Build.props/targets (aspnet#1235)
1 parent 04fe120 commit 64ed1c7

File tree

14 files changed

+48
-49
lines changed

14 files changed

+48
-49
lines changed

‎appveyor.yml‎ renamed to ‎.appveyor.yml‎

File renamed without changes.

‎Directory.Build.props‎

Lines changed: 15 additions & 0 deletions
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‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<Project>
2+
</Project>

‎JavaScriptServices.sln‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
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+
EndProjectSection
710
EndProject
811
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeServices", "src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj", "{66B77203-1469-41DF-92F2-2BE6900BD36F}"
912
EndProject
@@ -30,10 +33,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeServicesExamples", "sam
3033
EndProject
3134
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{1598B415-73F1-4B37-B3B4-0A10677ABB2D}"
3235
EndProject
33-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E415FE14-13B0-469F-836D-95059E6BAA6E}"
36+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{645F7363-1240-4FB6-9422-B32A327C979F}"
3437
ProjectSection(SolutionItems) = preProject
35-
src\build\common.props = src\build\common.props
36-
src\build\Key.snk = src\build\Key.snk
38+
Directory.Build.props = Directory.Build.props
39+
Directory.Build.targets = Directory.Build.targets
3740
EndProjectSection
3841
EndProject
3942
Global
@@ -79,4 +82,7 @@ Global
7982
{DE479DC3-1461-4EAD-A188-4AF7AA4AE344} = {E6A161EA-646C-4033-9090-95BE809AB8D9}
8083
{93EFCC5F-C6EE-4623-894F-A42B22C0B6FE} = {E6A161EA-646C-4033-9090-95BE809AB8D9}
8184
EndGlobalSection
85+
GlobalSection(ExtensibilityGlobals) = postSolution
86+
SolutionGuid = {DDF59B0D-2DEC-45D6-8667-DCB767487101}
87+
EndGlobalSection
8288
EndGlobal

‎build/common.props‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎samples/misc/LatencyTest/LatencyTest.csproj‎

Lines changed: 0 additions & 2 deletions
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‎

Lines changed: 1 addition & 3 deletions
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‎

Lines changed: 1 addition & 3 deletions
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‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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+
<PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
12+
</ItemGroup>
13+
</Project>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
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>

0 commit comments

Comments
 (0)