[ms-quic] update to 2.3.5 by jimwang118 · Pull Request #39332 · microsoft/vcpkg

jimwang118 · 2024-06-17T09:03:48Z

1.Delete tools(quicping,quicreach) that do not exist.
2. Fix the issue that afxdp_helper.h file does not exist during compilation.
3. Remove patches fix-platform.patch and fix-warnings.patch that have been fixed upstream.

Changes comply with the maintainer guide.
SHA512s are updated for each updated download.
~~The "supports" clause reflects platforms that may be fixed by this new version.~~
~~Any fixed CI baseline entries are removed from that file.~~
Any patches that are no longer applied are deleted from the port's directory.
The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
Only one version is added to each modified port's versions file.

All features passed with following triplets:

x64-windows

Usage test pass with following triplets:

x64-windows

… up-ms-quic

BillyONeal · 2024-06-18T18:58:18Z

Thanks for the update!

nibanks

Overall, this PR definitely improves on the old status, but there are still a few things I'd like to see cleaned up. Thanks!

nibanks · 2024-06-24T11:58:31Z

+    install(TARGETS quicattack quicinterop quicinteropserver quicipclient quicipserver
+                    quicpcp quicpost quicsample spinquic)


@jimwang118 & @BillyONeal this change is unnecessary, as QUIC_BUILD_TOOLS is disabled by default.

#39500 removes it

nibanks · 2024-06-24T12:01:18Z

 if("tools" IN_LIST FEATURES)
    vcpkg_copy_tools(TOOL_NAMES quicattack quicinterop quicinteropserver quicipclient quicipserver
-                                quicpcp quicping quicpost quicreach quicsample spinquic
+                                quicpcp quicpost quicsample spinquic
        AUTO_CLEAN
    )
 endif()


@jimwang118 & @BillyONeal this notion of tools as a feature should simply be removed. Tools are generally for internal use, and you're not setting the cmake flag to enable them (and shouldn't IMO) anyways.

The CMake flag was set when ms-quic[tools] by:

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tools QUIC_BUILD_TOOLS )

#39500 removes the tools feature

nibanks · 2024-06-24T12:02:01Z

+    },
    {
      "git-tree": "3188e024233a7d1772922bc11d29d912c6427e25",
      "version": "1.2.0",


@jimwang118 & @BillyONeal since you're overwriting v1.2.0, should this version stay here or be removed?

Old versions are never removed from the versions database. If someone has an override and explicitly asks for 1.2.0 this is how that gets found.

nibanks · 2024-06-24T12:06:49Z

@@ -60,21 +66,17 @@ vcpkg_cmake_configure(
        -DQUIC_UWP_BUILD=${VCPKG_TARGET_IS_UWP}
 )


In this vcpkg_cmake_configure, Windows should default to schannel, but provide the option (a feature?) to override and set to openssl. Linux only supports openssl so it can stay as is.

It isn't clear how that can be a feature; it sounds like an alternative. See https://learn.microsoft.com/vcpkg/contributing/maintainer-guide#do-not-use-features-to-implement-alternatives . In particular, it is not possible for a consumer to require that a feature is off. It may be that overlays are required to express this difference; that's a common limitation for multiple TLS backends available like this.

Upstream documents that there are pretty substantial limitations (only working on very recent Windows, missing features) in https://github.com/microsoft/msquic/blob/main/docs/Platforms.md#windows to using the schannel backend.

I would welcome an upstream maintainer doing this surgery and explaining why the openssl backend is bad but I don't myself have a good enough understanding of the situation to do it myself.

nibanks · 2024-06-24T12:08:16Z

+ endif()
+
+ # Performance code
+diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt


I still don't quite understand the rest of these changes, and it'd be great to get them pushed upstream if really necessary. I (as the owner of msquic) would be happy to take them and cherry-pick them into the release branch to help here.

These changes are fixing up the upstream build system to create CMake targets consistent with vcpkg's installation layout. Since that's fairly vcpkg specific we wouldn't always upstream something like that.

We work out of the box with the most common CMake conventions. If upstream wants to commit to maintaining something like this we'd love to that but we as vcpkg maintainers are probably ill equipped to address the customers targeted with ${include_dest}.

nibanks · 2024-06-24T12:09:08Z

One problem I've had since this was created (by some external contributor) is that it's named ms-quic instead of msquic (which is the real name of the project, and likely the one people would actually look for). Is there a way to get this fixed?

#39500 fixes this

@nibanks

As requested by upstream maintainer @nibanks in microsoft#39332 (review) This should probably be after microsoft#39498 makes CI test msquic for more targets.

jimwang118 and others added 9 commits June 7, 2024 10:34

Create main.yml

201de68

Merge branch 'master' of https://github.com/Microsoft/vcpkg

6db5acf

Merge branch 'master' of https://github.com/jimwang118/vcpkg

7d0969f

Merge branch 'microsoft:master' into master

e7ce891

Merge branch 'master' of https://github.com/jimwang118/vcpkg

1ba08af

Merge branch 'master' of https://github.com/Microsoft/vcpkg

fc8692e

Merge branch 'master' of https://github.com/Microsoft/vcpkg

593b3d1

update to 2.3.5

459a857

update version

d09f1d7

jimwang118 added category:port-bug The issue is with a library, which is something the port should already support info:internal category:port-update The issue is with a library, which is requesting update new revision labels Jun 17, 2024

jimwang118 assigned JonLiu1993 Jun 17, 2024

jimwang118 and others added 3 commits June 17, 2024 17:05

Delete .github/workflows/main.yml

215be73

del main

3d06f0f

Merge branch 'up-ms-quic' of https://github.com/jimwang118/vcpkg into…

b82891f

… up-ms-quic

jimwang118 marked this pull request as ready for review June 18, 2024 01:46

JonLiu1993 approved these changes Jun 18, 2024

View reviewed changes

JonLiu1993 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jun 18, 2024

BillyONeal merged commit a83d231 into microsoft:master Jun 18, 2024

jimwang118 deleted the up-ms-quic branch June 19, 2024 01:59

BillyONeal mentioned this pull request Jun 20, 2024

[ms-quic] update version to 2.2.0 #29568

Closed

7 tasks

Cheney-W mentioned this pull request Jun 20, 2024

[msquic] update to 2.1 #26811

Closed

This was referenced Jun 24, 2024

[vcpkg baseline][ms-quic] Passing remove from fail list #39475

Closed

[ms-quic] update to v2.3.5 #39085

Closed

nibanks reviewed Jun 24, 2024

View reviewed changes

BillyONeal mentioned this pull request Jun 25, 2024

[msquic] Rename from ms-quic and remove the tools feature. #39500

Merged

		+ install(TARGETS quicattack quicinterop quicinteropserver quicipclient quicipserver
		+ quicpcp quicpost quicsample spinquic)

		@@ -60,21 +66,17 @@ vcpkg_cmake_configure(
		-DQUIC_UWP_BUILD=${VCPKG_TARGET_IS_UWP}
		)

Conversation

jimwang118 commented Jun 17, 2024

Uh oh!

BillyONeal commented Jun 18, 2024

Uh oh!

nibanks left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants