From 1c784c0beec87bbd62d3dd53b708c63b614758e4 Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Fri, 1 Sep 2023 09:31:00 -0700
Subject: [PATCH 1/3] Restore WAP solution and project for bundle publishing
 (and remove win32)

---
 .../WinUIGallery.DesktopWap.Package.wapproj   | 103 ++++++++++++++++++
 WinUIGallery/WinUIGallery.DesktopWap.sln      |  62 +++++++++++
 WinUIGallery/WinUIGallery.sln                 |  14 ---
 3 files changed, 165 insertions(+), 14 deletions(-)
 create mode 100644 WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
 create mode 100644 WinUIGallery/WinUIGallery.DesktopWap.sln

diff --git a/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj b/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
new file mode 100644
index 000000000..33f3ec364
--- /dev/null
+++ b/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+    <SDKIdentifier>Windows</SDKIdentifier>
+    <SDKVersion>10.0</SDKVersion>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <Import Project="common.props" />
+  <PropertyGroup>
+    <ProjectGuid>4c7b20d7-5f5c-440e-8da3-b19a328cc8bd</ProjectGuid>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <EntryPointProjectUniqueName>WinUIGallery.csproj</EntryPointProjectUniqueName>
+    <AppxBundleNameForOutput>WinUIGallery.DesktopWap</AppxBundleNameForOutput>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsInWinUIRepo)' == 'true'">
+    <PackageCertificateKeyFile>$(ProjectRoot)build\MSTest.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+    <AppxBundlePlatforms Condition="'$(BuildAllAppFlavors)' == 'true'">x86|x64|ARM64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+    <PackageCertificateKeyFile>D:\git\WinUI-Gallery2\build\WinUI-Gallery-Test.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest" Condition="!('$(Configuration)' == 'Debug')">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <AppxManifest Include="Package.Dev.appxmanifest" Condition="'$(Configuration)' == 'Debug'">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="WinUIGallery.csproj">
+      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
+      <PublishProfile>Properties\PublishProfiles\win10-$(Platform)-unpackaged.pubxml</PublishProfile>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(WindowsAppSdkPackageVersion)' != ''">
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="[$(WindowsAppSdkPackageVersion)]" GeneratePathProperty="true">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="[$(MicrosoftWindowsSDKBuildToolsNugetPackageVersion)]">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+</Project>
\ No newline at end of file
diff --git a/WinUIGallery/WinUIGallery.DesktopWap.sln b/WinUIGallery/WinUIGallery.DesktopWap.sln
new file mode 100644
index 000000000..e6841b1e5
--- /dev/null
+++ b/WinUIGallery/WinUIGallery.DesktopWap.sln
@@ -0,0 +1,62 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32319.34
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A98961E3-CB85-4AFC-990C-FD9F57043E7D}"
+	ProjectSection(SolutionItems) = preProject
+		..\Directory.Build.props = ..\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "WinUIGallery.DesktopWap.Package", "WinUIGallery.DesktopWap.Package.wapproj", "{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUIGallery", "WinUIGallery.csproj", "{D78F3B56-340D-44F0-9AF1-320D473BA611}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|ARM64.Build.0 = Debug|ARM64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x64.ActiveCfg = Debug|x64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x64.Build.0 = Debug|x64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x64.Deploy.0 = Debug|x64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x86.ActiveCfg = Debug|x86
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x86.Build.0 = Debug|x86
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Debug|x86.Deploy.0 = Debug|x86
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|ARM64.Build.0 = Release|ARM64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|ARM64.Deploy.0 = Release|ARM64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x64.ActiveCfg = Release|x64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x64.Build.0 = Release|x64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x64.Deploy.0 = Release|x64
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x86.ActiveCfg = Release|x86
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x86.Build.0 = Release|x86
+		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x86.Deploy.0 = Release|x86
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|ARM64.ActiveCfg = Debug-Unpackaged|ARM64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|ARM64.Build.0 = Debug-Unpackaged|ARM64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x64.ActiveCfg = Debug-Unpackaged|x64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x64.Build.0 = Debug-Unpackaged|x64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x86.ActiveCfg = Debug-Unpackaged|x86
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x86.Build.0 = Debug-Unpackaged|x86
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|ARM64.ActiveCfg = Release-Unpackaged|ARM64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|ARM64.Build.0 = Release-Unpackaged|ARM64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x64.ActiveCfg = Release-Unpackaged|x64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x64.Build.0 = Release-Unpackaged|x64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x86.ActiveCfg = Release-Unpackaged|x86
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x86.Build.0 = Release-Unpackaged|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5B033CDA-6491-405C-A05B-CEE6AC4060B9}
+	EndGlobalSection
+EndGlobal
diff --git a/WinUIGallery/WinUIGallery.sln b/WinUIGallery/WinUIGallery.sln
index 870e4ca6f..ae69389f3 100644
--- a/WinUIGallery/WinUIGallery.sln
+++ b/WinUIGallery/WinUIGallery.sln
@@ -13,19 +13,15 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
-		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Debug-Unpackaged|ARM64 = Debug-Unpackaged|ARM64
-		Debug-Unpackaged|Win32 = Debug-Unpackaged|Win32
 		Debug-Unpackaged|x64 = Debug-Unpackaged|x64
 		Debug-Unpackaged|x86 = Debug-Unpackaged|x86
 		Release|ARM64 = Release|ARM64
-		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 		Release-Unpackaged|ARM64 = Release-Unpackaged|ARM64
-		Release-Unpackaged|Win32 = Release-Unpackaged|Win32
 		Release-Unpackaged|x64 = Release-Unpackaged|x64
 		Release-Unpackaged|x86 = Release-Unpackaged|x86
 	EndGlobalSection
@@ -33,9 +29,6 @@ Global
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|ARM64.Build.0 = Debug|ARM64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|Win32.ActiveCfg = Debug|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|Win32.Build.0 = Debug|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|Win32.Deploy.0 = Debug|x86
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x64.ActiveCfg = Debug|x64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x64.Build.0 = Debug|x64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x64.Deploy.0 = Debug|x64
@@ -44,8 +37,6 @@ Global
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x86.Deploy.0 = Debug|x86
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug-Unpackaged|ARM64.ActiveCfg = Debug-Unpackaged|ARM64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug-Unpackaged|ARM64.Build.0 = Debug-Unpackaged|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug-Unpackaged|Win32.ActiveCfg = Debug-Unpackaged|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug-Unpackaged|Win32.Build.0 = Debug-Unpackaged|x86
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug-Unpackaged|x64.ActiveCfg = Debug-Unpackaged|x64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug-Unpackaged|x64.Build.0 = Debug-Unpackaged|x64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug-Unpackaged|x86.ActiveCfg = Debug-Unpackaged|x86
@@ -53,9 +44,6 @@ Global
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|ARM64.ActiveCfg = Release|ARM64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|ARM64.Build.0 = Release|ARM64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|ARM64.Deploy.0 = Release|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|Win32.ActiveCfg = Release|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|Win32.Build.0 = Release|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|Win32.Deploy.0 = Release|x86
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x64.ActiveCfg = Release|x64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x64.Build.0 = Release|x64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x64.Deploy.0 = Release|x64
@@ -64,8 +52,6 @@ Global
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x86.Deploy.0 = Release|x86
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release-Unpackaged|ARM64.ActiveCfg = Release-Unpackaged|ARM64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release-Unpackaged|ARM64.Build.0 = Release-Unpackaged|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release-Unpackaged|Win32.ActiveCfg = Release-Unpackaged|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release-Unpackaged|Win32.Build.0 = Release-Unpackaged|x86
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release-Unpackaged|x64.ActiveCfg = Release-Unpackaged|x64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release-Unpackaged|x64.Build.0 = Release-Unpackaged|x64
 		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release-Unpackaged|x86.ActiveCfg = Release-Unpackaged|x86

From 6f8ba6a1f17c0cc020329c7a4003213f7570d270 Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Fri, 1 Sep 2023 16:03:44 -0700
Subject: [PATCH 2/3] PR feedback - use packaged config with a bit of
 refactoring

---
 .../WinUIGallery.DesktopWap.Package.wapproj   |  6 +++--
 WinUIGallery/WinUIGallery.DesktopWap.sln      | 24 +++++++++----------
 WinUIGallery/WinUIGallery.csproj              | 21 +++++++++-------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj b/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
index 33f3ec364..09c1142ea 100644
--- a/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
+++ b/WinUIGallery/WinUIGallery.DesktopWap.Package.wapproj
@@ -48,6 +48,9 @@
   <PropertyGroup Condition="'$(IsInWinUIRepo)' == 'true'">
     <PackageCertificateKeyFile>$(ProjectRoot)build\MSTest.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(IsInWinUIRepo)' != 'true'">
+    <PackageCertificateKeyFile Condition="'$(PackageCertificateKeyFile)'==''">$(SolutionDir)..\build\WinUI-Gallery-Test.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
   <PropertyGroup>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
@@ -57,7 +60,6 @@
     <AppxBundlePlatforms Condition="'$(BuildAllAppFlavors)' == 'true'">x86|x64|ARM64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
-    <PackageCertificateKeyFile>D:\git\WinUI-Gallery2\build\WinUI-Gallery-Test.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <AppxBundle>Always</AppxBundle>
@@ -88,7 +90,7 @@
   <ItemGroup>
     <ProjectReference Include="WinUIGallery.csproj">
       <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-      <PublishProfile>Properties\PublishProfiles\win10-$(Platform)-unpackaged.pubxml</PublishProfile>
+      <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup Condition="'$(WindowsAppSdkPackageVersion)' != ''">
diff --git a/WinUIGallery/WinUIGallery.DesktopWap.sln b/WinUIGallery/WinUIGallery.DesktopWap.sln
index e6841b1e5..e687830bb 100644
--- a/WinUIGallery/WinUIGallery.DesktopWap.sln
+++ b/WinUIGallery/WinUIGallery.DesktopWap.sln
@@ -40,18 +40,18 @@ Global
 		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x86.ActiveCfg = Release|x86
 		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x86.Build.0 = Release|x86
 		{4C7B20D7-5F5C-440E-8DA3-B19A328CC8BD}.Release|x86.Deploy.0 = Release|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|ARM64.ActiveCfg = Debug-Unpackaged|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|ARM64.Build.0 = Debug-Unpackaged|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x64.ActiveCfg = Debug-Unpackaged|x64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x64.Build.0 = Debug-Unpackaged|x64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x86.ActiveCfg = Debug-Unpackaged|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x86.Build.0 = Debug-Unpackaged|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|ARM64.ActiveCfg = Release-Unpackaged|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|ARM64.Build.0 = Release-Unpackaged|ARM64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x64.ActiveCfg = Release-Unpackaged|x64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x64.Build.0 = Release-Unpackaged|x64
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x86.ActiveCfg = Release-Unpackaged|x86
-		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x86.Build.0 = Release-Unpackaged|x86
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x64.ActiveCfg = Debug|x64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x64.Build.0 = Debug|x64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x86.ActiveCfg = Debug|x86
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Debug|x86.Build.0 = Debug|x86
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|ARM64.Build.0 = Release|ARM64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x64.ActiveCfg = Release|x64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x64.Build.0 = Release|x64
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x86.ActiveCfg = Release|x86
+		{D78F3B56-340D-44F0-9AF1-320D473BA611}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/WinUIGallery/WinUIGallery.csproj b/WinUIGallery/WinUIGallery.csproj
index 9af57bf5a..0ab4b6832 100644
--- a/WinUIGallery/WinUIGallery.csproj
+++ b/WinUIGallery/WinUIGallery.csproj
@@ -26,16 +26,18 @@
         <Packaged Condition="'$(Configuration)' == 'Debug-Unpackaged' Or '$(Configuration)' == 'Release-Unpackaged'">false</Packaged>
         <Optimized>true</Optimized>
         <Optimized Condition="'$(Configuration)' == 'Debug-Unpackaged' Or '$(Configuration)' == 'Debug'">false</Optimized>
+        <SingleProject>true</SingleProject>
+        <SingleProject Condition="'$(SolutionName)' == 'WinUIGallery.DesktopWap'">false</SingleProject>
         <!--<WindowsAppSdkSelfContained>true</WindowsAppSdkSelfContained>-->
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(Packaged)' != 'true'">
+    <PropertyGroup Condition="'$(Packaged)' != 'true' and '$(SingleProject)'=='true'">
         <PublishProfile>win10-$(Platform)-unpackaged.pubxml</PublishProfile>
         <EnableMsixTooling>false</EnableMsixTooling>
         <WindowsPackageType>None</WindowsPackageType>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(Packaged)' == 'true'">
+    <PropertyGroup Condition="'$(Packaged)' == 'true' and '$(SingleProject)'=='true'">
         <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
         <WindowsPackageType>MSIX</WindowsPackageType>
         <AppxBundleNameForOutput>WinUIGallery</AppxBundleNameForOutput>
@@ -55,13 +57,10 @@
         <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
         <SDKVersion>10.0</SDKVersion>
         <PfxFile>$(MSBuildProjectDirectory)\..\build\WinUI-Gallery-Test.pfx</PfxFile>
+        <PackageCertificateKeyFile Condition="Exists('$(PfxFile)')">$(PfxFile)</PackageCertificateKeyFile>
     </PropertyGroup>
 
-    <PropertyGroup Condition="Exists('$(PfxFile)')">
-        <PackageCertificateKeyFile>..\build\WinUI-Gallery-Test.pfx</PackageCertificateKeyFile>
-    </PropertyGroup>
-
-    <ItemGroup>
+    <ItemGroup Condition="'$(SingleProject)'=='true'">
         <AppxManifest Include="Package.appxmanifest" Condition="'$(Release)' == 'true'">
             <SubType>Designer</SubType>
         </AppxManifest>
@@ -69,6 +68,7 @@
             <SubType>Designer</SubType>
         </AppxManifest>
     </ItemGroup>
+
     <PropertyGroup Condition="'$(IsInWinUIRepo)' == 'true'">
         <GenerateAppInstallerFile>true</GenerateAppInstallerFile>
         <!-- URI must be absolute so this is really only useful for testing a locally produced AppInstaller. -->
@@ -249,12 +249,15 @@
     <Import Project="ContentIncludes.props" />
 
     <!-- Workaround to ensure WindowsAppSDK-VersionInfo.cs is included in project exactly once, before any compilation -->
-    <PropertyGroup Condition="'$(WindowsAppSdkSelfContained)'!='true'">
+    <PropertyGroup>
+        <ExplicitlyIncludeVersionInfo Condition="'$(WindowsAppSdkSelfContained)'=='true' or '$(SingleProject)'!='true'">true</ExplicitlyIncludeVersionInfo>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(ExplicitlyIncludeVersionInfo)'!='true'">
         <CoreCompileDependsOn Condition="'$(Packaged)'=='true'">$(CoreCompileDependsOn);GenerateDeploymentManagerCS</CoreCompileDependsOn>
         <CoreCompileDependsOn Condition="'$(Packaged)'!='true'">$(CoreCompileDependsOn);GenerateBootstrapCS</CoreCompileDependsOn>
     </PropertyGroup>
     <ItemGroup>
-        <Compile Condition="'$(WindowsAppSdkSelfContained)'=='true'" Include="$(MicrosoftWindowsAppSDKPackageDir)include\WindowsAppSDK-VersionInfo.cs" />
+        <Compile Condition="'$(ExplicitlyIncludeVersionInfo)'=='true'" Include="$(MicrosoftWindowsAppSDKPackageDir)include\WindowsAppSDK-VersionInfo.cs" />
     </ItemGroup>
     <!-- When WindowsAppSdkIncludeVersionInfo supported, above workaround can be replaced with this: -->
     <PropertyGroup>

From 776b8c07135bb9d3724385abc64c01ee1352063b Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Thu, 7 Sep 2023 11:41:03 -0700
Subject: [PATCH 3/3] update WCT to resolve regression

---
 WinUIGallery/standalone.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WinUIGallery/standalone.props b/WinUIGallery/standalone.props
index 143b82309..ab367c245 100644
--- a/WinUIGallery/standalone.props
+++ b/WinUIGallery/standalone.props
@@ -6,7 +6,7 @@
     <MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
     <GraphicsWin2DVersion>1.0.4</GraphicsWin2DVersion>
     <ColorCodeVersion>2.0.13</ColorCodeVersion>
-    <CommunityToolkitWinUIVersion>8.0.230823-rc</CommunityToolkitWinUIVersion>
+    <CommunityToolkitWinUIVersion>8.0.230907</CommunityToolkitWinUIVersion>
     <MicrosoftWindowsSDKBuildToolsNugetPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsNugetPackageVersion>
     <MicrosoftCsWinRTPackageVersion>2.0.3</MicrosoftCsWinRTPackageVersion>
     <!-- We have multiple projects in the same directory, which means we need to separate their output paths-->