From 303bd205cf1374768322d3c1a4ec88edb70a3562 Mon Sep 17 00:00:00 2001
From: hanzhang54 <zhangh@microsoft.com>
Date: Mon, 29 Aug 2022 16:48:53 +0800
Subject: [PATCH] Update to WinUI 2.8 (#1875)

* Update to WinUI 2.8

* BinSkim bypass WebView2Loader.dll

* BinSkim bypass Microsoft.Web.WebView2.Core.dll
---
 build/pipelines/templates/build-single-architecture.yaml | 4 ++++
 src/Calculator/Calculator.csproj                         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/pipelines/templates/build-single-architecture.yaml b/build/pipelines/templates/build-single-architecture.yaml
index 547dc083..0877c322 100644
--- a/build/pipelines/templates/build-single-architecture.yaml
+++ b/build/pipelines/templates/build-single-architecture.yaml
@@ -107,9 +107,13 @@ jobs:
         # If we put more things than we produce pdbs for and can index (such as nuget packages that ship without pdbs), binskim will fail.
         # Below are ignored files
         #   - clrcompression.dll
+        #   - WebView2Loader.dll
+        #   - Microsoft.Web.WebView2.Core.dll
         Contents: |
           **\*
           !**\clrcompression.dll
+          !**\WebView2Loader.dll
+          !**\Microsoft.Web.WebView2.Core.dll
         TargetFolder: '$(Agent.BuildDirectory)\binskim'
         CleanTargetFolder: true
         OverWrite: true
diff --git a/src/Calculator/Calculator.csproj b/src/Calculator/Calculator.csproj
index 2e5ddeb3..f47de837 100644
--- a/src/Calculator/Calculator.csproj
+++ b/src/Calculator/Calculator.csproj
@@ -794,7 +794,7 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.10</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.UI.Xaml" Version="2.7.0" />
+    <PackageReference Include="Microsoft.UI.Xaml" Version="2.8.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CalcViewModel\CalcViewModel.vcxproj">