From 4f9bb3cda52cdcd4074dfaf091fb99fe77c3c367 Mon Sep 17 00:00:00 2001
From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Wed, 25 Oct 2023 17:41:27 -0700
Subject: [PATCH 1/2] Deploy UWP assets to Assets dir using CMake.

---
 test/CMakeLists.txt           | 11 +++++++----
 test/uwp/Package.appxmanifest |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 832d658..9d964d6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,15 +2,18 @@ if(PROXYRES_BUILD_CLI)
     set(PROXYCLI_SRCS proxycli.c)
 
     if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-        list(APPEND PROXYCLI_SRCS
+        set(PROXYCLI_ASSETS
             uwp/Square44x44Logo.png
             uwp/Square150x150Logo.png
             uwp/StoreLogo.png
-            uwp/Package.appxmanifest
-            uwp/Windows_TemporaryKey.pfx)
+            uwp/Package.appxmanifest)
+    
+        set_source_files_properties(${PROXYCLI_ASSETS} PROPERTIES 
+            VS_DEPLOYMENT_CONTENT 1
+            VS_DEPLOYMENT_LOCATION "Assets")
     endif()
 
-    add_executable(proxycli ${PROXYCLI_SRCS})
+    add_executable(proxycli ${PROXYCLI_SRCS} ${PROXYCLI_ASSETS})
     target_link_libraries(proxycli PRIVATE proxyres)
 
     if(TARGET CURL::libcurl)
diff --git a/test/uwp/Package.appxmanifest b/test/uwp/Package.appxmanifest
index f2f53cc..ec60c58 100644
--- a/test/uwp/Package.appxmanifest
+++ b/test/uwp/Package.appxmanifest
@@ -10,7 +10,7 @@
   <Properties>
     <DisplayName>proxycli</DisplayName>
     <PublisherDisplayName>CMake</PublisherDisplayName>
-    <Logo>StoreLogo.png</Logo>
+    <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
@@ -26,8 +26,8 @@
       desktop4:Subsystem="console"
       desktop4:SupportsMultipleInstances="true">
       <uap:VisualElements DisplayName="proxycli"
-        Square150x150Logo="Square150x150Logo.png"
-        Square44x44Logo="Square44x44Logo.png"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png"
         Description="proxycli"
         BackgroundColor="transparent">
       </uap:VisualElements>

From 2c646f53f3364a6cc9b86567a69326460e5cdf8f Mon Sep 17 00:00:00 2001
From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Wed, 25 Oct 2023 17:42:03 -0700
Subject: [PATCH 2/2] Remove unused temporary key.

CMake generate its own key.
---
 test/uwp/Package.appxmanifest     |   2 +-
 test/uwp/Windows_TemporaryKey.pfx | Bin 2520 -> 0 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 test/uwp/Windows_TemporaryKey.pfx

diff --git a/test/uwp/Package.appxmanifest b/test/uwp/Package.appxmanifest
index ec60c58..6f1f63a 100644
--- a/test/uwp/Package.appxmanifest
+++ b/test/uwp/Package.appxmanifest
@@ -4,7 +4,7 @@
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
   IgnorableNamespaces="uap mp">
-  <Identity Name="proxycli" Publisher="CN=CMake" Version="1.0.0.0" />
+  <Identity Name="proxycli" Publisher="CN=CMake Test Cert" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="44aa77dd-e529-4e34-afee-b47dc9485484"
     PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
diff --git a/test/uwp/Windows_TemporaryKey.pfx b/test/uwp/Windows_TemporaryKey.pfx
deleted file mode 100644
index 5a975ee0f66577a78d0ee3faf9158ae2bec8c800..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2520
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