From 60b8056cb9d9f2ef3db2a8892d6633d39ca988fe Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Wed, 12 Oct 2022 22:28:07 +0800
Subject: [PATCH] Update Windows App SDK (#2276)

---
 VERSIONS.txt                                                    | 2 +-
 cake/UtilsManaged.cake                                          | 1 +
 samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj | 2 +-
 .../SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj     | 2 +-
 .../Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj  | 2 +-
 .../SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj          | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/VERSIONS.txt b/VERSIONS.txt
index 5db678743..55c886185 100644
--- a/VERSIONS.txt
+++ b/VERSIONS.txt
@@ -23,7 +23,7 @@ System.Drawing.Common                           release     4.5.1
 SharpVk                                         release     0.4.2
 Uno.UI                                          release     4.0.8
 Uno.WinUI                                       release     4.0.13
-Microsoft.WindowsAppSDK                         release     1.0.3
+Microsoft.WindowsAppSDK                         release     1.1.5
 Microsoft.Maui.Graphics                         release     6.0.300-rc.2.1310
 Microsoft.Windows.SDK.NET.Ref                   release     10.0.19041.24
 Microsoft.AspNetCore.Components.Web             release     6.0.0
diff --git a/cake/UtilsManaged.cake b/cake/UtilsManaged.cake
index f63cc3f83..ec373fd5b 100644
--- a/cake/UtilsManaged.cake
+++ b/cake/UtilsManaged.cake
@@ -244,6 +244,7 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
     comparer.SearchPaths.AddRange(GetDotNetPacksSearchPaths());
     comparer.SearchPaths.AddRange(GetReferenceSearchPaths());
     comparer.PackageCache = PACKAGE_CACHE_PATH.FullPath;
+    comparer.IgnoreResolutionErrors = true;
 
     await AddDep("OpenTK.GLControl", "NET20");
     await AddDep("Tizen.NET", "netstandard2.0");
diff --git a/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj
index 33447e149..8f1967ac8 100644
--- a/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
index c8593ff79..4338085b7 100644
--- a/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
+++ b/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
@@ -64,7 +64,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" IncludeAssets="build" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" IncludeAssets="build" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>
\ No newline at end of file
diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj
index d0d6095ce..19a28c504 100644
--- a/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
diff --git a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
index cfd5f2f42..691b4600b 100644
--- a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
+++ b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
@@ -10,7 +10,7 @@
     <WindowsAppSdkBootstrapInitialize>false</WindowsAppSdkBootstrapInitialize>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />