Use WindowsAppSDK

SampleApps/WinUiApp (Package)/WinUiApp (Package).wapproj

@@ -1,59 +0,0 @@
-<?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|x64">
-            <Configuration>Debug</Configuration>
-            <Platform>x64</Platform>
-        </ProjectConfiguration>
-        <ProjectConfiguration Include="Release|x64">
-            <Configuration>Release</Configuration>
-            <Platform>x64</Platform>
-        </ProjectConfiguration>
-    </ItemGroup>
-    <PropertyGroup>
-        <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-        <PathToXAMLWinRTImplementations>WinUiApp\</PathToXAMLWinRTImplementations>
-    </PropertyGroup>
-    <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-    <PropertyGroup>
-        <ProjectGuid>2db6959f-1768-495c-8eed-4830ef185584</ProjectGuid>
-        <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-        <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-        <AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
-        <DefaultLanguage>en-US</DefaultLanguage>
-        <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-        <EntryPointProjectUniqueName>..\WinUiApp\WinUiApp.csproj</EntryPointProjectUniqueName>
-    </PropertyGroup>
-    <ItemGroup>
-        <AppxManifest Include="Package.appxmanifest">
-            <SubType>Designer</SubType>
-        </AppxManifest>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Images\SplashScreen.scale-200.png" />
-        <Content Include="Images\LockScreenLogo.scale-200.png" />
-        <Content Include="Images\Square150x150Logo.scale-200.png" />
-        <Content Include="Images\Square44x44Logo.scale-200.png" />
-        <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
-        <Content Include="Images\StoreLogo.png" />
-        <Content Include="Images\Wide310x150Logo.scale-200.png" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\WinUiApp\WinUiApp.csproj">
-            <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-            <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
-        </ProjectReference>
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="Microsoft.ProjectReunion" Version="[0.8.5]">
-            <IncludeAssets>build</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.8.5]">
-            <IncludeAssets>build</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-    <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
-</Project>

SampleApps/WinUiApp (Package)/WinUiApp (Package).wapproj.user

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <DebuggerFlavor>AppHostLocalDebugger</DebuggerFlavor>
-    <RemoteDebugEnabled>False</RemoteDebugEnabled>
-  </PropertyGroup>
-</Project>

SampleApps/WinUiApp/App.xaml

@@ -1,8 +1,7 @@
 <Application
     x:Class="SampleApplication.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SampleApplicationplication">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

SampleApps/WinUiApp/App.xaml.cs

@@ -4,6 +4,8 @@ namespace SampleApplication
 {
     public partial class App : Application
     {
+        private Window window;
+
         public App()
         {
             InitializeComponent();
@@ -14,7 +16,5 @@ namespace SampleApplication
             window = new MainWindow();
             window.Activate();
         }
-
-        private Window window;
     }
 }

SampleApps/WinUiApp/Package.appxmanifest

@@ -7,14 +7,14 @@
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="84f8e6f4-81bf-4eea-81ad-898a437057ae"
+    Name="a9035747-171b-446d-b7ab-ed75820b0cd4"
     Publisher="CN=Clemens"
     Version="1.0.0.0" />
 
   <Properties>
-    <DisplayName>WinUiApp (Package)</DisplayName>
+    <DisplayName>WinUiApp</DisplayName>
     <PublisherDisplayName>Clemens</PublisherDisplayName>
-    <Logo>Images\StoreLogo.png</Logo>
+    <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
 
   <Dependencies>
@@ -31,13 +31,13 @@
       Executable="$targetnametoken$.exe"
       EntryPoint="$targetentrypoint$">
       <uap:VisualElements
-        DisplayName="WinUiApp (Package)"
-        Description="WinUiApp (Package)"
+        DisplayName="WinUiApp"
+        Description="WinUiApp"
         BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
-        <uap:SplashScreen Image="Images\SplashScreen.png" />
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
       </uap:VisualElements>
     </Application>
   </Applications>

SampleApps/WinUiApp/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>

SampleApps/WinUiApp/Properties/PublishProfiles/win10-x64.pubxml

@@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
    <!-- 
     See https://github.com/microsoft/CsWinRT/issues/373
     <PublishTrimmed>True</PublishTrimmed>

SampleApps/WinUiApp/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>

SampleApps/WinUiApp/Properties/launchSettings.json

@@ -0,0 +1,10 @@
+{
+  "profiles": {
+    "WinUiApp (Package)": {
+      "commandName": "MsixPackage"
+    },
+    "WinUiApp (Unpackaged)": {
+      "commandName": "Project"
+    }
+  }
+}

SampleApps/WinUiApp/WinUiApp.csproj

@@ -1,12 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net5.0-windows10.0.19041</TargetFramework>
+        <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <RootNamespace>SampleApplication</RootNamespace>
         <ApplicationManifest>app.manifest</ApplicationManifest>
-        <Platforms>x64</Platforms>
-        <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+        <Platforms>x86;x64;arm64</Platforms>
+        <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+        <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
         <UseWinUI>true</UseWinUI>
         <Product>XAML Map Control</Product>
         <Version>6.1.0</Version>
@@ -14,6 +15,7 @@
         <Authors>Clemens Fischer</Authors>
         <Copyright>Copyright © 2021 Clemens Fischer</Copyright>
         <AnalysisLevel>none</AnalysisLevel>
+        <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -27,19 +29,32 @@
     <ItemGroup>
         <Compile Include="..\Shared\*.cs" />
     </ItemGroup>
-    
+
     <ItemGroup>
-      <Content Include="..\Shared\10_535_330.jpg" Link="10_535_330.jpg" />
+        <Content Include="..\Shared\10_535_330.jpg" Link="10_535_330.jpg" />
+        <Content Include="Assets\SplashScreen.scale-200.png" />
+        <Content Include="Assets\LockScreenLogo.scale-200.png" />
+        <Content Include="Assets\Square150x150Logo.scale-200.png" />
+        <Content Include="Assets\Square44x44Logo.scale-200.png" />
+        <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+        <Content Include="Assets\StoreLogo.png" />
+        <Content Include="Assets\Wide310x150Logo.scale-200.png" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.5" />
-        <PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.5" />
-        <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.5" />
+        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
+        <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.196" />
         <Manifest Include="$(ApplicationManifest)" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\..\MapControl\WinUI\MapControl.WinUI.csproj" />
     </ItemGroup>
+
+    <!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
+         Tools extension to be activated for this project even if the Windows App SDK Nuget
+         package has not yet been restored -->
+    <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
+        <ProjectCapability Include="Msix" />
+    </ItemGroup>
 </Project>

SampleApps/WinUiApp/WinUiApp.csproj.user

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <RunAnalyzersDuringLiveAnalysis>true</RunAnalyzersDuringLiveAnalysis>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Update="App.xaml">
-      <SubType>Designer</SubType>
-    </None>
-    <None Update="MainWindow.xaml">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-</Project>