From 44f9a7083bdd15df02d4a2499306fca7667766a7 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 29 Aug 2017 11:29:31 -0700 Subject: [PATCH] Use Directory.Build.props/targets --- appveyor.yml => .appveyor.yml | 0 build/common.props => Directory.Build.props | 14 ++++---------- Directory.Build.targets | 2 ++ Routing.sln | 18 ++++++++++++++---- .../Configs/CoreConfig.cs | 0 ...soft.AspNetCore.Routing.Performance.csproj | 4 +--- .../Program.cs | 0 .../RoutingBenchmark.cs | 0 .../readme.md | 0 build/repo.props | 5 ----- .../RoutingSample.Web.csproj | 4 +--- src/Directory.Build.props | 7 +++++++ ...oft.AspNetCore.Routing.Abstractions.csproj | 2 +- .../Microsoft.AspNetCore.Routing.csproj | 1 - test/Directory.Build.props | 13 +++++++++++++ ...Core.Mvc.Routing.Abstractions.Tests.csproj | 10 ---------- ....Routing.DecisionTree.Sources.Tests.csproj | 9 --------- ....AspNetCore.Routing.FunctionalTests.csproj | 7 ------- .../Microsoft.AspNetCore.Routing.Tests.csproj | 8 -------- tools/Key.snk | Bin 596 -> 0 bytes 20 files changed, 43 insertions(+), 61 deletions(-) rename appveyor.yml => .appveyor.yml (100%) rename build/common.props => Directory.Build.props (59%) create mode 100644 Directory.Build.targets rename {test => benchmarks}/Microsoft.AspNetCore.Routing.Performance/Configs/CoreConfig.cs (100%) rename {test => benchmarks}/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj (90%) rename {test => benchmarks}/Microsoft.AspNetCore.Routing.Performance/Program.cs (100%) rename {test => benchmarks}/Microsoft.AspNetCore.Routing.Performance/RoutingBenchmark.cs (100%) rename {test => benchmarks}/Microsoft.AspNetCore.Routing.Performance/readme.md (100%) delete mode 100644 build/repo.props create mode 100644 src/Directory.Build.props create mode 100644 test/Directory.Build.props delete mode 100644 tools/Key.snk diff --git a/appveyor.yml b/.appveyor.yml similarity index 100% rename from appveyor.yml rename to .appveyor.yml diff --git a/build/common.props b/Directory.Build.props similarity index 59% rename from build/common.props rename to Directory.Build.props index 78e05d150c..44da62acd5 100644 --- a/build/common.props +++ b/Directory.Build.props @@ -1,21 +1,15 @@ - - - - + + + Microsoft ASP.NET Core https://github.com/aspnet/Routing git - $(MSBuildThisFileDirectory)Key.snk + $(MSBuildThisFileDirectory)build\Key.snk true true $(VersionSuffix)-$(BuildNumber) true - - - - - diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000000..f75adf7e4d --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,2 @@ + + diff --git a/Routing.sln b/Routing.sln index 45e1b47f05..e66c1c947e 100644 --- a/Routing.sln +++ b/Routing.sln @@ -1,12 +1,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26228.9 +VisualStudioVersion = 15.0.26730.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0E966C37-7334-4D96-AAF6-9F49FBD166E3}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{95359B4B-4C85-4B44-A75B-0621905C4CF6}" + ProjectSection(SolutionItems) = preProject + test\Directory.Build.props = test\Directory.Build.props + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "src\Microsoft.AspNetCore.Routing\Microsoft.AspNetCore.Routing.csproj", "{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}" EndProject @@ -30,13 +36,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routin EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6DC6B416-C8C4-4BFA-8C1E-A55A6D7EFD08}" ProjectSection(SolutionItems) = preProject - build\common.props = build\common.props build\dependencies.props = build\dependencies.props build\Key.snk = build\Key.snk build\repo.props = build\repo.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Performance", "test\Microsoft.AspNetCore.Routing.Performance\Microsoft.AspNetCore.Routing.Performance.csproj", "{F3D86714-4E64-41A6-9B36-A47B3683CF5D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Performance", "benchmarks\Microsoft.AspNetCore.Routing.Performance\Microsoft.AspNetCore.Routing.Performance.csproj", "{F3D86714-4E64-41A6-9B36-A47B3683CF5D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{D5F39F59-5725-4127-82E7-67028D006185}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -150,6 +157,9 @@ Global {ED253B01-24F1-43D1-AA0B-079391E105A9} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3} {741B0B05-CE96-473B-B962-6B0A347DF79A} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} {5C73140B-41F3-466F-A07B-3614E4D80DF9} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} - {F3D86714-4E64-41A6-9B36-A47B3683CF5D} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} + {F3D86714-4E64-41A6-9B36-A47B3683CF5D} = {D5F39F59-5725-4127-82E7-67028D006185} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9F34D81E-5036-4EC8-8012-1EF178A6BBEA} EndGlobalSection EndGlobal diff --git a/test/Microsoft.AspNetCore.Routing.Performance/Configs/CoreConfig.cs b/benchmarks/Microsoft.AspNetCore.Routing.Performance/Configs/CoreConfig.cs similarity index 100% rename from test/Microsoft.AspNetCore.Routing.Performance/Configs/CoreConfig.cs rename to benchmarks/Microsoft.AspNetCore.Routing.Performance/Configs/CoreConfig.cs diff --git a/test/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj b/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj similarity index 90% rename from test/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj rename to benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj index 95cee3dde1..a834f59c03 100644 --- a/test/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj +++ b/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj @@ -1,6 +1,4 @@ - - - + netcoreapp2.0;net461 diff --git a/test/Microsoft.AspNetCore.Routing.Performance/Program.cs b/benchmarks/Microsoft.AspNetCore.Routing.Performance/Program.cs similarity index 100% rename from test/Microsoft.AspNetCore.Routing.Performance/Program.cs rename to benchmarks/Microsoft.AspNetCore.Routing.Performance/Program.cs diff --git a/test/Microsoft.AspNetCore.Routing.Performance/RoutingBenchmark.cs b/benchmarks/Microsoft.AspNetCore.Routing.Performance/RoutingBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Routing.Performance/RoutingBenchmark.cs rename to benchmarks/Microsoft.AspNetCore.Routing.Performance/RoutingBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Routing.Performance/readme.md b/benchmarks/Microsoft.AspNetCore.Routing.Performance/readme.md similarity index 100% rename from test/Microsoft.AspNetCore.Routing.Performance/readme.md rename to benchmarks/Microsoft.AspNetCore.Routing.Performance/readme.md diff --git a/build/repo.props b/build/repo.props deleted file mode 100644 index 5f43ac20f6..0000000000 --- a/build/repo.props +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/samples/RoutingSample.Web/RoutingSample.Web.csproj b/samples/RoutingSample.Web/RoutingSample.Web.csproj index a1603619a5..80628b6a56 100644 --- a/samples/RoutingSample.Web/RoutingSample.Web.csproj +++ b/samples/RoutingSample.Web/RoutingSample.Web.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 0000000000..d704a37df9 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj b/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj index e69ea872f6..1b47b91966 100644 --- a/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj +++ b/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj @@ -1,5 +1,5 @@  - + ASP.NET Core abstractions for routing requests to application logic and for generating links. Commonly used types: diff --git a/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj b/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj index ca0327903a..0e7f1c0671 100644 --- a/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj +++ b/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj @@ -1,5 +1,4 @@  - ASP.NET Core middleware for routing requests to application logic and for generating links. diff --git a/test/Directory.Build.props b/test/Directory.Build.props new file mode 100644 index 0000000000..948e2f60fc --- /dev/null +++ b/test/Directory.Build.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj index 7d0b1cea12..924c970976 100644 --- a/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 netcoreapp2.0 @@ -11,12 +9,4 @@ - - - - - - - - diff --git a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj index 781bdc9b2d..cda1744fb7 100644 --- a/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj +++ b/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 netcoreapp2.0 @@ -15,11 +13,4 @@ - - - - - - - diff --git a/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj index 39310d7bb4..0992a9b196 100644 --- a/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 netcoreapp2.0 @@ -14,11 +12,6 @@ - - - - - diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj b/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj index 93d336c15a..bcb1cbbffa 100644 --- a/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj +++ b/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 netcoreapp2.0 @@ -13,16 +11,10 @@ - - - - - - diff --git a/tools/Key.snk b/tools/Key.snk deleted file mode 100644 index e10e4889c125d3120cd9e81582243d70f7cbb806..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098=Iw=HCsnz~#iVhm& zj%TU(_THUee?3yHBjk$37ysB?i5#7WD$={H zV4B!OxRPrb|8)HPg~A}8P>^=#y<)56#=E&NzcjOtPK~<4n6GHt=K$ro*T(lhby_@U zEk(hLzk1H)0yXj{A_5>fk-TgNoP|q6(tP2xo8zt8i%212CWM#AeCd?`hS|4~L({h~Moo(~vy&3Z z1uI}`fd^*>o=rwbAGymj6RM^pZm(*Kfhs+Y1#`-2JPWZMK8@;ZWCk2+9bX4YP);~fj-BU*R zQPvWv$89!{Rl9wM+zR>_TSkn^voYxA?2G iKnV#iZ6Ah`K>b=@=IjYJXrxL124zR(38)nxe+&q_$QXwJ