From 71259842ca3cd1302978461fe8b4e9a9402c1faa Mon Sep 17 00:00:00 2001
From: dotMorten <mn@iter.dk>
Date: Fri, 20 Sep 2024 13:12:53 -0700
Subject: [PATCH] Fix sample build errors

---
 src/WinUIExSample/LogWindow.xaml.cs           |  7 +++++--
 .../PublishProfiles/win-arm64.pubxml          | 20 +++++++++++++++++++
 .../Properties/PublishProfiles/win-x64.pubxml | 20 +++++++++++++++++++
 .../Properties/PublishProfiles/win-x86.pubxml | 20 +++++++++++++++++++
 .../PublishProfiles/win10-arm64.pubxml        | 20 +++++++++++++++++++
 .../PublishProfiles/win10-x64.pubxml          | 20 +++++++++++++++++++
 .../PublishProfiles/win10-x86.pubxml          | 20 +++++++++++++++++++
 src/WinUIExSample/WinUIExSample.csproj        |  5 +++--
 8 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 src/WinUIExSample/Properties/PublishProfiles/win-arm64.pubxml
 create mode 100644 src/WinUIExSample/Properties/PublishProfiles/win-x64.pubxml
 create mode 100644 src/WinUIExSample/Properties/PublishProfiles/win-x86.pubxml
 create mode 100644 src/WinUIExSample/Properties/PublishProfiles/win10-arm64.pubxml
 create mode 100644 src/WinUIExSample/Properties/PublishProfiles/win10-x64.pubxml
 create mode 100644 src/WinUIExSample/Properties/PublishProfiles/win10-x86.pubxml

diff --git a/src/WinUIExSample/LogWindow.xaml.cs b/src/WinUIExSample/LogWindow.xaml.cs
index b9f4d0a..d921266 100644
--- a/src/WinUIExSample/LogWindow.xaml.cs
+++ b/src/WinUIExSample/LogWindow.xaml.cs
@@ -1,4 +1,7 @@
-namespace WinUIExSample;
+using System.Linq;
+using Microsoft.UI.Xaml;
+
+namespace WinUIExSample
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
@@ -27,4 +30,4 @@ internal void UpdateLog()
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/WinUIExSample/Properties/PublishProfiles/win-arm64.pubxml b/src/WinUIExSample/Properties/PublishProfiles/win-arm64.pubxml
new file mode 100644
index 0000000..67adb09
--- /dev/null
+++ b/src/WinUIExSample/Properties/PublishProfiles/win-arm64.pubxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Platform>arm64</Platform>
+    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
+    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/WinUIExSample/Properties/PublishProfiles/win-x64.pubxml b/src/WinUIExSample/Properties/PublishProfiles/win-x64.pubxml
new file mode 100644
index 0000000..d73a99a
--- /dev/null
+++ b/src/WinUIExSample/Properties/PublishProfiles/win-x64.pubxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Platform>x64</Platform>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/WinUIExSample/Properties/PublishProfiles/win-x86.pubxml b/src/WinUIExSample/Properties/PublishProfiles/win-x86.pubxml
new file mode 100644
index 0000000..72508ea
--- /dev/null
+++ b/src/WinUIExSample/Properties/PublishProfiles/win-x86.pubxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Platform>x86</Platform>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/WinUIExSample/Properties/PublishProfiles/win10-arm64.pubxml b/src/WinUIExSample/Properties/PublishProfiles/win10-arm64.pubxml
new file mode 100644
index 0000000..70f6a2b
--- /dev/null
+++ b/src/WinUIExSample/Properties/PublishProfiles/win10-arm64.pubxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Platform>arm64</Platform>
+    <RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
+    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/WinUIExSample/Properties/PublishProfiles/win10-x64.pubxml b/src/WinUIExSample/Properties/PublishProfiles/win10-x64.pubxml
new file mode 100644
index 0000000..837e565
--- /dev/null
+++ b/src/WinUIExSample/Properties/PublishProfiles/win10-x64.pubxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Platform>x64</Platform>
+    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/WinUIExSample/Properties/PublishProfiles/win10-x86.pubxml b/src/WinUIExSample/Properties/PublishProfiles/win10-x86.pubxml
new file mode 100644
index 0000000..b72b73f
--- /dev/null
+++ b/src/WinUIExSample/Properties/PublishProfiles/win10-x86.pubxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Platform>x86</Platform>
+    <RuntimeIdentifier>win10-x86</RuntimeIdentifier>
+    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/WinUIExSample/WinUIExSample.csproj b/src/WinUIExSample/WinUIExSample.csproj
index ef92eaa..5b2bd76 100644
--- a/src/WinUIExSample/WinUIExSample.csproj
+++ b/src/WinUIExSample/WinUIExSample.csproj
@@ -8,7 +8,8 @@
     <Platforms>x86;x64;ARM64</Platforms>
     <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &gt;= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
+    <PublishProfile  Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &gt;= 8">win-$(Platform).pubxml</PublishProfile>
+    <PublishProfile  Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) &lt; 8">win10-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
     <Configurations>Debug;Release;Experimental</Configurations>
@@ -16,7 +17,7 @@
     <!-- Uncomment to run unpackaged: -->
     <!--<WindowsPackageType>None</WindowsPackageType>-->
     <WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
-    <PublishAot>true</PublishAot>
+    <PublishAot Condition="'$(RuntimeIdentifier)'=='win-x64'">true</PublishAot>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Experimental'">