From 9a4a43cc6a686c4c732d5ecfb225704bc4daa49a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 29 Aug 2017 09:52:04 -0700 Subject: [PATCH] Use Directory.Build.props/targets --- appveyor.yml => .appveyor.yml | 0 build/common.props => Directory.Build.props | 12 ++++-------- Directory.Build.targets | 2 ++ Hosting.sln | 19 +++++++++++++++++-- samples/SampleStartups/SampleStartups.csproj | 2 -- src/Directory.Build.props | 7 +++++++ ...oft.AspNetCore.Hosting.Abstractions.csproj | 2 -- ...NetCore.Hosting.Server.Abstractions.csproj | 2 -- ....AspNetCore.Hosting.WindowsServices.csproj | 2 -- .../Microsoft.AspNetCore.Hosting.csproj | 2 -- ...spNetCore.Server.IntegrationTesting.csproj | 2 -- .../Microsoft.AspNetCore.TestHost.csproj | 2 -- ...oft.Extensions.Hosting.Abstractions.csproj | 2 -- test/Directory.Build.props | 12 ++++++++++++ ...re.Certificates.Configuration.Tests.csproj | 6 ------ ....AspNetCore.Hosting.FunctionalTests.csproj | 6 ------ .../Microsoft.AspNetCore.Hosting.Tests.csproj | 7 ------- ...Microsoft.AspNetCore.TestHost.Tests.csproj | 6 ------ test/TestAssets/Directory.Build.props | 4 ++++ .../IStartupInjectionAssemblyName.csproj | 4 +--- ...rosoft.AspNetCore.Hosting.TestSites.csproj | 2 -- .../TestStartupAssembly1.csproj | 2 -- 22 files changed, 47 insertions(+), 58 deletions(-) rename appveyor.yml => .appveyor.yml (100%) rename build/common.props => Directory.Build.props (59%) create mode 100644 Directory.Build.targets create mode 100644 src/Directory.Build.props create mode 100644 test/Directory.Build.props create mode 100644 test/TestAssets/Directory.Build.props 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 233f867844..6f166f22dd 100644 --- a/build/common.props +++ b/Directory.Build.props @@ -1,20 +1,16 @@ - - - + + + Microsoft ASP.NET Core https://github.com/aspnet/Hosting 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/Hosting.sln b/Hosting.sln index 5bf07a656d..f9325585a1 100644 --- a/Hosting.sln +++ b/Hosting.sln @@ -1,10 +1,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.0 +VisualStudioVersion = 15.0.26730.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E0497F39-AFFB-4819-A116-E39E361915AB}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FEB39027-9158-4DE2-997F-7ADAEF8188D0}" + ProjectSection(SolutionItems) = preProject + test\Directory.Build.props = test\Directory.Build.props + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost.Tests", "test\Microsoft.AspNetCore.TestHost.Tests\Microsoft.AspNetCore.TestHost.Tests.csproj", "{0ACB2719-9484-49B5-B8E3-117091192511}" EndProject @@ -33,12 +39,21 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Certificates.Configuration.Tests", "test\Microsoft.AspNetCore.Certificates.Configuration.Tests\Microsoft.AspNetCore.Certificates.Configuration.Tests.csproj", "{AB0B7394-278D-4838-A59C-276ED88D00CC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssets", "TestAssets", "{FA7D2012-C1B4-4AF7-9ADD-381B2004EA16}" + ProjectSection(SolutionItems) = preProject + test\TestAssets\Directory.Build.props = test\TestAssets\Directory.Build.props + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.TestSites", "test\TestAssets\Microsoft.AspNetCore.Hosting.TestSites\Microsoft.AspNetCore.Hosting.TestSites.csproj", "{EDFF02F0-A8A4-4EB1-A179-94D7500FB266}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestStartupAssembly1", "test\TestAssets\TestStartupAssembly1\TestStartupAssembly1.csproj", "{58194285-5891-464A-A96B-0FE043029E8A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IStartupInjectionAssemblyName", "test\TestAssets\IStartupInjectionAssemblyName\IStartupInjectionAssemblyName.csproj", "{F894D8C5-B760-4734-AD31-3CA6FC557CCF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStartupInjectionAssemblyName", "test\TestAssets\IStartupInjectionAssemblyName\IStartupInjectionAssemblyName.csproj", "{F894D8C5-B760-4734-AD31-3CA6FC557CCF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A7270417-6BC6-4E3F-A96A-79193D16BB82}" + ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/SampleStartups/SampleStartups.csproj b/samples/SampleStartups/SampleStartups.csproj index 6706944d12..9e48d5e59b 100644 --- a/samples/SampleStartups/SampleStartups.csproj +++ b/samples/SampleStartups/SampleStartups.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 SampleStartups.StartupInjection 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.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj b/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj index 6fee54c3bd..b7a3d5e942 100644 --- a/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj +++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.csproj @@ -1,7 +1,5 @@  - - ASP.NET Core hosting and startup abstractions for web applications. netstandard2.0 diff --git a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj index d2c9b9dab7..15caa8ba3d 100644 --- a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj +++ b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj @@ -1,7 +1,5 @@  - - ASP.NET Core hosting server abstractions for web applications. netstandard2.0 diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.csproj b/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.csproj index d1d27a4e05..5e104f474d 100644 --- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.csproj +++ b/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.csproj @@ -1,7 +1,5 @@  - - ASP.NET Core hosting infrastructure and startup logic for web applications running within a Windows service. net461 diff --git a/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj b/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj index a5b0b21e83..dc1b9af032 100644 --- a/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj +++ b/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.csproj @@ -1,7 +1,5 @@  - - ASP.NET Core hosting infrastructure and startup logic for web applications. netstandard2.0 diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj index 0bfb9d0e2e..9482752b52 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Microsoft.AspNetCore.Server.IntegrationTesting.csproj @@ -1,7 +1,5 @@  - - ASP.NET Core helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing. 0.5.0 diff --git a/src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.csproj b/src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.csproj index 63e5fbd1d4..3ed38e596d 100644 --- a/src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.csproj +++ b/src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.csproj @@ -1,7 +1,5 @@  - - ASP.NET Core web server for writing and running tests. netstandard2.0 diff --git a/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj index 678a046bb3..cf89a1f216 100644 --- a/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -1,7 +1,5 @@  - - .NET Core hosting and startup abstractions for applications. netstandard2.0 diff --git a/test/Directory.Build.props b/test/Directory.Build.props new file mode 100644 index 0000000000..cc247eb9cf --- /dev/null +++ b/test/Directory.Build.props @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Certificates.Configuration.Tests/Microsoft.AspNetCore.Certificates.Configuration.Tests.csproj b/test/Microsoft.AspNetCore.Certificates.Configuration.Tests/Microsoft.AspNetCore.Certificates.Configuration.Tests.csproj index 71f5753dc5..bbdd35b428 100644 --- a/test/Microsoft.AspNetCore.Certificates.Configuration.Tests/Microsoft.AspNetCore.Certificates.Configuration.Tests.csproj +++ b/test/Microsoft.AspNetCore.Certificates.Configuration.Tests/Microsoft.AspNetCore.Certificates.Configuration.Tests.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 netcoreapp2.0 @@ -25,10 +23,6 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj index 53c50737c8..5e09139c32 100644 --- a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0 @@ -16,11 +14,7 @@ - - - - diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj b/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj index 3325a02d2f..9e977dcac1 100644 --- a/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj +++ b/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 netcoreapp2.0 @@ -18,13 +16,8 @@ - - - - - diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj b/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj index ccd8da73eb..8ac89342d4 100644 --- a/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj +++ b/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 netcoreapp2.0 @@ -12,11 +10,7 @@ - - - - diff --git a/test/TestAssets/Directory.Build.props b/test/TestAssets/Directory.Build.props new file mode 100644 index 0000000000..124bf60807 --- /dev/null +++ b/test/TestAssets/Directory.Build.props @@ -0,0 +1,4 @@ + + + + diff --git a/test/TestAssets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj b/test/TestAssets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj index 5d4cdb774b..4e57787536 100644 --- a/test/TestAssets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj +++ b/test/TestAssets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj @@ -1,6 +1,4 @@ - - - + netcoreapp2.0;net461 diff --git a/test/TestAssets/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj b/test/TestAssets/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj index b4f8a52345..3bb6c5e5af 100644 --- a/test/TestAssets/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj +++ b/test/TestAssets/Microsoft.AspNetCore.Hosting.TestSites/Microsoft.AspNetCore.Hosting.TestSites.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 netcoreapp2.0 diff --git a/test/TestAssets/TestStartupAssembly1/TestStartupAssembly1.csproj b/test/TestAssets/TestStartupAssembly1/TestStartupAssembly1.csproj index 0c23b539c0..5cf442c4ac 100644 --- a/test/TestAssets/TestStartupAssembly1/TestStartupAssembly1.csproj +++ b/test/TestAssets/TestStartupAssembly1/TestStartupAssembly1.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461