From 932b6ed53a622a3a1b6616c550cf3e29fb0223eb Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 16 Feb 2017 09:32:03 -0800 Subject: [PATCH] Cleanup MSBuild conversion Remove runtimeconfig.template.json Remove ToolsVersion attribute Use repo.targets instead of makefile.shade Rename code gen app to shorter name Use GetOSPlatform task Upgrade tests to .NET Framework 4.5.2 Cleanup solution configurations. Set the class libraries to AnyCPU even when on the x86 or x64 solution config. --- .gitignore | 1 + KestrelHttpServer.sln | 72 +++++++++---------- NuGet.config | 2 +- appveyor.yml | 2 +- build/repo.props | 5 ++ build/repo.targets | 5 ++ .../LargeResponseApp/LargeResponseApp.csproj | 1 + .../runtimeconfig.template.json | 5 -- samples/SampleApp/SampleApp.csproj | 2 + samples/SampleApp/runtimeconfig.template.json | 5 -- ...oft.AspNetCore.Server.Kestrel.Https.csproj | 3 + ...Core.Server.Kestrel.FunctionalTests.csproj | 28 ++++---- .../Properties/AssemblyInfo.cs | 2 +- .../.notest | 0 ...pNetCore.Server.Kestrel.Performance.csproj | 5 ++ .../runtimeconfig.template.json | 5 -- ...soft.AspNetCore.Server.KestrelTests.csproj | 11 +-- .../UvStreamHandleTests.cs | 5 +- .../CodeGenerator.csproj} | 6 ++ .../FrameFeatureCollection.cs | 5 +- .../KnownHeaders.cs | 17 +++-- .../Program.cs | 5 +- version.props | 2 +- 23 files changed, 113 insertions(+), 81 deletions(-) create mode 100644 build/repo.props create mode 100644 build/repo.targets delete mode 100644 samples/LargeResponseApp/runtimeconfig.template.json delete mode 100644 samples/SampleApp/runtimeconfig.template.json delete mode 100644 test/Microsoft.AspNetCore.Server.Kestrel.Performance/.notest delete mode 100644 test/Microsoft.AspNetCore.Server.Kestrel.Performance/runtimeconfig.template.json rename tools/{Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.csproj => CodeGenerator/CodeGenerator.csproj} (58%) rename tools/{Microsoft.AspNetCore.Server.Kestrel.GeneratedCode => CodeGenerator}/FrameFeatureCollection.cs (95%) rename tools/{Microsoft.AspNetCore.Server.Kestrel.GeneratedCode => CodeGenerator}/KnownHeaders.cs (98%) rename tools/{Microsoft.AspNetCore.Server.Kestrel.GeneratedCode => CodeGenerator}/Program.cs (86%) diff --git a/.gitignore b/.gitignore index af0898e29a..317cee961f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ packages/ artifacts/ PublishProfiles/ .vs/ +.vscode/ *.user *.suo *.cache diff --git a/KestrelHttpServer.sln b/KestrelHttpServer.sln index cceaccce52..d935b2d9b4 100644 --- a/KestrelHttpServer.sln +++ b/KestrelHttpServer.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26117.0 +VisualStudioVersion = 15.0.26213.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7972A5D6-3385-4127-9277-428506DD44FF}" ProjectSection(SolutionItems) = preProject @@ -46,7 +46,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\Sample EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LargeResponseApp", "samples\LargeResponseApp\LargeResponseApp.csproj", "{B35D4D31-E74C-4646-8A11-7A7A40F0021E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.GeneratedCode", "tools\Microsoft.AspNetCore.Server.Kestrel.GeneratedCode\Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.csproj", "{BD2D4D29-1BD9-40D0-BB31-337D5416B63C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeGenerator", "tools\CodeGenerator\CodeGenerator.csproj", "{BD2D4D29-1BD9-40D0-BB31-337D5416B63C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "src\Microsoft.AspNetCore.Server.Kestrel.Https\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{5F64B3C3-0C2E-431A-B820-A81BBFC863DA}" EndProject @@ -71,16 +71,16 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Debug|x64.ActiveCfg = Debug|x64 - {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Debug|x64.Build.0 = Debug|x64 - {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Debug|x86.ActiveCfg = Debug|x86 - {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Debug|x86.Build.0 = Debug|x86 + {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Debug|x64.ActiveCfg = Debug|Any CPU + {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Debug|x64.Build.0 = Debug|Any CPU + {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Debug|x86.ActiveCfg = Debug|Any CPU + {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Debug|x86.Build.0 = Debug|Any CPU {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Release|Any CPU.Build.0 = Release|Any CPU - {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Release|x64.ActiveCfg = Release|x64 - {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Release|x64.Build.0 = Release|x64 - {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Release|x86.ActiveCfg = Release|x86 - {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Release|x86.Build.0 = Release|x86 + {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Release|x64.ActiveCfg = Release|Any CPU + {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Release|x64.Build.0 = Release|Any CPU + {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Release|x86.ActiveCfg = Release|Any CPU + {F510611A-3BEE-4B88-A613-5F4A74ED82A1}.Release|x86.Build.0 = Release|Any CPU {37F3BFB2-6454-49E5-9D7F-581BF755CCFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {37F3BFB2-6454-49E5-9D7F-581BF755CCFE}.Debug|Any CPU.Build.0 = Debug|Any CPU {37F3BFB2-6454-49E5-9D7F-581BF755CCFE}.Debug|x64.ActiveCfg = Debug|x64 @@ -91,8 +91,8 @@ Global {37F3BFB2-6454-49E5-9D7F-581BF755CCFE}.Release|Any CPU.Build.0 = Release|Any CPU {37F3BFB2-6454-49E5-9D7F-581BF755CCFE}.Release|x64.ActiveCfg = Release|x64 {37F3BFB2-6454-49E5-9D7F-581BF755CCFE}.Release|x64.Build.0 = Release|x64 - {37F3BFB2-6454-49E5-9D7F-581BF755CCFE}.Release|x86.ActiveCfg = Release|x86 - {37F3BFB2-6454-49E5-9D7F-581BF755CCFE}.Release|x86.Build.0 = Release|x86 + {37F3BFB2-6454-49E5-9D7F-581BF755CCFE}.Release|x86.ActiveCfg = Release|Any CPU + {37F3BFB2-6454-49E5-9D7F-581BF755CCFE}.Release|x86.Build.0 = Release|Any CPU {2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Debug|x64.ActiveCfg = Debug|x64 @@ -103,8 +103,8 @@ Global {2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Release|Any CPU.Build.0 = Release|Any CPU {2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Release|x64.ActiveCfg = Release|x64 {2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Release|x64.Build.0 = Release|x64 - {2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Release|x86.ActiveCfg = Release|x86 - {2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Release|x86.Build.0 = Release|x86 + {2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Release|x86.ActiveCfg = Release|Any CPU + {2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Release|x86.Build.0 = Release|Any CPU {B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Debug|Any CPU.Build.0 = Debug|Any CPU {B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Debug|x64.ActiveCfg = Debug|x64 @@ -115,32 +115,32 @@ Global {B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Release|Any CPU.Build.0 = Release|Any CPU {B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Release|x64.ActiveCfg = Release|x64 {B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Release|x64.Build.0 = Release|x64 - {B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Release|x86.ActiveCfg = Release|x86 - {B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Release|x86.Build.0 = Release|x86 + {B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Release|x86.ActiveCfg = Release|Any CPU + {B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Release|x86.Build.0 = Release|Any CPU {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Debug|x64.ActiveCfg = Debug|x64 - {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Debug|x64.Build.0 = Debug|x64 - {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Debug|x86.ActiveCfg = Debug|x86 - {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Debug|x86.Build.0 = Debug|x86 + {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Debug|x64.ActiveCfg = Debug|Any CPU + {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Debug|x64.Build.0 = Debug|Any CPU + {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Debug|x86.ActiveCfg = Debug|Any CPU + {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Debug|x86.Build.0 = Debug|Any CPU {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Release|Any CPU.ActiveCfg = Release|Any CPU {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Release|Any CPU.Build.0 = Release|Any CPU - {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Release|x64.ActiveCfg = Release|x64 - {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Release|x64.Build.0 = Release|x64 - {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Release|x86.ActiveCfg = Release|x86 - {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Release|x86.Build.0 = Release|x86 + {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Release|x64.ActiveCfg = Release|Any CPU + {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Release|x64.Build.0 = Release|Any CPU + {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Release|x86.ActiveCfg = Release|Any CPU + {BD2D4D29-1BD9-40D0-BB31-337D5416B63C}.Release|x86.Build.0 = Release|Any CPU {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Debug|x64.ActiveCfg = Debug|x64 - {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Debug|x64.Build.0 = Debug|x64 - {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Debug|x86.ActiveCfg = Debug|x86 - {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Debug|x86.Build.0 = Debug|x86 + {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Debug|x64.ActiveCfg = Debug|Any CPU + {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Debug|x64.Build.0 = Debug|Any CPU + {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Debug|x86.ActiveCfg = Debug|Any CPU + {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Debug|x86.Build.0 = Debug|Any CPU {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Release|Any CPU.Build.0 = Release|Any CPU - {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Release|x64.ActiveCfg = Release|x64 - {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Release|x64.Build.0 = Release|x64 - {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Release|x86.ActiveCfg = Release|x86 - {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Release|x86.Build.0 = Release|x86 + {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Release|x64.ActiveCfg = Release|Any CPU + {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Release|x64.Build.0 = Release|Any CPU + {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Release|x86.ActiveCfg = Release|Any CPU + {5F64B3C3-0C2E-431A-B820-A81BBFC863DA}.Release|x86.Build.0 = Release|Any CPU {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Debug|Any CPU.Build.0 = Debug|Any CPU {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Debug|x64.ActiveCfg = Debug|x64 @@ -151,8 +151,8 @@ Global {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Release|Any CPU.Build.0 = Release|Any CPU {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Release|x64.ActiveCfg = Release|x64 {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Release|x64.Build.0 = Release|x64 - {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Release|x86.ActiveCfg = Release|x86 - {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Release|x86.Build.0 = Release|x86 + {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Release|x86.ActiveCfg = Release|Any CPU + {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Release|x86.Build.0 = Release|Any CPU {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Debug|Any CPU.Build.0 = Debug|Any CPU {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Debug|x64.ActiveCfg = Debug|x64 @@ -163,8 +163,8 @@ Global {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|Any CPU.Build.0 = Release|Any CPU {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|x64.ActiveCfg = Release|x64 {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|x64.Build.0 = Release|x64 - {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|x86.ActiveCfg = Release|x86 - {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|x86.Build.0 = Release|x86 + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|x86.ActiveCfg = Release|Any CPU + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/NuGet.config b/NuGet.config index 7e1d6d073e..69bab2da9a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/appveyor.yml b/appveyor.yml index 7617e58a1e..13c0650228 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,4 +11,4 @@ build_script: clone_depth: 1 test: off deploy: off -os: Visual Studio 2017 RC \ No newline at end of file +os: Visual Studio 2017 RC diff --git a/build/repo.props b/build/repo.props new file mode 100644 index 0000000000..a5d5b0f21d --- /dev/null +++ b/build/repo.props @@ -0,0 +1,5 @@ + + + + + diff --git a/build/repo.targets b/build/repo.targets new file mode 100644 index 0000000000..d05edf3572 --- /dev/null +++ b/build/repo.targets @@ -0,0 +1,5 @@ + + + + + diff --git a/samples/LargeResponseApp/LargeResponseApp.csproj b/samples/LargeResponseApp/LargeResponseApp.csproj index 45de356f95..3af02d73c5 100644 --- a/samples/LargeResponseApp/LargeResponseApp.csproj +++ b/samples/LargeResponseApp/LargeResponseApp.csproj @@ -7,6 +7,7 @@ Exe win7-x64 + false diff --git a/samples/LargeResponseApp/runtimeconfig.template.json b/samples/LargeResponseApp/runtimeconfig.template.json deleted file mode 100644 index 7305508a37..0000000000 --- a/samples/LargeResponseApp/runtimeconfig.template.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "configProperties": { - "System.GC.Server": true - } -} \ No newline at end of file diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj index 19792a43e2..7d7dab864e 100644 --- a/samples/SampleApp/SampleApp.csproj +++ b/samples/SampleApp/SampleApp.csproj @@ -7,6 +7,8 @@ Exe win7-x64 + false + 1.2.0-* diff --git a/samples/SampleApp/runtimeconfig.template.json b/samples/SampleApp/runtimeconfig.template.json deleted file mode 100644 index 7305508a37..0000000000 --- a/samples/SampleApp/runtimeconfig.template.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "configProperties": { - "System.GC.Server": true - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj index 7765f0e77a..a314782a45 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj +++ b/src/Microsoft.AspNetCore.Server.Kestrel.Https/Microsoft.AspNetCore.Server.Kestrel.Https.csproj @@ -12,6 +12,9 @@ + + + diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj index fa3f75fdba..ac06d2b346 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj @@ -6,7 +6,7 @@ netcoreapp1.1;net452 netcoreapp1.1 - win7-x64 + win7-x64 @@ -16,15 +16,18 @@ - - - + + + + + - + + @@ -35,14 +38,15 @@ - - - - + + + + + - - $(DefineConstants);DARWIN + + $(DefineConstants);$(OSPlatform.ToUpperInvariant()) - + \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Properties/AssemblyInfo.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Properties/AssemblyInfo.cs index e067e94cf3..24fe027b5e 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Properties/AssemblyInfo.cs +++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Properties/AssemblyInfo.cs @@ -1,8 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +#if MACOS using Xunit; -#if DARWIN [assembly: CollectionBehavior(DisableTestParallelization = true)] #endif diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/.notest b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/.notest deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj index f234b8fb10..bae45dfafb 100644 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj +++ b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj @@ -5,6 +5,8 @@ netcoreapp1.1 Exe + true + false @@ -18,6 +20,9 @@ + + + diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/runtimeconfig.template.json b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/runtimeconfig.template.json deleted file mode 100644 index 7305508a37..0000000000 --- a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/runtimeconfig.template.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "configProperties": { - "System.GC.Server": true - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj b/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj index 7af504a271..322597f3a2 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj @@ -17,16 +17,19 @@ + + + + + + - - - - + \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/UvStreamHandleTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/UvStreamHandleTests.cs index 51dbce5b5d..355447f545 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/UvStreamHandleTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/UvStreamHandleTests.cs @@ -1,4 +1,7 @@ -using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Server.Kestrel.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Internal.Networking; using Microsoft.AspNetCore.Server.KestrelTests.TestHelpers; using Moq; diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.csproj b/tools/CodeGenerator/CodeGenerator.csproj similarity index 58% rename from tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.csproj rename to tools/CodeGenerator/CodeGenerator.csproj index dafd54104a..c99ff50075 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode.csproj +++ b/tools/CodeGenerator/CodeGenerator.csproj @@ -5,6 +5,7 @@ netcoreapp1.1 Exe + false @@ -12,4 +13,9 @@ + + $(MSBuildThisFileDirectory)..\..\src\Microsoft.AspNetCore.Server.Kestrel\Internal\Http + FrameHeaders.Generated.cs Frame.Generated.cs + + diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs b/tools/CodeGenerator/FrameFeatureCollection.cs similarity index 95% rename from tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs rename to tools/CodeGenerator/FrameFeatureCollection.cs index 9f46ddfd11..22e6a9316b 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs +++ b/tools/CodeGenerator/FrameFeatureCollection.cs @@ -1,10 +1,13 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Features.Authentication; -namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode +namespace CodeGenerator { // This project can output the Class library as a NuGet Package. // To enable this option, right-click on the project and select the Properties menu item. In the Build tab select "Produce outputs on build". diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/KnownHeaders.cs b/tools/CodeGenerator/KnownHeaders.cs similarity index 98% rename from tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/KnownHeaders.cs rename to tools/CodeGenerator/KnownHeaders.cs index 96cc6a350a..0e2fdf858f 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/KnownHeaders.cs +++ b/tools/CodeGenerator/KnownHeaders.cs @@ -1,10 +1,13 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text; -namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode +namespace CodeGenerator { // This project can output the Class library as a NuGet Package. // To enable this option, right-click on the project and select the Properties menu item. In the Build tab select "Produce outputs on build". @@ -20,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode return condition ? formatter() : ""; } - static string AppendSwitch(IEnumerable> values, string className) => + static string AppendSwitch(IEnumerable> values, string className) => $@"var pUL = (ulong*)pUB; var pUI = (uint*)pUB; var pUS = (ushort*)pUB; @@ -73,7 +76,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode public string TestNotBit() => $"(_bits & {1L << Index}L) == 0"; public string SetBit() => $"_bits |= {1L << Index}L"; public string ClearBit() => $"_bits &= ~{1L << Index}L"; - + public string EqualIgnoreCaseBytes() { var result = ""; @@ -530,10 +533,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http }} else ")} {{ - var valueCount = _headers._{header.Identifier}.Count; - for (var i = 0; i < valueCount; i++) + var valueCount = _headers._{header.Identifier}.Count; + for (var i = 0; i < valueCount; i++) {{ - var value = _headers._{header.Identifier}[i]; + var value = _headers._{header.Identifier}[i]; if (value != null) {{ output.CopyFrom(_headerBytes, {header.BytesOffset}, {header.BytesCount}); @@ -571,7 +574,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http AppendNonPrimaryHeaders(ptr, keyOffset, keyLength, value); }} }} - + private unsafe void AppendNonPrimaryHeaders(byte* pKeyBytes, int keyOffset, int keyLength, string value) {{ var pUB = pKeyBytes; diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Program.cs b/tools/CodeGenerator/Program.cs similarity index 86% rename from tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Program.cs rename to tools/CodeGenerator/Program.cs index f0a0814b16..102839b6b7 100644 --- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/Program.cs +++ b/tools/CodeGenerator/Program.cs @@ -1,7 +1,10 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + using System; using System.IO; -namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode +namespace CodeGenerator { public class Program { diff --git a/version.props b/version.props index e77c8d9c38..29f91e170d 100644 --- a/version.props +++ b/version.props @@ -4,4 +4,4 @@ 1.2.0 preview1 - \ No newline at end of file +