Sync shared code from aspnetcoregithub-action/sync-aspnetcore-1654330618

2 files changed, 18 insertions, 1 deletions

diff --git a/src/libraries/Common/src/System/Net/Http/aspnetcore/Http3/Http3SettingType.cs b/src/libraries/Common/src/System/Net/Http/aspnetcore/Http3/Http3SettingType.cs
index 40958e3e0fc..4919e8979c3 100644
--- a/src/libraries/Common/src/System/Net/Http/aspnetcore/Http3/Http3SettingType.cs
+++ b/src/libraries/Common/src/System/Net/Http/aspnetcore/Http3/Http3SettingType.cs
@@ -33,6 +33,19 @@ namespace System.Net.Http
         /// The maximum number of request streams that can be blocked waiting for QPack instructions. The default is 0.
         /// https://tools.ietf.org/html/draft-ietf-quic-qpack-11#section-5
         /// </summary>
-        QPackBlockedStreams = 0x7
+        QPackBlockedStreams = 0x7,
+
+        /// <summary>
+        /// SETTINGS_ENABLE_WEBTRANSPORT, default is 0 (off)
+        /// https://www.ietf.org/archive/id/draft-ietf-webtrans-http3-01.html#name-http-3-settings-parameter-r
+        /// </summary>
+        EnableWebTransport = 0x2b603742,
+
+        /// <summary>
+        /// H3_DATAGRAM, default is 0 (off)
+        /// indicates that the server suppprts sending individual datagrams over Http/3
+        /// rather than just streams.
+        /// </summary>
+        H3Datagram = 0xffd277
     }
 }
diff --git a/src/libraries/Common/src/System/Net/Http/aspnetcore/NetEventSource.Common.cs b/src/libraries/Common/src/System/Net/Http/aspnetcore/NetEventSource.Common.cs
index b2ea95a05fe..d7e41077e7e 100644
--- a/src/libraries/Common/src/System/Net/Http/aspnetcore/NetEventSource.Common.cs
+++ b/src/libraries/Common/src/System/Net/Http/aspnetcore/NetEventSource.Common.cs
@@ -530,6 +530,7 @@ namespace System.Net
         }
 
         [NonEvent]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Can safely serialize primitive arguments.")]
         private unsafe void WriteEvent(int eventId, string? arg1, int arg2, int arg3, int arg4)
         {
             if (IsEnabled())
@@ -568,6 +569,7 @@ namespace System.Net
         }
 
         [NonEvent]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Can safely serialize primitive arguments.")]
         private unsafe void WriteEvent(int eventId, string? arg1, int arg2, string? arg3)
         {
             if (IsEnabled())
@@ -603,6 +605,7 @@ namespace System.Net
         }
 
         [NonEvent]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Can safely serialize primitive arguments.")]
         private unsafe void WriteEvent(int eventId, string? arg1, string? arg2, int arg3)
         {
             if (IsEnabled())
@@ -638,6 +641,7 @@ namespace System.Net
         }
 
         [NonEvent]
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Can safely serialize primitive arguments.")]
         private unsafe void WriteEvent(int eventId, string? arg1, string? arg2, string? arg3, int arg4)
         {
             if (IsEnabled())