diff --git a/src/Shared/Http2/CopyToCoreFx.cmd b/src/Shared/Http2/CopyToCoreFx.cmd deleted file mode 100644 index eb7035b8b2..0000000000 --- a/src/Shared/Http2/CopyToCoreFx.cmd +++ /dev/null @@ -1,14 +0,0 @@ -@ECHO OFF -SETLOCAL - -if not [%1] == [] (set remote_repo=%1) else (set remote_repo=%COREFX_REPO%) - -IF [%remote_repo%] == [] ( - echo The 'COREFX_REPO' environment variable or command line parameter is not set, aborting. - exit /b 1 -) - -echo COREFX_REPO: %remote_repo% - -robocopy . %remote_repo%\src\Common\src\System\Net\Http\Http2 /MIR -robocopy .\..\test\Shared.Tests\Http2 %remote_repo%\src\Common\tests\Tests\System\Net\Http2 /MIR diff --git a/src/Shared/Http2/CopyToCoreFx.sh b/src/Shared/Http2/CopyToCoreFx.sh deleted file mode 100644 index f7573db521..0000000000 --- a/src/Shared/Http2/CopyToCoreFx.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -if [[ -n "$1" ]]; then - remote_repo="$1" -else - remote_repo="$COREFX_REPO" -fi - -if [[ -z "$remote_repo" ]]; then - echo The 'COREFX_REPO' environment variable or command line parameter is not set, aborting. - exit 1 -fi - -cd "$(dirname "$0")" || exit 1 - -echo "COREFX_REPO: $remote_repo" - -rsync -av --delete ./ "$remote_repo"/src/Common/src/System/Net/Http/Http2 -rsync -av --delete ./../test/Shared.Tests/Http2/ "$remote_repo"/src/Common/tests/Tests/System/Net/Http2 diff --git a/src/Shared/Http2/CopyToRuntime.cmd b/src/Shared/Http2/CopyToRuntime.cmd new file mode 100644 index 0000000000..7497eadd52 --- /dev/null +++ b/src/Shared/Http2/CopyToRuntime.cmd @@ -0,0 +1,14 @@ +@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 new file mode 100644 index 0000000000..baf10f3b86 --- /dev/null +++ b/src/Shared/Http2/CopyToRuntime.sh @@ -0,0 +1,19 @@ +#!/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/Http2/ReadMe.SharedCode.md b/src/Shared/Http2/ReadMe.SharedCode.md index 4482e11b84..d55fa81aea 100644 --- a/src/Shared/Http2/ReadMe.SharedCode.md +++ b/src/Shared/Http2/ReadMe.SharedCode.md @@ -1,29 +1,29 @@ -The code in this directory is shared between CoreFx and 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 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. -Corefx code paths: -- corefx\src\Common\src\System\Net\Http\Http2 -- corefx\src\Common\tests\Tests\System\Net\Http2 -AspNetCore code paths: +dotnet/runtime code paths: +- runtime\src\libraries\Common\src\System\Net\Http\Http2 +- runtime\src\libraries\Common\tests\Tests\System\Net\Http2 +aspnet/AspNetCore code paths: - AspNetCore\src\Shared\Http2 - AspNetCore\src\Shared\test\Shared.Tests\Http2 ## Copying code -To copy code from CoreFx to AspNetCore set ASPNETCORE_REPO to the AspNetCore repo root and then run CopyToAspNetCore.cmd. -To copy code from AspNetCore to CoreFx set COREFX_REPO to the CoreFx repo root and then run CopyToCoreFx.cmd. +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 CoreFx code: -- https://github.com/dotnet/corefx/blob/master/Documentation/building/windows-instructions.md -- https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md -- Run build.cmd from the root once: `PS D:\github\corefx> .\build.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 libraries.cmd from the root once: `PS D:\github\runtime> .\libraries.cmd` - Build the individual projects: -- `PS D:\github\corefx\src\Common\tests> dotnet msbuild /t:rebuild` -- `PS D:\github\corefx\src\System.Net.Http\src> dotnet msbuild /t:rebuild` +- `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 CoreFx tests: -- `PS D:\github\corefx\src\Common\tests> dotnet msbuild /t:rebuildandtest` -- `PS D:\github\corefx\src\System.Net.Http\tests\UnitTests> dotnet msbuild /t:rebuildandtest` +### 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 AspNetCore code: +## 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` @@ -31,6 +31,6 @@ To copy code from AspNetCore to CoreFx set COREFX_REPO to the CoreFx repo root a - `(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 AspNetCore tests: +### 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` \ No newline at end of file +- `(AspNetCore) PS D:\github\AspNetCore\src\servers\Kestrel\core\test> dotnet test`