From 95e86ed73c7aa654936c2cb6852a55a5c5fbf72c Mon Sep 17 00:00:00 2001
From: wfurt <tweinfurt@yahoo.com>
Date: Wed, 10 Aug 2022 12:24:44 -0700
Subject: [PATCH 1/2] consume MsQuic 2.1 for windows ARM64 builds

---
 eng/Versions.props                                  |  1 +
 .../System.Net.Quic/src/System.Net.Quic.csproj      | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index 76258518b21965..51aad95916d09c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -175,6 +175,7 @@
     <MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rc.1.22375.1</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- MsQuic -->
     <SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22371.1</SystemNetMsQuicTransportVersion>
+    <MicrosoftNativeQuicMsQuicVersion>2.1</MicrosoftNativeQuicMsQuicVersion>
     <!-- Mono LLVM -->
     <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22376.4</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
     <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22376.4</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
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 86f1e5c79e7209..a19e8592056f62 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -103,6 +103,11 @@
                       PrivateAssets="all"
                       GeneratePathProperty="true"
                       Condition="'$(DotNetBuildFromSource)' != 'true'" />
+    <PackageReference Include="Microsoft.Native.Quic.MsQuic.Schannel"
+                      Version="$(MicrosoftNativeQuicMsQuicVersion)"
+                      PrivateAssets="all"
+                      GeneratePathProperty="true"
+                      Condition="'$(DotNetBuildFromSource)' != 'true'" />
   </ItemGroup>
 
   <ItemGroup>
@@ -141,6 +146,14 @@
     <BinPlaceDir Include="$(LibrariesNativeArtifactsPath)" ItemName="NativeBinPlaceItem" />
     <NativeBinPlaceItem Include="$(PkgSystem_Net_MsQuic_Transport)\runtimes\win10-$(TargetArchitecture)\native\*" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows' and
+                        ('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm') and '$(DotNetBuildFromSource)' != 'true'">
+    <BinPlaceDir Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)" ItemName="NativeBinPlaceItem" />
+    <BinPlaceDir Include="$(NetCoreAppCurrentTestHostSharedFrameworkPath)" ItemName="NativeBinPlaceItem" />
+    <BinPlaceDir Include="$(LibrariesAllBinArtifactsPath)" ItemName="NativeBinPlaceItem" />
+    <BinPlaceDir Include="$(LibrariesNativeArtifactsPath)" ItemName="NativeBinPlaceItem" />
+    <NativeBinPlaceItem Include="$(PkgMicrosoft_Native_Quic_MsQuic_Schannel)\build\native\bin\$(TargetArchitecture)\*" />
+  </ItemGroup>
 
   <ItemGroup>
     <Content Include="libmsquic.dylib" Condition="Exists('libmsquic.dylib')">

From 56385feb476d675b305d476de27374e628468d5b Mon Sep 17 00:00:00 2001
From: wfurt <tweinfurt@yahoo.com>
Date: Wed, 10 Aug 2022 19:49:28 -0700
Subject: [PATCH 2/2] force run on Win11 arm64

---
 eng/pipelines/libraries/helix-queues-setup.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index f146897e3d2841..73da0d3e7af334 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -184,6 +184,7 @@ jobs:
     # windows arm64
     - ${{ if eq(parameters.platform, 'windows_arm64') }}:
       - Windows.10.Arm64.Open
+      - Windows.11.Arm64.Open
 
     # WebAssembly
     - ${{ if eq(parameters.platform, 'Browser_wasm') }}: