diff --git a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj index 16991ba87a..d0a2c7558b 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj +++ b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj @@ -1,4 +1,4 @@ - + $(DefaultNetCoreTargetFramework) @@ -7,7 +7,9 @@ - + + + @@ -36,7 +38,7 @@ Microsoft.AspNetCore.Server.SharedStrings - + System.Net.Http.SR diff --git a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index fc8c2f69d9..789564054a 100644 --- a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -16,8 +16,7 @@ - - + @@ -42,7 +41,7 @@ Microsoft.AspNetCore.Server.SharedStrings - + System.Net.Http.SR diff --git a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj index 32d1139d42..108edc514d 100644 --- a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj +++ b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj @@ -1,4 +1,4 @@ - + $(DefaultNetCoreTargetFramework) @@ -15,7 +15,7 @@ - + diff --git a/src/Servers/Kestrel/samples/http2cat/http2cat.csproj b/src/Servers/Kestrel/samples/http2cat/http2cat.csproj index f668fcfcf0..b9c20f8799 100644 --- a/src/Servers/Kestrel/samples/http2cat/http2cat.csproj +++ b/src/Servers/Kestrel/samples/http2cat/http2cat.csproj @@ -1,4 +1,4 @@ - + Exe @@ -7,7 +7,9 @@ - + + + @@ -25,7 +27,7 @@ Microsoft.AspNetCore.Server.SharedStrings - + System.Net.Http.SR diff --git a/src/Shared/Http2/CopyToAspNetCore.sh b/src/Shared/Http2/CopyToAspNetCore.sh deleted file mode 100644 index f8d073366e..0000000000 --- a/src/Shared/Http2/CopyToAspNetCore.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -if [[ -n "$1" ]]; then - remote_repo="$1" -else - remote_repo="$ASPNETCORE_REPO" -fi - -if [[ -z "$remote_repo" ]]; then - echo The 'ASPNETCORE_REPO' environment variable or command line parameter is not set, aborting. - exit 1 -fi - -cd "$(dirname "$0")" || exit 1 - -echo "ASPNETCORE_REPO: $remote_repo" - -rsync -av --delete ./ "$remote_repo"/src/Shared/Http2 -rsync -av --delete ./../../../../../tests/Tests/System/Net/Http2/ "$remote_repo"/src/Shared/test/Shared.Tests/Http2 diff --git a/src/Shared/Http2/CopyToRuntime.cmd b/src/Shared/Http2/CopyToRuntime.cmd deleted file mode 100644 index 7497eadd52..0000000000 --- a/src/Shared/Http2/CopyToRuntime.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@ECHO OFF -SETLOCAL - -if not [%1] == [] (set remote_repo=%1) else (set remote_repo=%RUNTIME_REPO%) - -IF [%remote_repo%] == [] ( - echo The 'RUNTIME_REPO' environment variable or command line parameter is not set, aborting. - exit /b 1 -) - -echo RUNTIME_REPO: %remote_repo% - -robocopy . %remote_repo%\src\libraries\Common\src\System\Net\Http\Http2 /MIR -robocopy .\..\test\Shared.Tests\Http2 %remote_repo%\src\libraries\Common\tests\Tests\System\Net\Http2 /MIR diff --git a/src/Shared/Http2/CopyToRuntime.sh b/src/Shared/Http2/CopyToRuntime.sh deleted file mode 100644 index baf10f3b86..0000000000 --- a/src/Shared/Http2/CopyToRuntime.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -if [[ -n "$1" ]]; then - remote_repo="$1" -else - remote_repo="$RUNTIME_REPO" -fi - -if [[ -z "$remote_repo" ]]; then - echo The 'RUNTIME_REPO' environment variable or command line parameter is not set, aborting. - exit 1 -fi - -cd "$(dirname "$0")" || exit 1 - -echo "RUNTIME_REPO: $remote_repo" - -rsync -av --delete ./ "$remote_repo"/src/libraries/Common/src/System/Net/Http/Http2 -rsync -av --delete ./../test/Shared.Tests/Http2/ "$remote_repo"/src/libraries/Common/tests/Tests/System/Net/Http2 diff --git a/src/Shared/Http3/CopyToAspNetCore.cmd b/src/Shared/Http3/CopyToAspNetCore.cmd deleted file mode 100644 index f94a7609fe..0000000000 --- a/src/Shared/Http3/CopyToAspNetCore.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@ECHO OFF -SETLOCAL - -if not [%1] == [] (set remote_repo=%1) else (set remote_repo=%ASPNETCORE_REPO%) - -IF [%remote_repo%] == [] ( - echo The 'ASPNETCORE_REPO' environment variable or command line parameter is not set, aborting. - exit /b 1 -) - -echo ASPNETCORE_REPO: %remote_repo% - -robocopy . %remote_repo%\src\Shared\Http3 /MIR -robocopy .\..\..\..\..\..\tests\Tests\System\Net\Http3\ %remote_repo%\src\Shared\test\Shared.Tests\Http3 /MIR diff --git a/src/Shared/Http3/ReadMe.SharedCode.md b/src/Shared/Http3/ReadMe.SharedCode.md deleted file mode 100644 index 481789b602..0000000000 --- a/src/Shared/Http3/ReadMe.SharedCode.md +++ /dev/null @@ -1,36 +0,0 @@ -The code in this directory is shared between dotnet/runtime and aspnet/AspNetCore. This contains HTTP/3 protocol infrastructure such as a QPACK implementation. Any changes to this dir need to be checked into both repositories. - -dotnet/runtime code paths: -- runtime\src\libraries\Common\src\System\Net\Http\Http3 -- runtime\src\libraries\Common\tests\Tests\System\Net\Http3 -aspnet/AspNetCore code paths: -- AspNetCore\src\Shared\Http3 -- AspNetCore\src\Shared\test\Shared.Tests\Http3 - -## Copying code -To copy code from dotnet/runtime to aspnet/AspNetCore, set ASPNETCORE_REPO to the AspNetCore repo root and then run CopyToAspNetCore.cmd. -To copy code from aspnet/AspNetCore to dotnet/runtime, set RUNTIME_REPO to the runtime repo root and then run CopyToRuntime.cmd. - -## Building dotnet/runtime code: -- https://github.com/dotnet/runtime/blob/master/docs/libraries/building/windows-instructions.md -- https://github.com/dotnet/runtime/blob/master/docs/libraries/project-docs/developer-guide.md -- Run *build.cmd* from the root once: `PS D:\github\runtime> .\build.cmd -subsetCategory libraries` -- Build the individual projects: -- `PS D:\github\dotnet\src\libraries\Common\tests> dotnet msbuild /t:rebuild` -- `PS D:\github\dotnet\src\libraries\System.Net.Http\src> dotnet msbuild /t:rebuild` - -### Running dotnet/runtime tests: -- `PS D:\github\runtime\src\libraries\Common\tests> dotnet msbuild /t:rebuildandtest` -- `PS D:\github\runtime\src\libraries\System.Net.Http\tests\UnitTests> dotnet msbuild /t:rebuildandtest` - -## Building aspnet/AspNetCore code: -- https://github.com/aspnet/AspNetCore/blob/master/docs/BuildFromSource.md -- Run restore in the root once: `PS D:\github\AspNetCore> .\restore.cmd` -- Activate to use the repo local runtime: `PS D:\github\AspNetCore> . .\activate.ps1` -- Build the individual projects: -- `(AspNetCore) PS D:\github\AspNetCore\src\Shared\test\Shared.Tests> dotnet msbuild` -- `(AspNetCore) PS D:\github\AspNetCore\src\servers\Kestrel\core\src> dotnet msbuild` - -### Running aspnet/AspNetCore tests: -- `(AspNetCore) PS D:\github\AspNetCore\src\Shared\test\Shared.Tests> dotnet test` -- `(AspNetCore) PS D:\github\AspNetCore\src\servers\Kestrel\core\test> dotnet test` diff --git a/src/Shared/Http2/CopyToAspNetCore.cmd b/src/Shared/runtime/CopyToAspNetCore.cmd similarity index 62% rename from src/Shared/Http2/CopyToAspNetCore.cmd rename to src/Shared/runtime/CopyToAspNetCore.cmd index 1785929951..43eb681787 100644 --- a/src/Shared/Http2/CopyToAspNetCore.cmd +++ b/src/Shared/runtime/CopyToAspNetCore.cmd @@ -10,5 +10,5 @@ IF [%remote_repo%] == [] ( echo ASPNETCORE_REPO: %remote_repo% -robocopy . %remote_repo%\src\Shared\Http2 /MIR -robocopy .\..\..\..\..\..\tests\Tests\System\Net\Http2\ %remote_repo%\src\Shared\test\Shared.Tests\Http2 /MIR +robocopy . %remote_repo%\src\Shared\runtime /MIR +robocopy .\..\..\..\..\..\tests\Tests\System\Net\aspnetcore\ %remote_repo%\src\Shared\test\Shared.Tests\runtime /MIR diff --git a/src/Shared/Http3/CopyToAspNetCore.sh b/src/Shared/runtime/CopyToAspNetCore.sh similarity index 64% rename from src/Shared/Http3/CopyToAspNetCore.sh rename to src/Shared/runtime/CopyToAspNetCore.sh index 053a620a5e..28d1cb9083 100644 --- a/src/Shared/Http3/CopyToAspNetCore.sh +++ b/src/Shared/runtime/CopyToAspNetCore.sh @@ -15,5 +15,5 @@ cd "$(dirname "$0")" || exit 1 echo "ASPNETCORE_REPO: $remote_repo" -rsync -av --delete ./ "$remote_repo"/src/Shared/Http3 -rsync -av --delete ./../../../../../tests/Tests/System/Net/Http3/ "$remote_repo"/src/Shared/test/Shared.Tests/Http3 +rsync -av --delete ./ "$remote_repo"/src/Shared/runtime +rsync -av --delete ./../../../../../tests/Tests/System/Net/aspnetcore/ "$remote_repo"/src/Shared/test/Shared.Tests/runtime diff --git a/src/Shared/Http3/CopyToRuntime.cmd b/src/Shared/runtime/CopyToRuntime.cmd similarity index 71% rename from src/Shared/Http3/CopyToRuntime.cmd rename to src/Shared/runtime/CopyToRuntime.cmd index b6edcf89e4..7f9e5b126c 100644 --- a/src/Shared/Http3/CopyToRuntime.cmd +++ b/src/Shared/runtime/CopyToRuntime.cmd @@ -10,5 +10,5 @@ IF [%remote_repo%] == [] ( echo RUNTIME_REPO: %remote_repo% -robocopy . %remote_repo%\src\libraries\Common\src\System\Net\Http\Http3 /MIR -robocopy .\..\test\Shared.Tests\Http3 %remote_repo%\src\libraries\Common\tests\Tests\System\Net\Http3 /MIR +robocopy . %remote_repo%\src\libraries\Common\src\System\Net\Http\aspnetcore /MIR +robocopy .\..\test\Shared.Tests\runtime %remote_repo%\src\libraries\Common\tests\Tests\System\Net\aspnetcore /MIR diff --git a/src/Shared/Http3/CopyToRuntime.sh b/src/Shared/runtime/CopyToRuntime.sh similarity index 72% rename from src/Shared/Http3/CopyToRuntime.sh rename to src/Shared/runtime/CopyToRuntime.sh index b562659da6..d0f44f411e 100644 --- a/src/Shared/Http3/CopyToRuntime.sh +++ b/src/Shared/runtime/CopyToRuntime.sh @@ -15,5 +15,5 @@ cd "$(dirname "$0")" || exit 1 echo "RUNTIME_REPO: $remote_repo" -rsync -av --delete ./ "$remote_repo"/src/libraries/Common/src/System/Net/Http/Http3 -rsync -av --delete ./../test/Shared.Tests/Http3/ "$remote_repo"/src/libraries/Common/tests/Tests/System/Net/Http3 +rsync -av --delete ./ "$remote_repo"/src/libraries/Common/src/System/Net/Http/aspnetcore +rsync -av --delete ./../test/Shared.Tests/runtime/ "$remote_repo"/src/libraries/Common/tests/Tests/System/Net/aspnetcore diff --git a/src/Shared/Http2/Hpack/DynamicTable.cs b/src/Shared/runtime/Http2/Hpack/DynamicTable.cs similarity index 100% rename from src/Shared/Http2/Hpack/DynamicTable.cs rename to src/Shared/runtime/Http2/Hpack/DynamicTable.cs diff --git a/src/Shared/Http2/Hpack/H2StaticTable.cs b/src/Shared/runtime/Http2/Hpack/H2StaticTable.cs similarity index 100% rename from src/Shared/Http2/Hpack/H2StaticTable.cs rename to src/Shared/runtime/Http2/Hpack/H2StaticTable.cs diff --git a/src/Shared/Http2/Hpack/HPackDecoder.cs b/src/Shared/runtime/Http2/Hpack/HPackDecoder.cs similarity index 100% rename from src/Shared/Http2/Hpack/HPackDecoder.cs rename to src/Shared/runtime/Http2/Hpack/HPackDecoder.cs diff --git a/src/Shared/Http2/Hpack/HPackDecodingException.cs b/src/Shared/runtime/Http2/Hpack/HPackDecodingException.cs similarity index 100% rename from src/Shared/Http2/Hpack/HPackDecodingException.cs rename to src/Shared/runtime/Http2/Hpack/HPackDecodingException.cs diff --git a/src/Shared/Http2/Hpack/HPackEncoder.cs b/src/Shared/runtime/Http2/Hpack/HPackEncoder.cs similarity index 100% rename from src/Shared/Http2/Hpack/HPackEncoder.cs rename to src/Shared/runtime/Http2/Hpack/HPackEncoder.cs diff --git a/src/Shared/Http2/Hpack/HPackEncodingException.cs b/src/Shared/runtime/Http2/Hpack/HPackEncodingException.cs similarity index 100% rename from src/Shared/Http2/Hpack/HPackEncodingException.cs rename to src/Shared/runtime/Http2/Hpack/HPackEncodingException.cs diff --git a/src/Shared/Http2/Hpack/HeaderField.cs b/src/Shared/runtime/Http2/Hpack/HeaderField.cs similarity index 100% rename from src/Shared/Http2/Hpack/HeaderField.cs rename to src/Shared/runtime/Http2/Hpack/HeaderField.cs diff --git a/src/Shared/Http2/Hpack/Huffman.cs b/src/Shared/runtime/Http2/Hpack/Huffman.cs similarity index 100% rename from src/Shared/Http2/Hpack/Huffman.cs rename to src/Shared/runtime/Http2/Hpack/Huffman.cs diff --git a/src/Shared/Http2/Hpack/HuffmanDecodingException.cs b/src/Shared/runtime/Http2/Hpack/HuffmanDecodingException.cs similarity index 100% rename from src/Shared/Http2/Hpack/HuffmanDecodingException.cs rename to src/Shared/runtime/Http2/Hpack/HuffmanDecodingException.cs diff --git a/src/Shared/Http2/Hpack/IntegerDecoder.cs b/src/Shared/runtime/Http2/Hpack/IntegerDecoder.cs similarity index 100% rename from src/Shared/Http2/Hpack/IntegerDecoder.cs rename to src/Shared/runtime/Http2/Hpack/IntegerDecoder.cs diff --git a/src/Shared/Http2/Hpack/IntegerEncoder.cs b/src/Shared/runtime/Http2/Hpack/IntegerEncoder.cs similarity index 100% rename from src/Shared/Http2/Hpack/IntegerEncoder.cs rename to src/Shared/runtime/Http2/Hpack/IntegerEncoder.cs diff --git a/src/Shared/Http2/Hpack/StatusCodes.cs b/src/Shared/runtime/Http2/Hpack/StatusCodes.cs similarity index 100% rename from src/Shared/Http2/Hpack/StatusCodes.cs rename to src/Shared/runtime/Http2/Hpack/StatusCodes.cs diff --git a/src/Shared/Http3/Frames/Http3ErrorCode.cs b/src/Shared/runtime/Http3/Frames/Http3ErrorCode.cs similarity index 100% rename from src/Shared/Http3/Frames/Http3ErrorCode.cs rename to src/Shared/runtime/Http3/Frames/Http3ErrorCode.cs diff --git a/src/Shared/Http3/Frames/Http3Frame.cs b/src/Shared/runtime/Http3/Frames/Http3Frame.cs similarity index 100% rename from src/Shared/Http3/Frames/Http3Frame.cs rename to src/Shared/runtime/Http3/Frames/Http3Frame.cs diff --git a/src/Shared/Http3/Frames/Http3FrameType.cs b/src/Shared/runtime/Http3/Frames/Http3FrameType.cs similarity index 100% rename from src/Shared/Http3/Frames/Http3FrameType.cs rename to src/Shared/runtime/Http3/Frames/Http3FrameType.cs diff --git a/src/Shared/Http3/Helpers/VariableLengthIntegerHelper.cs b/src/Shared/runtime/Http3/Helpers/VariableLengthIntegerHelper.cs similarity index 100% rename from src/Shared/Http3/Helpers/VariableLengthIntegerHelper.cs rename to src/Shared/runtime/Http3/Helpers/VariableLengthIntegerHelper.cs diff --git a/src/Shared/Http3/Http3SettingType.cs b/src/Shared/runtime/Http3/Http3SettingType.cs similarity index 100% rename from src/Shared/Http3/Http3SettingType.cs rename to src/Shared/runtime/Http3/Http3SettingType.cs diff --git a/src/Shared/Http3/Http3StreamType.cs b/src/Shared/runtime/Http3/Http3StreamType.cs similarity index 100% rename from src/Shared/Http3/Http3StreamType.cs rename to src/Shared/runtime/Http3/Http3StreamType.cs diff --git a/src/Shared/Http3/QPack/H3StaticTable.cs b/src/Shared/runtime/Http3/QPack/H3StaticTable.cs similarity index 100% rename from src/Shared/Http3/QPack/H3StaticTable.cs rename to src/Shared/runtime/Http3/QPack/H3StaticTable.cs diff --git a/src/Shared/Http3/QPack/HeaderField.cs b/src/Shared/runtime/Http3/QPack/HeaderField.cs similarity index 100% rename from src/Shared/Http3/QPack/HeaderField.cs rename to src/Shared/runtime/Http3/QPack/HeaderField.cs diff --git a/src/Shared/Http3/QPack/QPackDecoder.cs b/src/Shared/runtime/Http3/QPack/QPackDecoder.cs similarity index 99% rename from src/Shared/Http3/QPack/QPackDecoder.cs rename to src/Shared/runtime/Http3/QPack/QPackDecoder.cs index 40bd7f0235..dfde4876f7 100644 --- a/src/Shared/Http3/QPack/QPackDecoder.cs +++ b/src/Shared/runtime/Http3/QPack/QPackDecoder.cs @@ -506,7 +506,7 @@ namespace System.Net.Http.QPack private static void ThrowDynamicTableNotSupported() { - throw new QPackDecodingException("No dynamic table support"); + throw new QPackDecodingException(SR.net_http_qpack_no_dynamic_table); } } } diff --git a/src/Shared/Http3/QPack/QPackDecodingException.cs b/src/Shared/runtime/Http3/QPack/QPackDecodingException.cs similarity index 100% rename from src/Shared/Http3/QPack/QPackDecodingException.cs rename to src/Shared/runtime/Http3/QPack/QPackDecodingException.cs diff --git a/src/Shared/Http3/QPack/QPackEncoder.cs b/src/Shared/runtime/Http3/QPack/QPackEncoder.cs similarity index 100% rename from src/Shared/Http3/QPack/QPackEncoder.cs rename to src/Shared/runtime/Http3/QPack/QPackEncoder.cs diff --git a/src/Shared/Http3/QPack/QPackEncodingException.cs b/src/Shared/runtime/Http3/QPack/QPackEncodingException.cs similarity index 100% rename from src/Shared/Http3/QPack/QPackEncodingException.cs rename to src/Shared/runtime/Http3/QPack/QPackEncodingException.cs diff --git a/src/Shared/Http2/IHttpHeadersHandler.cs b/src/Shared/runtime/IHttpHeadersHandler.cs similarity index 100% rename from src/Shared/Http2/IHttpHeadersHandler.cs rename to src/Shared/runtime/IHttpHeadersHandler.cs diff --git a/src/Shared/Http2/ReadMe.SharedCode.md b/src/Shared/runtime/ReadMe.SharedCode.md similarity index 67% rename from src/Shared/Http2/ReadMe.SharedCode.md rename to src/Shared/runtime/ReadMe.SharedCode.md index eab9a4631e..b9f4803617 100644 --- a/src/Shared/Http2/ReadMe.SharedCode.md +++ b/src/Shared/runtime/ReadMe.SharedCode.md @@ -1,16 +1,16 @@ -The code in this directory is shared between dotnet/runtime and aspnet/AspNetCore. This contains HTTP/2 protocol infrastructure such as an HPACK implementation. Any changes to this dir need to be checked into both repositories. +The code in this directory is shared between dotnet/runtime and dotnet/AspNetCore. This contains HTTP/2 and HTTP/3 protocol infrastructure such as an HPACK implementation. Any changes to this dir need to be checked into both repositories. dotnet/runtime code paths: -- runtime\src\libraries\Common\src\System\Net\Http\Http2 -- runtime\src\libraries\Common\tests\Tests\System\Net\Http2 +- runtime\src\libraries\Common\src\System\Net\Http\aspnetcore +- runtime\src\libraries\Common\tests\Tests\System\Net\aspnetcore -aspnet/AspNetCore code paths: -- AspNetCore\src\Shared\Http2 -- AspNetCore\src\Shared\test\Shared.Tests\Http2 +dotnet/AspNetCore code paths: +- AspNetCore\src\Shared\runtime +- AspNetCore\src\Shared\test\Shared.Tests\runtime ## Copying code -- To copy code from dotnet/runtime to aspnet/AspNetCore, set ASPNETCORE_REPO to the AspNetCore repo root and then run CopyToAspNetCore.cmd. -- To copy code from aspnet/AspNetCore to dotnet/runtime, set RUNTIME_REPO to the runtime repo root and then run CopyToRuntime.cmd. +- To copy code from dotnet/runtime to dotnet/AspNetCore, set ASPNETCORE_REPO to the AspNetCore repo root and then run CopyToAspNetCore.cmd. +- To copy code from dotnet/AspNetCore to dotnet/runtime, set RUNTIME_REPO to the runtime repo root and then run CopyToRuntime.cmd. ## Building dotnet/runtime code: - https://github.com/dotnet/runtime/tree/master/docs/workflow @@ -23,14 +23,14 @@ aspnet/AspNetCore code paths: - `PS D:\github\runtime\src\libraries\Common\tests> dotnet msbuild /t:rebuildandtest` - `PS D:\github\runtime\src\libraries\System.Net.Http\tests\UnitTests> dotnet msbuild /t:rebuildandtest` -## Building aspnet/AspNetCore code: -- https://github.com/aspnet/AspNetCore/blob/master/docs/BuildFromSource.md +## Building dotnet/AspNetCore code: +- https://github.com/dotnet/AspNetCore/blob/master/docs/BuildFromSource.md - Run restore in the root once: `PS D:\github\AspNetCore> .\restore.cmd` - Activate to use the repo local runtime: `PS D:\github\AspNetCore> . .\activate.ps1` - Build the individual projects: - `(AspNetCore) PS D:\github\AspNetCore\src\Shared\test\Shared.Tests> dotnet msbuild` - `(AspNetCore) PS D:\github\AspNetCore\src\servers\Kestrel\core\src> dotnet msbuild` -### Running aspnet/AspNetCore tests: +### Running dotnet/AspNetCore tests: - `(AspNetCore) PS D:\github\AspNetCore\src\Shared\test\Shared.Tests> dotnet test` - `(AspNetCore) PS D:\github\AspNetCore\src\servers\Kestrel\core\test> dotnet test` diff --git a/src/Shared/Http2/SR.cs b/src/Shared/runtime/SR.cs similarity index 100% rename from src/Shared/Http2/SR.cs rename to src/Shared/runtime/SR.cs diff --git a/src/Shared/Http2/SR.resx b/src/Shared/runtime/SR.resx similarity index 98% rename from src/Shared/Http2/SR.resx rename to src/Shared/runtime/SR.resx index 9e785e371f..bcd721a2c5 100644 --- a/src/Shared/Http2/SR.resx +++ b/src/Shared/runtime/SR.resx @@ -150,6 +150,9 @@ Received an invalid header name: '{0}'. + + No dynamic table support + Request headers must contain only ASCII characters. diff --git a/src/Shared/test/Shared.Tests/Http2/ReadMe.SharedCode.md b/src/Shared/test/Shared.Tests/Http2/ReadMe.SharedCode.md deleted file mode 100644 index 8cb8d8d2ab..0000000000 --- a/src/Shared/test/Shared.Tests/Http2/ReadMe.SharedCode.md +++ /dev/null @@ -1,5 +0,0 @@ -The code in this directory is shared between the runtime libraries and AspNetCore. This contains tests for HTTP/2 protocol infrastructure such as HPACK. Any changes to this dir need to be checked into both repositories. - -For additional details see: -- runtime/src/libraries/Common/src/System/Net/Http/Http2/ReadMe.SharedCode.md -- AspNetCore/src/Shared/Http2/ReadMe.SharedCode.md diff --git a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj index 76dfe2c60f..f11a9c61c0 100644 --- a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj +++ b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj @@ -10,7 +10,7 @@ - + @@ -32,7 +32,7 @@ - + System.Net.Http.SR diff --git a/src/Shared/test/Shared.Tests/Http2/DynamicTableTest.cs b/src/Shared/test/Shared.Tests/runtime/Http2/DynamicTableTest.cs similarity index 100% rename from src/Shared/test/Shared.Tests/Http2/DynamicTableTest.cs rename to src/Shared/test/Shared.Tests/runtime/Http2/DynamicTableTest.cs diff --git a/src/Shared/test/Shared.Tests/Http2/HPackDecoderTest.cs b/src/Shared/test/Shared.Tests/runtime/Http2/HPackDecoderTest.cs similarity index 100% rename from src/Shared/test/Shared.Tests/Http2/HPackDecoderTest.cs rename to src/Shared/test/Shared.Tests/runtime/Http2/HPackDecoderTest.cs diff --git a/src/Shared/test/Shared.Tests/Http2/HPackIntegerTest.cs b/src/Shared/test/Shared.Tests/runtime/Http2/HPackIntegerTest.cs similarity index 100% rename from src/Shared/test/Shared.Tests/Http2/HPackIntegerTest.cs rename to src/Shared/test/Shared.Tests/runtime/Http2/HPackIntegerTest.cs diff --git a/src/Shared/test/Shared.Tests/Http2/HuffmanDecodingTests.cs b/src/Shared/test/Shared.Tests/runtime/Http2/HuffmanDecodingTests.cs similarity index 100% rename from src/Shared/test/Shared.Tests/Http2/HuffmanDecodingTests.cs rename to src/Shared/test/Shared.Tests/runtime/Http2/HuffmanDecodingTests.cs diff --git a/src/Shared/test/Shared.Tests/runtime/ReadMe.SharedCode.md b/src/Shared/test/Shared.Tests/runtime/ReadMe.SharedCode.md new file mode 100644 index 0000000000..cd18bcb663 --- /dev/null +++ b/src/Shared/test/Shared.Tests/runtime/ReadMe.SharedCode.md @@ -0,0 +1,5 @@ +The code in this directory is shared between the runtime libraries and AspNetCore. This contains tests for HTTP/2 and HTTP/3 protocol infrastructure such as HPACK. Any changes to this dir need to be checked into both repositories. + +For additional details see: +- runtime/src/libraries/Common/src/System/Net/Http/aspnetcore/ReadMe.SharedCode.md +- AspNetCore/src/Shared/runtime/ReadMe.SharedCode.md