Fix conditions to bin place msquic.dll for Windows builds. (#81492)

github-actions[bot] · ManickaP · web-flow · commit 554b2c714542 · 2023-02-01T12:45:32.000-08:00
Co-authored-by: Marie Píchová &lt;mapichov@microsoft.com&gt;
diff --git 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
@@ -19,5 +19,12 @@ public void UnsupportedPlatforms_ThrowsPlatformNotSupportedException()
             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);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,12 @@ public void UnsupportedPlatforms_ThrowsPlatformNotSupportedException()`
`19`	`19`	`Assert.ThrowsAsync<PlatformNotSupportedException>(async () => await CreateQuicListener());`
`20`	`20`	`Assert.ThrowsAsync<PlatformNotSupportedException>(async () => await CreateQuicConnection(new IPEndPoint(IPAddress.Loopback, 0)));`
`21`	`21`	`}`
	`22`	`+`
	`23`	`+ [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsWindows), nameof(PlatformDetection.SupportsTls13))]`
	`24`	`+ public void SupportedWindowsPlatforms_IsSupportedIsTrue()`
	`25`	`+ {`
	`26`	`+ Assert.True(QuicListener.IsSupported);`
	`27`	`+ Assert.True(QuicConnection.IsSupported);`
	`28`	`+ }`
`22`	`29`	`}`
`23`	`30`	`}`