From 98a495372c86a1c61480871fbe185b7a2d979b53 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 29 Aug 2017 15:01:06 -0700 Subject: [PATCH 1/2] Use Directory.Build.props/targets --- appveyor.yml => .appveyor.yml | 0 Directory.Build.props | 15 ++++++++++++ Directory.Build.targets | 2 ++ JavaScriptServices.sln | 15 ++++++++---- build/common.props | 23 ------------------- samples/misc/LatencyTest/LatencyTest.csproj | 2 -- .../NodeServicesExamples.csproj | 4 +--- samples/misc/Webpack/Webpack.csproj | 4 +--- src/Directory.Build.props | 18 +++++++++++++++ src/Directory.Build.targets | 10 ++++++++ ...oft.AspNetCore.NodeServices.Sockets.csproj | 13 +---------- .../Microsoft.AspNetCore.NodeServices.csproj | 15 ------------ .../Microsoft.AspNetCore.SpaServices.csproj | 15 +++--------- templates/Directory.Build.props | 3 +++ templates/Directory.Build.targets | 3 +++ 15 files changed, 68 insertions(+), 74 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 src/Directory.Build.targets 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 00000000..c13af935 --- /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 00000000..f75adf7e --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,2 @@ + + diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index f1dd9654..31b1b747 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -1,9 +1,13 @@  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 + src\Directory.Build.targets = src\Directory.Build.targets + 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 +34,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 +83,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 1febbfb4..00000000 --- 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 43d5f17a..0d88fae4 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 eedacabc..6758a2fb 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 eedacabc..6758a2fb 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 00000000..74eab56d --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,18 @@ + + + + + true + true + aspnetcore;aspnetcoremvc;nodeservices + + + + + + + + + + + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets new file mode 100644 index 00000000..117acc30 --- /dev/null +++ b/src/Directory.Build.targets @@ -0,0 +1,10 @@ + + + + + + + + + + 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 1e3e542b..0f770a6b 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -1,27 +1,16 @@  - - 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 7f7822e2..6319e0b0 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -1,29 +1,14 @@  - - 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 730c9444..f9de910f 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -1,26 +1,17 @@  - - 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 00000000..141834c2 --- /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 00000000..141834c2 --- /dev/null +++ b/templates/Directory.Build.targets @@ -0,0 +1,3 @@ + + + From c6a9a457b30cd3cac3438f087b6642e5ae1cc991 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 30 Aug 2017 09:07:14 -0700 Subject: [PATCH 2/2] Restore item groups and targets to src projects --- JavaScriptServices.sln | 1 - src/Directory.Build.props | 5 ----- src/Directory.Build.targets | 10 ---------- .../Microsoft.AspNetCore.NodeServices.Sockets.csproj | 9 ++++++++- .../Microsoft.AspNetCore.NodeServices.csproj | 10 ++++++++++ .../Microsoft.AspNetCore.SpaServices.csproj | 10 +++++++--- 6 files changed, 25 insertions(+), 20 deletions(-) delete mode 100644 src/Directory.Build.targets diff --git a/JavaScriptServices.sln b/JavaScriptServices.sln index 31b1b747..04461b41 100644 --- a/JavaScriptServices.sln +++ b/JavaScriptServices.sln @@ -6,7 +6,6 @@ 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 - src\Directory.Build.targets = src\Directory.Build.targets EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.NodeServices", "src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj", "{66B77203-1469-41DF-92F2-2BE6900BD36F}" diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 74eab56d..235e5c9b 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -7,11 +7,6 @@ aspnetcore;aspnetcoremvc;nodeservices - - - - - diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets deleted file mode 100644 index 117acc30..00000000 --- a/src/Directory.Build.targets +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - 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 0f770a6b..65c47155 100644 --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj @@ -6,11 +6,18 @@ - + + + + + + + + diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj index 6319e0b0..03d4ace8 100644 --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj @@ -5,10 +5,20 @@ netstandard2.0 + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj index f9de910f..268fc099 100644 --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj @@ -6,12 +6,16 @@ + + - - - + + + + +