update msquic to 2.1.1 #75287
update msquic to 2.1.1 #75287
Conversation
|
Tagging subscribers to this area: @dotnet/ncl Issue DetailsWindows is only one platform where we include msquic in runtime itself. I also made it easier to switch back to our transport version so we can consume daily unofficial builds in near future.
|
| @@ -11,6 +11,7 @@ | |||
| <DefineConstants Condition="'$(TargetPlatformIdentifier)' == 'windows'">$(DefineConstants);TARGET_WINDOWS</DefineConstants> | |||
| <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetPlatformIdentifier)' == ''">SR.SystemNetQuic_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage> | |||
| <ApiExclusionListPath Condition="'$(TargetPlatformIdentifier)' == ''">ExcludeApiList.PNSE.txt</ApiExclusionListPath> | |||
| <UseQuicTransportPackage Condition="'$(UseQuicTransportPackage)' == ''">false</UseQuicTransportPackage> | |||
There was a problem hiding this comment.
Is this ever set to true? It looks like a newly added property which is always set to false.
There was a problem hiding this comment.
yes, at the moment. You could pass /p:UseQuicTransportPackage=true from command line to test changes without messing up with the project file. I expect this will change in main eventually (so we can consume pre-releases from msquic) and it would stay false in release/7.0
|
test failure is #72830 |
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3039804650 |
|
@wfurt backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: update msquic to 2.1.1
Using index info to reconstruct a base tree...
M eng/Versions.props
M src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
CONFLICT (content): Merge conflict in src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
Auto-merging eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update msquic to 2.1.1
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
ghost
locked as resolved and limited conversation to collaborators
Windows is only one platform where we include msquic in runtime itself.
This consume bits built & signed by msquic.
I also made it easier to switch back to our transport version so we can consume daily unofficial builds in near future.