From 2ed28613ff5a9c3f650df9f67bc3921e4e9e26da Mon Sep 17 00:00:00 2001
From: Arlo <arlo.godfrey@outlook.com>
Date: Sun, 1 Dec 2024 14:22:49 -0600
Subject: [PATCH 1/3] Force dotnet to install and use the version explictly
 installed in CI. Adjust warnings handling in Directory.Build.props

---
 .github/workflows/build.yml                    | 2 ++
 .github/workflows/config/Directory.Build.props | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 47051943..5b7feb9f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,6 +17,8 @@ on:
 
 env:
   DOTNET_VERSION: ${{ '8.0.x' }}
+  DOTNET_INSTALL_DIR: dotnet-install
+  DOTNET_ROOT: dotnet-install
   ENABLE_DIAGNOSTICS: false
   #COREHOST_TRACE: 1
   COREHOST_TRACEFILE: corehosttrace.log
diff --git a/.github/workflows/config/Directory.Build.props b/.github/workflows/config/Directory.Build.props
index d4af5636..51cb6a00 100644
--- a/.github/workflows/config/Directory.Build.props
+++ b/.github/workflows/config/Directory.Build.props
@@ -17,8 +17,9 @@
     <Copyright>(c) .NET Foundation and Contributors.  All rights reserved.</Copyright>
     <PackageProjectUrl>https://github.com/CommunityToolkit/Tooling-Windows-Submodule</PackageProjectUrl>
     <PackageReleaseNotes>https://github.com/CommunityToolkit/Tooling-Windows-Submodule/releases</PackageReleaseNotes>
-    <!-- TODO: Remove when closing https://github.com/CommunityToolkit/Labs-Windows/issues/256 -->
-    <NoWarn>$(NoWarn);NU1505;NU1504</NoWarn>
+
+    <!-- See https://github.com/CommunityToolkit/Labs-Windows/pull/605#issuecomment-2498743676 -->
+    <WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
   </PropertyGroup>
 
   <PropertyGroup>

From 2fa3c9cadb096baf97f07048826f2051a0fe2bbc Mon Sep 17 00:00:00 2001
From: Michael Hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 27 Nov 2024 12:51:55 -0800
Subject: [PATCH 2/3] Update WASDK 1.6.241114003 and CsWinRT 2.1.6 to fix
 issues with StaggeredLayout in WinUI 3

We were hitting issues with ItemSource setting in WinUI 3, per similar notes in https://github.com/CommunityToolkit/Windows/issues/516
Updating CsWin32 provided better error messages (mostly to do with using {Binding} still in samples), but this appears to resolve the ItemsSource issue I was seeing before
---
 MultiTarget/PackageReferences/WinAppSdk.props | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props
index 8f4fa3b3..b557de75 100644
--- a/MultiTarget/PackageReferences/WinAppSdk.props
+++ b/MultiTarget/PackageReferences/WinAppSdk.props
@@ -1,6 +1,7 @@
 <Project>
   <ItemGroup>
-    <PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />
+    <PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
+    <PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.Windows.CsWinRt" Version="2.1.6" PrivateAssets="all" />
     <PackageReference Condition="'$(HasWinUI)' == 'true'" Include="Microsoft.Web.WebView2" Version="1.0.2792.45" PrivateAssets="all" />
   </ItemGroup>
 </Project>

From eccfbc8827bbf2de5df74d14b0f828ba8e19a2a1 Mon Sep 17 00:00:00 2001
From: Michael Hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Wed, 27 Nov 2024 14:47:48 -0800
Subject: [PATCH 3/3] Fix a typo in config file comment

---
 ProjectHeads/App.Head.WinAppSdk.Dependencies.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props
index 154d4526..833d010f 100644
--- a/ProjectHeads/App.Head.WinAppSdk.Dependencies.props
+++ b/ProjectHeads/App.Head.WinAppSdk.Dependencies.props
@@ -1,4 +1,4 @@
-<!-- Nuget package dependencies for all deployable UWP project heads -->
+<!-- Nuget package dependencies for all deployable WASDK project heads -->
 <!-- Due to the quirks of non-sdk style projects, we cannot create a unified Dependencies.props for deployable head. -->
 <Project>
   <ItemGroup>