From afc81dd546b6b636e7db2b5f981d39df1a6fded9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marie=20P=C3=ADchov=C3=A1?=
 <11718369+ManickaP@users.noreply.github.com>
Date: Wed, 1 Feb 2023 21:21:00 +0100
Subject: [PATCH] Fix conditions to bin place msquic.dll for Windows builds.
 (#81490)

---
 src/libraries/System.Net.Quic/src/System.Net.Quic.csproj           | 1 -
 .../tests/FunctionalTests/MsQuicPlatformDetectionTests.cs          | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
index 66018e4..a7ef3b5 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -143,7 +143,6 @@
   <!-- Support for deploying msquic on Windows -->
   <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows' and
                         '$(TargetOS)' == 'windows' and
-                        '$(UseQuicTransportPackage)' == 'true' and
                         '$(DotNetBuildFromSource)' != 'true'">
     <BinPlaceDir Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)" ItemName="NativeBinPlaceItem" />
     <BinPlaceDir Include="$(NetCoreAppCurrentTestHostSharedFrameworkPath)" ItemName="NativeBinPlaceItem" />
diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs
index 2d0bc54..1fbc8ec 100644
--- a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs
+++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs
@@ -19,5 +19,12 @@ namespace System.Net.Quic.Tests
             Assert.ThrowsAsync<PlatformNotSupportedException>(async () => await CreateQuicListener());
             Assert.ThrowsAsync<PlatformNotSupportedException>(async () => await CreateQuicConnection(new IPEndPoint(IPAddress.Loopback, 0)));
         }
+
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsWindows), nameof(PlatformDetection.SupportsTls13))]
+        public void SupportedWindowsPlatforms_IsSupportedIsTrue()
+        {
+            Assert.True(QuicListener.IsSupported);
+            Assert.True(QuicConnection.IsSupported);
+        }
     }
 }
-- 
2.7.4