Skip to content

Commit e9e6b53

Browse files
TratcherTratcher
authored
Restructure shared http code (#18967)
* Restructure shared runtime code * More qpack * Header field * HttpSys tests * Casing
1 parent 1bd2b5f commit e9e6b53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+44
-140
lines changed

‎src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -7,7 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<Compile Include="$(SharedSourceRoot)Http2\**\*.cs" LinkBase="Shared\Http2\" />
10+
<Compile Include="$(SharedSourceRoot)runtime\Http2\**\*.cs" LinkBase="Shared\Http2\" />
11+
<Compile Include="$(SharedSourceRoot)runtime\IHttpHeadersHandler.cs" LinkBase="Shared\IHttpHeadersHandler.cs" />
12+
<Compile Include="$(SharedSourceRoot)runtime\SR.cs" LinkBase="Shared\SR.cs" />
1113
<Compile Include="$(SharedSourceRoot)Http2cat\**\*.cs" LinkBase="Shared\Http2cat" />
1214
<Compile Include="$(SharedSourceRoot)ServerInfrastructure\**\*.cs" LinkBase="Shared\" />
1315
<Compile Include="$(SharedSourceRoot)TaskToApm.cs" Link="Shared\TaskToApm.cs" />
@@ -36,7 +38,7 @@
3638
<ManifestResourceName>Microsoft.AspNetCore.Server.SharedStrings</ManifestResourceName>
3739
<Generator></Generator>
3840
</EmbeddedResource>
39-
<EmbeddedResource Include="$(SharedSourceRoot)Http2\SR.resx" Link="Shared\Http2\SR.resx">
41+
<EmbeddedResource Include="$(SharedSourceRoot)runtime\SR.resx" Link="Shared\runtime\SR.resx">
4042
<ManifestResourceName>System.Net.Http.SR</ManifestResourceName>
4143
<Generator></Generator>
4244
</EmbeddedResource>

‎src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
<Compile Include="$(SharedSourceRoot)CertificateGeneration\**\*.cs" />
1717
<Compile Include="$(SharedSourceRoot)ValueTaskExtensions\**\*.cs" />
1818
<Compile Include="$(SharedSourceRoot)UrlDecoder\**\*.cs" />
19-
<Compile Include="$(SharedSourceRoot)Http2\**\*.cs" LinkBase="Shared\Http2\" />
20-
<Compile Include="$(SharedSourceRoot)Http3\**\*.cs" LinkBase="Shared\Http3\" />
19+
<Compile Include="$(SharedSourceRoot)runtime\**\*.cs" LinkBase="Shared\runtime\" />
2120
<Compile Include="$(SharedSourceRoot)ServerInfrastructure\**\*.cs" LinkBase="Shared\" />
2221
<Compile Include="$(RepoRoot)src\Shared\TaskToApm.cs" Link="Internal\TaskToApm.cs" />
2322
</ItemGroup>
@@ -42,7 +41,7 @@
4241
<ManifestResourceName>Microsoft.AspNetCore.Server.SharedStrings</ManifestResourceName>
4342
<Generator></Generator>
4443
</EmbeddedResource>
45-
<EmbeddedResource Include="$(SharedSourceRoot)Http2\SR.resx" Link="Shared\Http2\SR.resx">
44+
<EmbeddedResource Include="$(SharedSourceRoot)runtime\SR.resx" Link="Shared\runtime\SR.resx">
4645
<ManifestResourceName>System.Net.Http.SR</ManifestResourceName>
4746
<Generator></Generator>
4847
</EmbeddedResource>

‎src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -15,7 +15,7 @@
1515
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
1616
<Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
1717
<Compile Include="$(KestrelSharedSourceRoot)\CorrelationIdGenerator.cs" Link="Internal\CorrelationIdGenerator.cs" />
18-
<Compile Include="$(SharedSourceRoot)test\Shared.Tests\Http2\**\*.cs" Link="Shared\Http2\%(Filename)%(Extension)" />
18+
<Compile Include="$(SharedSourceRoot)test\Shared.Tests\runtime\**\*.cs" Link="Shared\runtime\%(Filename)%(Extension)" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/Servers/Kestrel/samples/http2cat/http2cat.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -7,7 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<Compile Include="$(SharedSourceRoot)Http2\**\*.cs" LinkBase="Shared\Http2\" />
10+
<Compile Include="$(SharedSourceRoot)runtime\Http2\**\*.cs" LinkBase="Shared\Http2" />
11+
<Compile Include="$(SharedSourceRoot)runtime\IHttpHeadersHandler.cs" LinkBase="Shared\IHttpHeadersHandler.cs" />
12+
<Compile Include="$(SharedSourceRoot)runtime\SR.cs" LinkBase="Shared\SR.cs" />
1113
<Compile Include="$(SharedSourceRoot)Http2cat\**\*.cs" LinkBase="Shared\Http2cat" />
1214
<Compile Include="$(SharedSourceRoot)ServerInfrastructure\**\*.cs" LinkBase="Shared\" />
1315
<Compile Include="$(SharedSourceRoot)TaskToApm.cs" Link="Shared\TaskToApm.cs" />
@@ -25,7 +27,7 @@
2527
<ManifestResourceName>Microsoft.AspNetCore.Server.SharedStrings</ManifestResourceName>
2628
<Generator></Generator>
2729
</EmbeddedResource>
28-
<EmbeddedResource Include="$(SharedSourceRoot)Http2\SR.resx" Link="Shared\Http2\SR.resx">
30+
<EmbeddedResource Include="$(SharedSourceRoot)runtime\SR.resx" Link="Shared\runtime\SR.resx">
2931
<ManifestResourceName>System.Net.Http.SR</ManifestResourceName>
3032
<Generator></Generator>
3133
</EmbeddedResource>

‎src/Shared/Http2/CopyToAspNetCore.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/Shared/Http2/CopyToRuntime.cmd

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/Shared/Http2/CopyToRuntime.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/Shared/Http3/CopyToAspNetCore.cmd

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/Shared/Http3/ReadMe.SharedCode.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎src/Shared/Http2/CopyToAspNetCore.cmd renamed to ‎src/Shared/runtime/CopyToAspNetCore.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ IF [%remote_repo%] == [] (
1010

1111
echo ASPNETCORE_REPO: %remote_repo%
1212

13-
robocopy . %remote_repo%\src\Shared\Http2 /MIR
14-
robocopy .\..\..\..\..\..\tests\Tests\System\Net\Http2\ %remote_repo%\src\Shared\test\Shared.Tests\Http2 /MIR
13+
robocopy . %remote_repo%\src\Shared\runtime /MIR
14+
robocopy .\..\..\..\..\..\tests\Tests\System\Net\aspnetcore\ %remote_repo%\src\Shared\test\Shared.Tests\runtime /MIR

0 commit comments

Comments
 (0)