From 356cd29a84697ddea7e958156eef618c453e1e08 Mon Sep 17 00:00:00 2001
From: Marc Gravell <marc.gravell@gmail.com>
Date: Mon, 3 Jun 2024 12:25:44 -0700
Subject: [PATCH] Merge branch 'main' into marc/revert-pinvoke

# Conflicts:
#	src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
#	src/Shared/HttpSys/NativeInterop/HttpApiTypes.cs
---
 eng/Dependencies.props                                         | 1 +
 eng/Versions.props                                             | 1 +
 src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index ecfb24fd84a2..eea85ba1bd4a 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -208,6 +208,7 @@ and are generated based on the last package release.
     <LatestPackageReference Include="MessagePack" />
     <LatestPackageReference Include="MessagePackAnalyzer" />
     <LatestPackageReference Include="Microsoft.Data.SqlClient" />
+    <LatestPackageReference Include="Microsoft.Windows.CsWin32" />
     <LatestPackageReference Include="Mono.Cecil" />
     <LatestPackageReference Include="Mono.TextTemplating" />
     <LatestPackageReference Include="Moq" />
diff --git a/eng/Versions.props b/eng/Versions.props
index 4db9cd938fcc..0f1ef2535cb4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -306,6 +306,7 @@
     <MicrosoftIdentityWebGraphServiceClientVersion>2.17.0</MicrosoftIdentityWebGraphServiceClientVersion>
     <MicrosoftIdentityWebUIVersion>2.17.0</MicrosoftIdentityWebUIVersion>
     <MicrosoftIdentityWebDownstreamApiVersion>2.17.0</MicrosoftIdentityWebDownstreamApiVersion>
+    <MicrosoftWindowsCsWin32Version>0.3.46-beta</MicrosoftWindowsCsWin32Version>
     <MessagePackAnalyzerVersion>$(MessagePackVersion)</MessagePackAnalyzerVersion>
     <MoqVersion>4.10.0</MoqVersion>
     <MonoCecilVersion>0.11.2</MonoCecilVersion>
diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
index aad0951cdbe8..5f18def13f0e 100644
--- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
@@ -51,7 +51,7 @@
     <Reference Include="Microsoft.AspNetCore.Http.Features" />
     <Reference Include="Microsoft.AspNetCore.Server.HttpSys" />
     <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
-    <Reference Include="System.IO.Pipelines" />
+    <!--<Reference Include="System.IO.Pipelines" />-->
     <Reference Include="Microsoft.Windows.CsWin32" Condition="'$(DotNetBuildSourceOnly)' != 'true'">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>