From eeda665c73a398b4697e7ce3ac79fdfa5a6eafe9 Mon Sep 17 00:00:00 2001
From: wfurt <tweinfurt@yahoo.com>
Date: Wed, 30 Jun 2021 22:01:53 -0700
Subject: [PATCH 1/6] package native quic library

---
 .../src/Interop/Windows/Interop.Libraries.cs  |  2 +-
 .../src/System.Net.Quic.csproj                | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs b/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
index 93c2bb72a806c..dce97205a7dbb 100644
--- a/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
+++ b/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
@@ -42,7 +42,7 @@ internal static partial class Libraries
         internal const string Wtsapi32 = "wtsapi32.dll";
         internal const string CompressionNative = "System.IO.Compression.Native";
         internal const string GlobalizationNative = "System.Globalization.Native";
-        internal const string MsQuic = "msquic.dll";
+        internal const string MsQuic = "MsQuic.Native.dll";
         internal const string HostPolicy = "hostpolicy.dll";
         internal const string Ucrtbase = "ucrtbase.dll";
     }
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 60201faf945ac..3bf9ada9714e0 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -56,9 +56,11 @@
     <Compile Include="System\Net\Quic\Implementations\MsQuic\Interop\MsQuicStatusCodes.OSX.cs" />
   </ItemGroup>
   <!-- Project references -->
+
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
-    <PackageReference Include="System.Net.MsQuic.Transport" PrivateAssets="all" Version="$(SystemNetMsQuicTransportVersion)" />
+    <PackageReference Include="System.Net.MsQuic.Transport" PrivateAssets="all" GeneratePathProperty="true" Version="$(SystemNetMsQuicTransportVersion)" />
   </ItemGroup>
+
   <ItemGroup>
     <Reference Include="System.Collections" />
     <Reference Include="System.Collections.Concurrent" />
@@ -76,11 +78,31 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Channels" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <BinPlaceNative>true</BinPlaceNative>
+    <BinPlaceRuntime>false</BinPlaceRuntime>
+  </PropertyGroup>
+
   <!-- Support for deploying msquic -->
+  <ItemGroup Condition="'$(TargetsWindows)' == 'true' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86')">
+    <Content Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.dll" Condition="'$(TargetsWindows)' == 'true'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <TargetPath>MsQuic.Native.dll</TargetPath>
+    </Content>
+    <Content Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.pdb" Condition="'$(TargetsWindows)' == 'true'">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <TargetPath>MsQuic.Native.pdb</TargetPath>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="msquic.dll" Condition="Exists('msquic.dll')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <TargetPath>MsQuic.Native.dll</TargetPath>
     </Content>
     <Content Include="msquic.pdb" Condition="Exists('msquic.pdb')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

From 33ac7c2b2fa1461f8f2ecc696ebf10c626991e42 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 1 Jul 2021 15:48:32 +0200
Subject: [PATCH 2/6] Update System.Net.Quic.csproj

---
 .../src/System.Net.Quic.csproj                | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

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 3bf9ada9714e0..89ed518bc57ec 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -57,8 +57,9 @@
   </ItemGroup>
   <!-- Project references -->
 
-  <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
+  <ItemGroup>
     <PackageReference Include="System.Net.MsQuic.Transport" PrivateAssets="all" GeneratePathProperty="true" Version="$(SystemNetMsQuicTransportVersion)" />
+    <BinPlaceDir Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)" BinPlaceItem="NativeBinPlaceItem" />
   </ItemGroup>
 
   <ItemGroup>
@@ -79,23 +80,10 @@
     <Reference Include="System.Threading.Channels" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <BinPlaceNative>true</BinPlaceNative>
-    <BinPlaceRuntime>false</BinPlaceRuntime>
-  </PropertyGroup>
-
   <!-- Support for deploying msquic -->
   <ItemGroup Condition="'$(TargetsWindows)' == 'true' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86')">
-    <Content Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.dll" Condition="'$(TargetsWindows)' == 'true'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <TargetPath>MsQuic.Native.dll</TargetPath>
-    </Content>
-    <Content Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.pdb" Condition="'$(TargetsWindows)' == 'true'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <TargetPath>MsQuic.Native.pdb</TargetPath>
-    </Content>
+    <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.dll" TargetPath="MsQuic.Native.dll" />
+    <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.pdb" TargetPath="MsQuic.Native.pdb" />
   </ItemGroup>
 
   <ItemGroup>
@@ -107,6 +95,7 @@
     <Content Include="msquic.pdb" Condition="Exists('msquic.pdb')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <TargetPath>MsQuic.Native.pdb</TargetPath>
     </Content>
     <Content Include="libmsquic.dylib" Condition="Exists('libmsquic.dylib')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

From db8219702495707e2ed3752691a03212ab2453c4 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 1 Jul 2021 16:46:11 +0200
Subject: [PATCH 3/6] Fix binplacing

---
 .../System.Net.Quic/src/System.Net.Quic.csproj       | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 89ed518bc57ec..2748db0bdb159 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -58,8 +58,10 @@
   <!-- Project references -->
 
   <ItemGroup>
-    <PackageReference Include="System.Net.MsQuic.Transport" PrivateAssets="all" GeneratePathProperty="true" Version="$(SystemNetMsQuicTransportVersion)" />
-    <BinPlaceDir Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)" BinPlaceItem="NativeBinPlaceItem" />
+    <PackageReference Include="System.Net.MsQuic.Transport"
+                      Version="$(SystemNetMsQuicTransportVersion)"
+                      PrivateAssets="all"
+                      GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup>
@@ -81,7 +83,11 @@
   </ItemGroup>
 
   <!-- Support for deploying msquic -->
-  <ItemGroup Condition="'$(TargetsWindows)' == 'true' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86')">
+  <ItemGroup Condition="'$(TargetsWindows)' == 'true' and
+                        ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86')">
+    <BinPlaceDir Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)" ItemName="NativeBinPlaceItem" />
+    <BinPlaceDir Include="$(NetCoreAppCurrentTestHostSharedFrameworkPath)" ItemName="NativeBinPlaceItem" />
+    <BinPlaceDir Include="$(NetCoreAppCurrentRuntimePath)" ItemName="NativeBinPlaceItem" />
     <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.dll" TargetPath="MsQuic.Native.dll" />
     <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.pdb" TargetPath="MsQuic.Native.pdb" />
   </ItemGroup>

From 0f89cd251a9e12b1ba24dd49ac72e12d11d7fc2e Mon Sep 17 00:00:00 2001
From: wfurt <tweinfurt@yahoo.com>
Date: Thu, 1 Jul 2021 11:13:21 -0700
Subject: [PATCH 4/6] exclude msquic.dll from trimming

---
 .../Common/src/Interop/Windows/Interop.Libraries.cs         | 2 +-
 src/libraries/System.Net.Quic/src/System.Net.Quic.csproj    | 6 ++----
 src/libraries/illink-oob.targets                            | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs b/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
index dce97205a7dbb..93c2bb72a806c 100644
--- a/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
+++ b/src/libraries/Common/src/Interop/Windows/Interop.Libraries.cs
@@ -42,7 +42,7 @@ internal static partial class Libraries
         internal const string Wtsapi32 = "wtsapi32.dll";
         internal const string CompressionNative = "System.IO.Compression.Native";
         internal const string GlobalizationNative = "System.Globalization.Native";
-        internal const string MsQuic = "MsQuic.Native.dll";
+        internal const string MsQuic = "msquic.dll";
         internal const string HostPolicy = "hostpolicy.dll";
         internal const string Ucrtbase = "ucrtbase.dll";
     }
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 2748db0bdb159..16c174852a7d9 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -88,20 +88,18 @@
     <BinPlaceDir Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)" ItemName="NativeBinPlaceItem" />
     <BinPlaceDir Include="$(NetCoreAppCurrentTestHostSharedFrameworkPath)" ItemName="NativeBinPlaceItem" />
     <BinPlaceDir Include="$(NetCoreAppCurrentRuntimePath)" ItemName="NativeBinPlaceItem" />
-    <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.dll" TargetPath="MsQuic.Native.dll" />
-    <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.pdb" TargetPath="MsQuic.Native.pdb" />
+    <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.dll" />
+    <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.pdb" />
   </ItemGroup>
 
   <ItemGroup>
     <Content Include="msquic.dll" Condition="Exists('msquic.dll')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <TargetPath>MsQuic.Native.dll</TargetPath>
     </Content>
     <Content Include="msquic.pdb" Condition="Exists('msquic.pdb')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <TargetPath>MsQuic.Native.pdb</TargetPath>
     </Content>
     <Content Include="libmsquic.dylib" Condition="Exists('libmsquic.dylib')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/libraries/illink-oob.targets b/src/libraries/illink-oob.targets
index b985b9edf5f32..72cecaf3b8bee 100644
--- a/src/libraries/illink-oob.targets
+++ b/src/libraries/illink-oob.targets
@@ -24,7 +24,7 @@
       <_OOBsToIgnore Include="System.Configuration.ConfigurationManager" />
       <_OOBsToIgnore Include="System.Speech" />
 
-      <_NetCoreAppRuntimeAssemblies Include="$(NetCoreAppCurrentRuntimePath)*.dll" Exclude="$(NetCoreAppCurrentRuntimePath)*.Generator.dll;$(NetCoreAppCurrentRuntimePath)*.Native.dll" />
+      <_NetCoreAppRuntimeAssemblies Include="$(NetCoreAppCurrentRuntimePath)*.dll" Exclude="$(NetCoreAppCurrentRuntimePath)*.Generator.dll;$(NetCoreAppCurrentRuntimePath)*.Native.dll;$(NetCoreAppCurrentRuntimePath)*msquic.dll" />
       <_RuntimePackTrimmedAssemblies Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)*.dll" />
 
       <!-- Move previous items to FileName so that we can subtract them -->

From 1817e84d115656560a659af480fdcf478c89824c Mon Sep 17 00:00:00 2001
From: Tomas Weinfurt <tweinfurt@yahoo.com>
Date: Thu, 1 Jul 2021 11:28:10 -0700
Subject: [PATCH 5/6] Update
 src/libraries/System.Net.Quic/src/System.Net.Quic.csproj

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 src/libraries/System.Net.Quic/src/System.Net.Quic.csproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 16c174852a7d9..7d8e75161f367 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -88,8 +88,7 @@
     <BinPlaceDir Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)" ItemName="NativeBinPlaceItem" />
     <BinPlaceDir Include="$(NetCoreAppCurrentTestHostSharedFrameworkPath)" ItemName="NativeBinPlaceItem" />
     <BinPlaceDir Include="$(NetCoreAppCurrentRuntimePath)" ItemName="NativeBinPlaceItem" />
-    <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.dll" />
-    <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\msquic.pdb" />
+    <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\*" />
   </ItemGroup>
 
   <ItemGroup>

From be39e145896e99a7c93680abfd6d4e66c996a865 Mon Sep 17 00:00:00 2001
From: wfurt <tweinfurt@yahoo.com>
Date: Thu, 1 Jul 2021 14:03:23 -0700
Subject: [PATCH 6/6] remove local windows override

---
 src/libraries/System.Net.Quic/src/System.Net.Quic.csproj | 8 --------
 1 file changed, 8 deletions(-)

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 16c174852a7d9..8ed44f5d16257 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -93,14 +93,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="msquic.dll" Condition="Exists('msquic.dll')">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-    <Content Include="msquic.pdb" Condition="Exists('msquic.pdb')">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
     <Content Include="libmsquic.dylib" Condition="Exists('libmsquic.dylib')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>