diff --git a/appveyor.yml b/.appveyor.yml similarity index 100% rename from appveyor.yml rename to .appveyor.yml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64ff041d5c..952d5b87f3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ Contributing -====== +============ Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo. diff --git a/build/common.props b/Directory.Build.props similarity index 51% rename from build/common.props rename to Directory.Build.props index 593929425b..d491401790 100644 --- a/build/common.props +++ b/Directory.Build.props @@ -1,22 +1,27 @@ - - + Microsoft ASP.NET Core https://github.com/aspnet/KestrelHttpServer git - $(MSBuildThisFileDirectory)Key.snk + $(MSBuildThisFileDirectory)build\Key.snk true true $(VersionSuffix)-$(BuildNumber) true - 7.2 + latest - - - + + + KRB4002 + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000000..9989b1046b --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,14 @@ + + + + <_BootstrapperFile Condition=" $([MSBuild]::IsOSUnixLike()) ">build.sh + <_BootstrapperFile Condition="! $([MSBuild]::IsOSUnixLike()) ">build.cmd + <_BootstrapperError> + Package references have not been pinned. Run './$(_BootstrapperFile) /t:Pin'. + Also, you can run './$(_BootstrapperFile) /t:Restore' which will pin *and* restore packages. '$(_BootstrapperFile)' can be found in '$(MSBuildThisFileDirectory)'. + + + + + + diff --git a/KestrelHttpServer.sln b/KestrelHttpServer.sln index 44ad81ebae..31cb00a5f7 100644 --- a/KestrelHttpServer.sln +++ b/KestrelHttpServer.sln @@ -1,17 +1,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.0 +VisualStudioVersion = 15.0.26814.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7972A5D6-3385-4127-9277-428506DD44FF}" ProjectSection(SolutionItems) = preProject + .appveyor.yml = .appveyor.yml + .gitattributes = .gitattributes + .gitignore = .gitignore + .travis.yml = .travis.yml build.cmd = build.cmd - makefile.shade = makefile.shade + build.ps1 = build.ps1 + build.sh = build.sh + CONTRIBUTING.md = CONTRIBUTING.md + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + LICENSE.txt = LICENSE.txt NuGet.Config = NuGet.Config + NuGetPackageVerifier.json = NuGetPackageVerifier.json + README.md = README.md + ToProjectReferences.ps1 = ToProjectReferences.ps1 + version.xml = version.xml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2D5D5227-4DBD-499A-96B1-76A36B03B750}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D3273454-EA07-41D2-BF0B-FCC3675C2483}" + ProjectSection(SolutionItems) = preProject + test\Directory.Build.props = test\Directory.Build.props + test\xunit.runner.json = test\xunit.runner.json + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8A3D00B8-1CCF-4BE6-A060-11104CE2D9CE}" EndProject @@ -50,7 +70,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Https", "src\Kestre EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.FunctionalTests", "test\Kestrel.FunctionalTests\Kestrel.FunctionalTests.csproj", "{9559A5F1-080C-4909-B6CF-7E4B3DC55748}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Performance", "test\Kestrel.Performance\Kestrel.Performance.csproj", "{EBFE9719-A44B-4978-A71F-D5C254E7F35A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Performance", "benchmarks\Kestrel.Performance\Kestrel.Performance.csproj", "{EBFE9719-A44B-4978-A71F-D5C254E7F35A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestCertificates", "TestCertificates", "{2822C132-BFFB-4D53-AC5B-E7E47DD81A6E}" ProjectSection(SolutionItems) = preProject @@ -80,9 +100,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Transport.Libuv.Tes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Tests", "test\Kestrel.Tests\Kestrel.Tests.csproj", "{4F1C30F8-CCAA-48D7-9DF6-2A84021F5BCC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{A95C3BE1-B850-4265-97A0-777ADCCD437F}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Protocols.Abstractions", "src\Protocols.Abstractions\Protocols.Abstractions.csproj", "{6956CF5C-3163-4398-8628-4ECA569245B5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kestrel.Tls", "src\Kestrel.Tls\Kestrel.Tls.csproj", "{924AE57C-1EBA-4A1D-A039-8C100B7507A5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kestrel.Tls", "src\Kestrel.Tls\Kestrel.Tls.csproj", "{924AE57C-1EBA-4A1D-A039-8C100B7507A5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{C2910A13-B2C2-46D8-81D8-7E166F4F5981}" + ProjectSection(SolutionItems) = preProject + build\repo.props = build\repo.props + build\repo.targets = build\repo.targets + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -276,16 +304,16 @@ Global {6956CF5C-3163-4398-8628-4ECA569245B5}.Release|x86.Build.0 = Release|Any CPU {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Debug|x64.ActiveCfg = Debug|x64 - {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Debug|x64.Build.0 = Debug|x64 - {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Debug|x86.ActiveCfg = Debug|x86 - {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Debug|x86.Build.0 = Debug|x86 + {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Debug|x64.ActiveCfg = Debug|Any CPU + {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Debug|x64.Build.0 = Debug|Any CPU + {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Debug|x86.ActiveCfg = Debug|Any CPU + {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Debug|x86.Build.0 = Debug|Any CPU {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Release|Any CPU.ActiveCfg = Release|Any CPU {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Release|Any CPU.Build.0 = Release|Any CPU - {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Release|x64.ActiveCfg = Release|x64 - {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Release|x64.Build.0 = Release|x64 - {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Release|x86.ActiveCfg = Release|x86 - {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Release|x86.Build.0 = Release|x86 + {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Release|x64.ActiveCfg = Release|Any CPU + {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Release|x64.Build.0 = Release|Any CPU + {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Release|x86.ActiveCfg = Release|Any CPU + {924AE57C-1EBA-4A1D-A039-8C100B7507A5}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -298,7 +326,8 @@ Global {BD2D4D29-1BD9-40D0-BB31-337D5416B63C} = {327F7880-D9AF-46BD-B45C-3B7E34A01DFD} {5F64B3C3-0C2E-431A-B820-A81BBFC863DA} = {2D5D5227-4DBD-499A-96B1-76A36B03B750} {9559A5F1-080C-4909-B6CF-7E4B3DC55748} = {D3273454-EA07-41D2-BF0B-FCC3675C2483} - {EBFE9719-A44B-4978-A71F-D5C254E7F35A} = {D3273454-EA07-41D2-BF0B-FCC3675C2483} + {EBFE9719-A44B-4978-A71F-D5C254E7F35A} = {A95C3BE1-B850-4265-97A0-777ADCCD437F} + {2822C132-BFFB-4D53-AC5B-E7E47DD81A6E} = {0EF2ACDF-012F-4472-A13A-4272419E2903} {A76B8C8C-0DC5-4DD3-9B1F-02E51A0915F4} = {2D5D5227-4DBD-499A-96B1-76A36B03B750} {56139957-5C29-4E7D-89BD-7D20598B4EAF} = {2D5D5227-4DBD-499A-96B1-76A36B03B750} {6950B18F-A3D2-41A4-AFEC-8B7C49517611} = {2D5D5227-4DBD-499A-96B1-76A36B03B750} diff --git a/NuGet.config b/NuGet.config index 2dfd335477..c88189696c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,6 @@ - diff --git a/README.md b/README.md index 383bb63208..448d756847 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,12 @@ Travis: [![Travis](https://travis-ci.org/aspnet/KestrelHttpServer.svg?branch=dev This repo contains a cross-platform web server for ASP.NET Core. This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. + +## Building from source + +To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. + +Before opening this project in Visual Studio or VS Code, execute `build.cmd /t:Restore` (Windows) or `./build.sh /t:Restore` (Linux/macOS). +This will execute only the part of the build script that downloads and initializes a few required build tools and packages. + +See [developer documentation](https://github.com/aspnet/Home/wiki) for more details. diff --git a/test/Kestrel.Performance/DotSegmentRemovalBenchmark.cs b/benchmarks/Kestrel.Performance/DotSegmentRemovalBenchmark.cs similarity index 100% rename from test/Kestrel.Performance/DotSegmentRemovalBenchmark.cs rename to benchmarks/Kestrel.Performance/DotSegmentRemovalBenchmark.cs diff --git a/test/Kestrel.Performance/ErrorUtilities.cs b/benchmarks/Kestrel.Performance/ErrorUtilities.cs similarity index 100% rename from test/Kestrel.Performance/ErrorUtilities.cs rename to benchmarks/Kestrel.Performance/ErrorUtilities.cs diff --git a/test/Kestrel.Performance/FrameFeatureCollection.cs b/benchmarks/Kestrel.Performance/FrameFeatureCollection.cs similarity index 100% rename from test/Kestrel.Performance/FrameFeatureCollection.cs rename to benchmarks/Kestrel.Performance/FrameFeatureCollection.cs diff --git a/test/Kestrel.Performance/FrameParsingOverheadBenchmark.cs b/benchmarks/Kestrel.Performance/FrameParsingOverheadBenchmark.cs similarity index 100% rename from test/Kestrel.Performance/FrameParsingOverheadBenchmark.cs rename to benchmarks/Kestrel.Performance/FrameParsingOverheadBenchmark.cs diff --git a/test/Kestrel.Performance/FrameWritingBenchmark.cs b/benchmarks/Kestrel.Performance/FrameWritingBenchmark.cs similarity index 100% rename from test/Kestrel.Performance/FrameWritingBenchmark.cs rename to benchmarks/Kestrel.Performance/FrameWritingBenchmark.cs diff --git a/test/Kestrel.Performance/Kestrel.Performance.csproj b/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj similarity index 71% rename from test/Kestrel.Performance/Kestrel.Performance.csproj rename to benchmarks/Kestrel.Performance/Kestrel.Performance.csproj index 2508e6c7f2..3a982816ef 100644 --- a/test/Kestrel.Performance/Kestrel.Performance.csproj +++ b/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj @@ -1,7 +1,5 @@  - - Microsoft.AspNetCore.Server.Kestrel.Performance Microsoft.AspNetCore.Server.Kestrel.Performance @@ -14,9 +12,9 @@ - - - + + + @@ -24,7 +22,7 @@ - + diff --git a/test/Kestrel.Performance/KestrelHttpParserBenchmark.cs b/benchmarks/Kestrel.Performance/KestrelHttpParserBenchmark.cs similarity index 100% rename from test/Kestrel.Performance/KestrelHttpParserBenchmark.cs rename to benchmarks/Kestrel.Performance/KestrelHttpParserBenchmark.cs diff --git a/test/Kestrel.Performance/KnownStringsBenchmark.cs b/benchmarks/Kestrel.Performance/KnownStringsBenchmark.cs similarity index 100% rename from test/Kestrel.Performance/KnownStringsBenchmark.cs rename to benchmarks/Kestrel.Performance/KnownStringsBenchmark.cs diff --git a/test/Kestrel.Performance/Mocks/MockTimeoutControl.cs b/benchmarks/Kestrel.Performance/Mocks/MockTimeoutControl.cs similarity index 100% rename from test/Kestrel.Performance/Mocks/MockTimeoutControl.cs rename to benchmarks/Kestrel.Performance/Mocks/MockTimeoutControl.cs diff --git a/test/Kestrel.Performance/Mocks/MockTrace.cs b/benchmarks/Kestrel.Performance/Mocks/MockTrace.cs similarity index 100% rename from test/Kestrel.Performance/Mocks/MockTrace.cs rename to benchmarks/Kestrel.Performance/Mocks/MockTrace.cs diff --git a/test/Kestrel.Performance/Mocks/NullParser.cs b/benchmarks/Kestrel.Performance/Mocks/NullParser.cs similarity index 100% rename from test/Kestrel.Performance/Mocks/NullParser.cs rename to benchmarks/Kestrel.Performance/Mocks/NullParser.cs diff --git a/test/Kestrel.Performance/PipeThroughputBenchmark.cs b/benchmarks/Kestrel.Performance/PipeThroughputBenchmark.cs similarity index 100% rename from test/Kestrel.Performance/PipeThroughputBenchmark.cs rename to benchmarks/Kestrel.Performance/PipeThroughputBenchmark.cs diff --git a/test/Kestrel.Performance/Program.cs b/benchmarks/Kestrel.Performance/Program.cs similarity index 100% rename from test/Kestrel.Performance/Program.cs rename to benchmarks/Kestrel.Performance/Program.cs diff --git a/test/Kestrel.Performance/Readme.md b/benchmarks/Kestrel.Performance/README.md similarity index 81% rename from test/Kestrel.Performance/Readme.md rename to benchmarks/Kestrel.Performance/README.md index 4088c38007..63db0c3d7e 100644 --- a/test/Kestrel.Performance/Readme.md +++ b/benchmarks/Kestrel.Performance/README.md @@ -8,4 +8,4 @@ To run all use `All` as parameter ``` dotnet run -c Release All ``` -Using no parameter will list all available benchmarks \ No newline at end of file +Using no parameter will list all available benchmarks diff --git a/test/Kestrel.Performance/RequestParsingBenchmark.cs b/benchmarks/Kestrel.Performance/RequestParsingBenchmark.cs similarity index 100% rename from test/Kestrel.Performance/RequestParsingBenchmark.cs rename to benchmarks/Kestrel.Performance/RequestParsingBenchmark.cs diff --git a/test/Kestrel.Performance/RequestParsingData.cs b/benchmarks/Kestrel.Performance/RequestParsingData.cs similarity index 100% rename from test/Kestrel.Performance/RequestParsingData.cs rename to benchmarks/Kestrel.Performance/RequestParsingData.cs diff --git a/test/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs b/benchmarks/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs similarity index 100% rename from test/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs rename to benchmarks/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs diff --git a/test/Kestrel.Performance/ResponseHeadersWritingBenchmark.cs b/benchmarks/Kestrel.Performance/ResponseHeadersWritingBenchmark.cs similarity index 100% rename from test/Kestrel.Performance/ResponseHeadersWritingBenchmark.cs rename to benchmarks/Kestrel.Performance/ResponseHeadersWritingBenchmark.cs diff --git a/test/Kestrel.Performance/StringUtilitiesBenchmark.cs b/benchmarks/Kestrel.Performance/StringUtilitiesBenchmark.cs similarity index 100% rename from test/Kestrel.Performance/StringUtilitiesBenchmark.cs rename to benchmarks/Kestrel.Performance/StringUtilitiesBenchmark.cs diff --git a/test/Kestrel.Performance/configs/CoreConfig.cs b/benchmarks/Kestrel.Performance/configs/CoreConfig.cs similarity index 100% rename from test/Kestrel.Performance/configs/CoreConfig.cs rename to benchmarks/Kestrel.Performance/configs/CoreConfig.cs diff --git a/build/dependencies.props b/build/dependencies.props deleted file mode 100644 index c32a5f7a7c..0000000000 --- a/build/dependencies.props +++ /dev/null @@ -1,16 +0,0 @@ - - - 2.1.0-* - 4.4.0-* - 0.1.0-* - 2.1.1-* - 1.10.0 - 10.0.1 - 4.7.49 - 2.0.0-* - 2.0.0-* - 2.6.0-rdonly-ref-61915-01 - 15.3.0 - 2.3.0-beta3-build3705 - - diff --git a/build/repo.props b/build/repo.props index c1b53db759..c5d91e8a2c 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,5 +1,6 @@ - + + diff --git a/samples/LargeResponseApp/LargeResponseApp.csproj b/samples/LargeResponseApp/LargeResponseApp.csproj index d147ace444..247595b135 100644 --- a/samples/LargeResponseApp/LargeResponseApp.csproj +++ b/samples/LargeResponseApp/LargeResponseApp.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 false @@ -11,8 +9,4 @@ - - - - diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj index 9d017fa070..5dd0ddf608 100644 --- a/samples/SampleApp/SampleApp.csproj +++ b/samples/SampleApp/SampleApp.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 false @@ -17,8 +15,7 @@ - - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000000..5236edee58 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/Kestrel.Core/Kestrel.Core.csproj b/src/Kestrel.Core/Kestrel.Core.csproj index 14304428dc..fa14ffb523 100644 --- a/src/Kestrel.Core/Kestrel.Core.csproj +++ b/src/Kestrel.Core/Kestrel.Core.csproj @@ -1,7 +1,5 @@  - - Microsoft.AspNetCore.Server.Kestrel.Core Microsoft.AspNetCore.Server.Kestrel.Core @@ -12,21 +10,19 @@ true CS1591;$(NoWarn) false - - CurrentRuntime - - - - - - + + + + + + - - + + diff --git a/src/Kestrel.Https/Kestrel.Https.csproj b/src/Kestrel.Https/Kestrel.Https.csproj index ac3ae037a5..284c7f6fb3 100644 --- a/src/Kestrel.Https/Kestrel.Https.csproj +++ b/src/Kestrel.Https/Kestrel.Https.csproj @@ -1,7 +1,5 @@  - - Microsoft.AspNetCore.Server.Kestrel.Https Microsoft.AspNetCore.Server.Kestrel.Https @@ -11,8 +9,6 @@ aspnetcore;kestrel CS1591;$(NoWarn) false - - CurrentRuntime @@ -20,7 +16,7 @@ - + diff --git a/src/Kestrel.Tls/Kestrel.Tls.csproj b/src/Kestrel.Tls/Kestrel.Tls.csproj index 3a7bc3d924..08ef9da8e2 100644 --- a/src/Kestrel.Tls/Kestrel.Tls.csproj +++ b/src/Kestrel.Tls/Kestrel.Tls.csproj @@ -1,7 +1,5 @@  - - Microsoft.AspNetCore.Server.Kestrel.Tls Microsoft.AspNetCore.Server.Kestrel.Tls @@ -10,8 +8,6 @@ aspnetcore;kestrel CS1591;$(NoWarn) false - - CurrentRuntime true @@ -20,7 +16,7 @@ - + diff --git a/src/Kestrel.Transport.Abstractions/Kestrel.Transport.Abstractions.csproj b/src/Kestrel.Transport.Abstractions/Kestrel.Transport.Abstractions.csproj index 3ecaa3a789..a9e754a8ad 100644 --- a/src/Kestrel.Transport.Abstractions/Kestrel.Transport.Abstractions.csproj +++ b/src/Kestrel.Transport.Abstractions/Kestrel.Transport.Abstractions.csproj @@ -1,7 +1,5 @@  - - Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions diff --git a/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj b/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj index 78b2e79bc8..d7324df34d 100644 --- a/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj +++ b/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj @@ -1,7 +1,5 @@  - - Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv @@ -15,10 +13,10 @@ - - - - + + + + diff --git a/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj b/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj index f28cf1a9f3..9d1f419dc3 100644 --- a/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj +++ b/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj @@ -1,7 +1,5 @@  - - Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets @@ -12,13 +10,11 @@ true CS1591;$(NoWarn) false - - CurrentRuntime - - + + diff --git a/src/Kestrel/Kestrel.csproj b/src/Kestrel/Kestrel.csproj index 0afd53fb6d..ab269185a2 100644 --- a/src/Kestrel/Kestrel.csproj +++ b/src/Kestrel/Kestrel.csproj @@ -1,7 +1,5 @@  - - Microsoft.AspNetCore.Server.Kestrel Microsoft.AspNetCore.Server.Kestrel @@ -14,7 +12,7 @@ - + diff --git a/src/Protocols.Abstractions/Protocols.Abstractions.csproj b/src/Protocols.Abstractions/Protocols.Abstractions.csproj index 233f0c3a2b..32fd561e98 100644 --- a/src/Protocols.Abstractions/Protocols.Abstractions.csproj +++ b/src/Protocols.Abstractions/Protocols.Abstractions.csproj @@ -1,5 +1,4 @@ - Microsoft.AspNetCore.Protocols.Abstractions @@ -11,20 +10,16 @@ true CS1591;$(NoWarn) false - - CurrentRuntime - - - - - - - - - + + + + + + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props new file mode 100644 index 0000000000..7039b276a4 --- /dev/null +++ b/test/Directory.Build.props @@ -0,0 +1,24 @@ + + + + + + true + + + + + + + + + + + + + + + diff --git a/test/Kestrel.Core.Tests/HuffmanTests.cs b/test/Kestrel.Core.Tests/HuffmanTests.cs index 7e0375c5da..f075bbc7ba 100644 --- a/test/Kestrel.Core.Tests/HuffmanTests.cs +++ b/test/Kestrel.Core.Tests/HuffmanTests.cs @@ -52,7 +52,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests [Theory] [MemberData(nameof(HuffmanData))] - public void HuffmanEncodeDecode(int code, uint encoded, int bitLength) + public void HuffmanEncodeDecode( + int code, +// Suppresses the warning about an unused theory parameter because +// this test shares data with other methods +#pragma warning disable xUnit1026 + uint encoded, +#pragma warning restore xUnit1026 + int bitLength) { Assert.Equal(code, Huffman.Decode(Huffman.Encode(code).encoded, out var decodedBits)); Assert.Equal(bitLength, decodedBits); diff --git a/test/Kestrel.Core.Tests/Kestrel.Core.Tests.csproj b/test/Kestrel.Core.Tests/Kestrel.Core.Tests.csproj index 469209bfd9..a23522d606 100644 --- a/test/Kestrel.Core.Tests/Kestrel.Core.Tests.csproj +++ b/test/Kestrel.Core.Tests/Kestrel.Core.Tests.csproj @@ -1,23 +1,14 @@  - - Microsoft.AspNetCore.Server.Kestrel.Core.Tests Microsoft.AspNetCore.Server.Kestrel.Core.Tests netcoreapp2.0;net461 netcoreapp2.0 true - - - true - @@ -27,13 +18,9 @@ - - - - - - - + + + diff --git a/test/Kestrel.FunctionalTests/AddressRegistrationTests.cs b/test/Kestrel.FunctionalTests/AddressRegistrationTests.cs index fbbd9038ab..b9f6e4303a 100644 --- a/test/Kestrel.FunctionalTests/AddressRegistrationTests.cs +++ b/test/Kestrel.FunctionalTests/AddressRegistrationTests.cs @@ -383,7 +383,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { options.Listen(new IPEndPoint(IPAddress.Loopback, 0), listenOptions => { - listenOptions.UseHttps("testCert.pfx", "testPassword"); + listenOptions.UseHttps(TestResources.TestCertificatePath, "testPassword"); }); }) .UseUrls(useUrlsAddress) @@ -423,7 +423,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { options.Listen(new IPEndPoint(IPAddress.Loopback, 0), listenOptions => { - listenOptions.UseHttps("testCert.pfx", "testPassword"); + listenOptions.UseHttps(TestResources.TestCertificatePath, "testPassword"); }); }) .UseUrls($"http://127.0.0.1:0") @@ -461,7 +461,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests { options.Listen(new IPEndPoint(IPAddress.Loopback, 0), listenOptions => { - listenOptions.UseHttps("testCert.pfx", "testPassword"); + listenOptions.UseHttps(TestResources.TestCertificatePath, "testPassword"); }); }) .PreferHostingUrls(true) diff --git a/test/Kestrel.FunctionalTests/Kestrel.FunctionalTests.csproj b/test/Kestrel.FunctionalTests/Kestrel.FunctionalTests.csproj index 845ea0f84c..3ed0a438b9 100644 --- a/test/Kestrel.FunctionalTests/Kestrel.FunctionalTests.csproj +++ b/test/Kestrel.FunctionalTests/Kestrel.FunctionalTests.csproj @@ -1,7 +1,5 @@  - - Microsoft.AspNetCore.Server.Kestrel.FunctionalTests Microsoft.AspNetCore.Server.Kestrel.FunctionalTests @@ -9,18 +7,11 @@ netcoreapp2.0 $(DefineConstants);MACOS true - - - true - @@ -33,14 +24,10 @@ - - - - - - - - + + + + diff --git a/test/Kestrel.FunctionalTests/xunit.runner.json b/test/Kestrel.FunctionalTests/xunit.runner.json deleted file mode 100644 index c76780941f..0000000000 --- a/test/Kestrel.FunctionalTests/xunit.runner.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/xunit.runner.schema", - "methodDisplay": "method", - "longRunningTestSeconds": 60 -} diff --git a/test/Kestrel.Tests/Kestrel.Tests.csproj b/test/Kestrel.Tests/Kestrel.Tests.csproj index b05d9659a9..91bb00eb96 100644 --- a/test/Kestrel.Tests/Kestrel.Tests.csproj +++ b/test/Kestrel.Tests/Kestrel.Tests.csproj @@ -1,7 +1,5 @@  - - Microsoft.AspNetCore.Server.Kestrel.Tests Microsoft.AspNetCore.Server.Kestrel.Tests @@ -9,18 +7,8 @@ netcoreapp2.0 - - - - - - - - - - diff --git a/test/Kestrel.Tests/xunit.runner.json b/test/Kestrel.Tests/xunit.runner.json deleted file mode 100644 index c76780941f..0000000000 --- a/test/Kestrel.Tests/xunit.runner.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/xunit.runner.schema", - "methodDisplay": "method", - "longRunningTestSeconds": 60 -} diff --git a/test/Kestrel.Transport.Libuv.Tests/Kestrel.Transport.Libuv.Tests.csproj b/test/Kestrel.Transport.Libuv.Tests/Kestrel.Transport.Libuv.Tests.csproj index 575504ff6f..4c4aa8b562 100644 --- a/test/Kestrel.Transport.Libuv.Tests/Kestrel.Transport.Libuv.Tests.csproj +++ b/test/Kestrel.Transport.Libuv.Tests/Kestrel.Transport.Libuv.Tests.csproj @@ -1,7 +1,5 @@  - - Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests @@ -9,17 +7,10 @@ netcoreapp2.0 true true - - - true - @@ -28,13 +19,9 @@ - - - - - - - + + + diff --git a/test/Kestrel.Transport.Libuv.Tests/xunit.runner.json b/test/Kestrel.Transport.Libuv.Tests/xunit.runner.json deleted file mode 100644 index 3a5192e57d..0000000000 --- a/test/Kestrel.Transport.Libuv.Tests/xunit.runner.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/xunit.runner.schema", - "appDomain": "denied", - "methodDisplay": "method", - "longRunningTestSeconds": 60 -} diff --git a/test/Kestrel.Core.Tests/xunit.runner.json b/test/xunit.runner.json similarity index 100% rename from test/Kestrel.Core.Tests/xunit.runner.json rename to test/xunit.runner.json diff --git a/tools/CodeGenerator/CodeGenerator.csproj b/tools/CodeGenerator/CodeGenerator.csproj index 91cec270ff..51021280d2 100644 --- a/tools/CodeGenerator/CodeGenerator.csproj +++ b/tools/CodeGenerator/CodeGenerator.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0 Exe @@ -14,8 +12,8 @@ - - + +