From 64ed1c794521999193271d7c4ae3e39c97fac6db Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 30 Aug 2017 14:48:58 -0700 Subject: [PATCH] Use Directory.Build.props/targets (#1235) --- appveyor.yml => .appveyor.yml | 0 Directory.Build.props | 15 ++++++++++++ Directory.Build.targets | 2 ++ JavaScriptServices.sln | 14 +++++++---- build/common.props | 23 ------------------- samples/misc/LatencyTest/LatencyTest.csproj | 2 -- .../NodeServicesExamples.csproj | 4 +--- samples/misc/Webpack/Webpack.csproj | 4 +--- src/Directory.Build.props | 13 +++++++++++ ...oft.AspNetCore.NodeServices.Sockets.csproj | 4 ---- .../Microsoft.AspNetCore.NodeServices.csproj | 5 ---- .../Microsoft.AspNetCore.SpaServices.csproj | 5 ---- templates/Directory.Build.props | 3 +++ templates/Directory.Build.targets | 3 +++ 14 files changed, 48 insertions(+), 49 deletions(-) rename appveyor.yml => .appveyor.yml (100%) create mode 100644 Directory.Build.props create mode 100644 Directory.Build.targets delete mode 100644 build/common.props create mode 100644 src/Directory.Build.props create mode 100644 templates/Directory.Build.props create mode 100644 templates/Directory.Build.targets diff --git a/appveyor.yml b/.appveyor.yml similarity index 100% rename from appveyor.yml rename to .appveyor.yml diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..c13af93 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,15 @@ + + + + + + Microsoft ASP.NET Core + https://github.com/aspnet/javascriptservices + git + $(MSBuildThisFileDirectory)build\Key.snk + true + true + $(VersionSuffix)-$(BuildNumber) + true + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000..f75adf7 --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,2 @@ + + diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index f1dd965..04461b4 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -1,9 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.4 +VisualStudioVersion = 15.0.26730.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27304DDE-AFB2-4F8B-B765-E3E2F11E886C}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeServices", "src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj", "{66B77203-1469-41DF-92F2-2BE6900BD36F}" EndProject @@ -30,10 +33,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NodeServicesExamples", "sam EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{1598B415-73F1-4B37-B3B4-0A10677ABB2D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E415FE14-13B0-469F-836D-95059E6BAA6E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{645F7363-1240-4FB6-9422-B32A327C979F}" ProjectSection(SolutionItems) = preProject - src\build\common.props = src\build\common.props - src\build\Key.snk = src\build\Key.snk + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets EndProjectSection EndProject Global @@ -79,4 +82,7 @@ Global {DE479DC3-1461-4EAD-A188-4AF7AA4AE344} = {E6A161EA-646C-4033-9090-95BE809AB8D9} {93EFCC5F-C6EE-4623-894F-A42B22C0B6FE} = {E6A161EA-646C-4033-9090-95BE809AB8D9} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DDF59B0D-2DEC-45D6-8667-DCB767487101} + EndGlobalSection EndGlobal diff --git a/build/common.props b/build/common.props deleted file mode 100644 index 1febbfb..0000000 --- a/build/common.props +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/javascriptservices - git - $(MSBuildThisFileDirectory)Key.snk - true - true - $(VersionSuffix)-$(BuildNumber) - true - - - - - - - - - - diff --git a/samples/misc/LatencyTest/LatencyTest.csproj b/samples/misc/LatencyTest/LatencyTest.csproj index 43d5f17..0d88fae 100644 --- a/samples/misc/LatencyTest/LatencyTest.csproj +++ b/samples/misc/LatencyTest/LatencyTest.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 false diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj index eedacab..6758a2f 100644 --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj @@ -1,6 +1,4 @@ - - - + netcoreapp2.0;net461 diff --git a/samples/misc/Webpack/Webpack.csproj b/samples/misc/Webpack/Webpack.csproj index eedacab..6758a2f 100644 --- a/samples/misc/Webpack/Webpack.csproj +++ b/samples/misc/Webpack/Webpack.csproj @@ -1,6 +1,4 @@ - - - + netcoreapp2.0;net461 diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000..235e5c9 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,13 @@ + + + + + true + true + aspnetcore;aspnetcoremvc;nodeservices + + + + + + diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj index 1e3e542..65c4715 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -1,12 +1,8 @@  - - Socket-based RPC for Microsoft.AspNetCore.NodeServices. netstandard2.0 - aspnetcore;aspnetcoremvc;nodeservices - true diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 7f7822e..03d4ace 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -1,13 +1,8 @@  - - Invoke Node.js modules at runtime in ASP.NET Core applications. netstandard2.0 - aspnetcore;aspnetcoremvc;nodeservices - true - true diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index 730c944..268fc09 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -1,13 +1,8 @@  - - Helpers for building single-page applications on ASP.NET MVC Core. netstandard2.0 - aspnetcore;aspnetcoremvc;nodeservices - true - true diff --git a/templates/Directory.Build.props b/templates/Directory.Build.props new file mode 100644 index 0000000..141834c --- /dev/null +++ b/templates/Directory.Build.props @@ -0,0 +1,3 @@ + + + diff --git a/templates/Directory.Build.targets b/templates/Directory.Build.targets new file mode 100644 index 0000000..141834c --- /dev/null +++ b/templates/Directory.Build.targets @@ -0,0 +1,3 @@ + + +