split uwp and desktop

Author: robmikh

AppxManifest.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp build" xmlns:build="http://schemas.microsoft.com/developer/appx/2015/build">
+  <Identity Name="748880FC-7B08-4BC5-B0C1-35FA863C53C8" Publisher="CN=25C90434-4343-4A2A-BB16-CF3209256BD3" Version="0.0.1.0" ProcessorArchitecture="x64" />
+  <mp:PhoneIdentity PhoneProductId="748880FC-7B08-4BC5-B0C1-35FA863C53C8" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+  <Properties>
+    <DisplayName>Minesweeper-rs</DisplayName>
+    <PublisherDisplayName>robmi</PublisherDisplayName>
+    <Logo>assets\StoreLogo.png</Logo>
+  </Properties>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17134.0" MaxVersionTested="10.0.18362.0" />
+    <PackageDependency Name="Microsoft.VCLibs.140.00" MinVersion="14.0.27810.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
+  </Dependencies>
+  <Resources>
+    <Resource Language="EN-US" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="target\x86_64-uwp-windows-msvc\debug\minesweeper-rs.exe" EntryPoint="Minesweeper.App">
+      <uap:VisualElements DisplayName="minesweeper-rs" Description="A port of robmikh/Minesweeper using winrt-rs." Square44x44Logo="assets\Square44x44Logo.png" Square150x150Logo="assets\Square150x150Logo.png" BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="assets\Wide310x150Logo.png"></uap:DefaultTile>
+        <uap:SplashScreen Image="assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+  </Capabilities>
+</Package>

Cargo.lock

@@ -7,9 +7,11 @@ edition = "2018"
 [dependencies]
 windows = "0.18.0"
 bindings = { path = "bindings" }
+rand = "0.8.3"
+
+[target.'cfg(target_vendor = "pc")'.dependencies]
 winit = "0.24.0"
 raw-window-handle = "0.3.3"
-rand = "0.8.3"
 
 [features]
 show-mines = []

Cargo.toml

@@ -2,10 +2,25 @@
 A port of [robmikh/Minesweeper](https://github.com/robmikh/Minesweeper) using [windows-rs](https://github.com/microsoft/windows-rs).
 
 ## Running
-Running this sample requires at least Windows build 1803 (v10.0.17134.0). To compile and run (after setting up), use:
+Running this sample requires at least Windows build 1803 (v10.0.17134.0). Instructions are a little different between desktop and UWP:
+
+### Desktop
+Running Minesweeper as a normal desktop application can be done as follows:
 
 ```
 cargo run --release
 ```
 
+### UWP
+
+Running Minesweeper as a UWP application can be done by building for a `*-uwp-windows-msvc` target and then registering the app. More information can be found [here](UWP.md). 
+
+```
+cargo +nightly build -Z build-std=std,panic_abort --target x86_64-uwp-windows-msvc
+(powershell.exe) Add-AppxPackage -Register AppxManifest.xml
+```
+*NOTE: AppManifest.xml currently assumes the `x86_64-uwp-windows-msvc` target but can be updated.*
+
+Then launch minesweeper-rs from the Start Menu.
+
 ![minesweeper-opt2](https://user-images.githubusercontent.com/7089228/80656536-45ac2c80-8a36-11ea-8521-ab40fc922ce1.gif)

README.md

@@ -0,0 +1,26 @@
+# Building for `*-uwp-windows-msvc` targets
+
+## Required tools
+First, you'll need to install the nightly toolchain:
+
+```
+rustup toolchain install nightly
+rustup component add rust-src
+```
+
+I'm using version `1.50.0-nightly (1c389ffef 2020-11-24)`. If you already have a nightly toolchain installed and you're seeing an error about `SetThreadStackGuarantee`, update your nightly toolchain.
+
+## Building Minesweeper
+From the appropriate VS command prompt (e.g. "x64 Native Tools Command Prompt for VS 2019" when building for x86_64), run cargo but target a uwp target:
+
+```
+cargo +nightly build -Z build-std=std,panic_abort --target x86_64-uwp-windows-msvc
+```
+
+After that, you should be able to register your application:
+
+```
+(powershell.exe) Add-AppxPackage -Register AppxManifest.xml
+```
+
+Special thanks to [bdbai](https://github.com/bdbai) for the [firstuwp-rs](https://github.com/bdbai/firstuwp-rs) project. Without that, I wouldn't have known about the [build-std](https://doc.rust-lang.org/cargo/reference/unstable.html#build-std) cargo feature.