From 1dc31a7613d69b2fd2f2465779a79ceea48140e8 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Fri, 14 Feb 2020 11:59:35 -0800 Subject: [PATCH] Sync script changes from the runtime repo (#19062) * Sync script changes from the runtime repo #18943 * Additional change --- src/Shared/runtime/CopyToAspNetCore.cmd | 5 +++-- src/Shared/runtime/CopyToRuntime.cmd | 5 +++-- src/Shared/runtime/Http3/QPack/QPackDecoder.cs | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Shared/runtime/CopyToAspNetCore.cmd b/src/Shared/runtime/CopyToAspNetCore.cmd index 43eb681787..65a341b3cc 100644 --- a/src/Shared/runtime/CopyToAspNetCore.cmd +++ b/src/Shared/runtime/CopyToAspNetCore.cmd @@ -10,5 +10,6 @@ IF [%remote_repo%] == [] ( echo ASPNETCORE_REPO: %remote_repo% -robocopy . %remote_repo%\src\Shared\runtime /MIR -robocopy .\..\..\..\..\..\tests\Tests\System\Net\aspnetcore\ %remote_repo%\src\Shared\test\Shared.Tests\runtime /MIR +REM https://superuser.com/questions/280425/getting-robocopy-to-return-a-proper-exit-code +(robocopy . %remote_repo%\src\Shared\runtime /MIR) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0 +(robocopy .\..\..\..\..\..\tests\Tests\System\Net\aspnetcore\ %remote_repo%\src\Shared\test\Shared.Tests\runtime /MIR) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0 diff --git a/src/Shared/runtime/CopyToRuntime.cmd b/src/Shared/runtime/CopyToRuntime.cmd index 7f9e5b126c..f1cb32df85 100644 --- a/src/Shared/runtime/CopyToRuntime.cmd +++ b/src/Shared/runtime/CopyToRuntime.cmd @@ -10,5 +10,6 @@ IF [%remote_repo%] == [] ( echo RUNTIME_REPO: %remote_repo% -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 +REM https://superuser.com/questions/280425/getting-robocopy-to-return-a-proper-exit-code +(robocopy . %remote_repo%\src\libraries\Common\src\System\Net\Http\aspnetcore /MIR) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0 +(robocopy .\..\test\Shared.Tests\runtime %remote_repo%\src\libraries\Common\tests\Tests\System\Net\aspnetcore /MIR) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0 diff --git a/src/Shared/runtime/Http3/QPack/QPackDecoder.cs b/src/Shared/runtime/Http3/QPack/QPackDecoder.cs index dfde4876f7..6f63d66ce9 100644 --- a/src/Shared/runtime/Http3/QPack/QPackDecoder.cs +++ b/src/Shared/runtime/Http3/QPack/QPackDecoder.cs @@ -224,7 +224,7 @@ namespace System.Net.Http.QPack } break; case State.CompressedHeaders: - switch (BitOperations.LeadingZeroCount(b) - 24) + switch (BitOperations.LeadingZeroCount(b) - 24) // byte 'b' is extended to uint, so will have 24 extra 0s. { case 0: // Indexed Header Field prefixInt = IndexedHeaderFieldPrefixMask & b;