From 87ce28d5016f7c9f81f085790d607125c13d1305 Mon Sep 17 00:00:00 2001
From: William Bohrmann <wbohrmann@esri.com>
Date: Mon, 9 Dec 2024 10:11:43 -0800
Subject: [PATCH 1/5] add property: AllowUnsafeBlocks

---
 src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj b/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
index d6981f07b8..aeeee2dec3 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
@@ -15,6 +15,7 @@
     <EnableMsixTooling>true</EnableMsixTooling>
     <DefineConstants>$(DefineConstants);WinUI</DefineConstants>
     <UseRidGraph>true</UseRidGraph>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>

From 7bf65744adbf93604327e4c13a3b02fd66bd4216 Mon Sep 17 00:00:00 2001
From: William Bohrmann <wbohrmann@esri.com>
Date: Mon, 9 Dec 2024 10:11:54 -0800
Subject: [PATCH 2/5] add property: WindowsSdkPackageVersion

---
 src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj b/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
index aeeee2dec3..2534c4b8f7 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
@@ -15,6 +15,7 @@
     <EnableMsixTooling>true</EnableMsixTooling>
     <DefineConstants>$(DefineConstants);WinUI</DefineConstants>
     <UseRidGraph>true</UseRidGraph>
+    <WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 

From 04afa4bcb14fa0cd7b7affee0f49e43c30bba67d Mon Sep 17 00:00:00 2001
From: William Bohrmann <wbohrmann@esri.com>
Date: Mon, 9 Dec 2024 14:36:42 -0800
Subject: [PATCH 3/5] apply properties to maui app

---
 src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj b/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
index 4ada0da453..cb2f04361d 100644
--- a/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
+++ b/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
@@ -30,6 +30,8 @@
 		<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
 		<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
 		<RuntimeIdentifier Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND '$(Platform)' == 'AnyCPU'">win10-x64</RuntimeIdentifier>
+		<WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
+		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <AppxPackageDir>..\..\..\output\$(RuntimeIdentifier)\</AppxPackageDir>
 	</PropertyGroup>
 

From 81df16d5413cb8bd0a8f6bbbf8e133eb76e7c324 Mon Sep 17 00:00:00 2001
From: William Bohrmann <wbohrmann@esri.com>
Date: Mon, 9 Dec 2024 17:21:33 -0800
Subject: [PATCH 4/5] windows conditionals

---
 src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj b/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
index cb2f04361d..2507449d08 100644
--- a/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
+++ b/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
@@ -30,8 +30,8 @@
 		<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
 		<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
 		<RuntimeIdentifier Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND '$(Platform)' == 'AnyCPU'">win10-x64</RuntimeIdentifier>
-		<WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
-		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+		<AllowUnsafeBlocks Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">True</AllowUnsafeBlocks>
+		<WindowsSdkPackageVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.38</WindowsSdkPackageVersion>
     <AppxPackageDir>..\..\..\output\$(RuntimeIdentifier)\</AppxPackageDir>
 	</PropertyGroup>
 

From acb648450a1b2f15463b12f073734fa8b812cf4f Mon Sep 17 00:00:00 2001
From: Prathamesh Narkhede <pnarkhede@esri.com>
Date: Tue, 10 Dec 2024 16:50:32 -0800
Subject: [PATCH 5/5] Added explicit PackageReference for
 Microsoft.WindowsAppSDK in ArcGIS.Samples.Maui.csproj. Removed condition for
 WindowsAppSDK PackageVersion from Directory.Packages.props.

---
 src/Directory.Packages.props                     | 2 +-
 src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index c999006a04..73815ecf4b 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -25,7 +25,7 @@
     <PackageVersion Include="CommunityToolkit.Maui" Version="9.0.1" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageVersion Include="WinUIEx" Version="2.3.4" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" Condition="'$(UseMaui)'!='true'" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" Condition="'$(UseMaui)'!='true'" />
     <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.1.1" />
diff --git a/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj b/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
index 2507449d08..5fdce3618a 100644
--- a/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
+++ b/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
@@ -146,6 +146,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows10.0.19041.0'">
     <PackageReference Include="WinUIEx" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" />
+	<PackageReference Include="Microsoft.WindowsAppSDK" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
     <PackageReference Include="Xamarin.AndroidX.AppCompat" />