WindowsAppSDK Version (#356)

* Modified STARTUP to include more instructions around startup project and solution platform * updated gif * added link to UWP version of WinComp samples * Update README.md Co-authored-by: Jesse Bishop <16565497+jesbis@users.noreply.github.com> * Update README.md Co-authored-by: Jesse Bishop <16565497+jesbis@users.noreply.github.com> * Update README.md Co-authored-by: Jesse Bishop <16565497+jesbis@users.noreply.github.com> * Update STARTUP.md Co-authored-by: Jesse Bishop <16565497+jesbis@users.noreply.github.com> * Update STARTUP.md Co-authored-by: Jesse Bishop <16565497+jesbis@users.noreply.github.com> * Fixes to markdown * Changed commit link to tag link * changed string for product name Co-authored-by: Jesse Bishop <16565497+jesbis@users.noreply.github.com>
2021-12-02 15:52:27 -08:00 · 2021-12-02 15:52:27 -08:00 · 6eb4bea1cc
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,8 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

+old/
+
 # User-specific files
 *.suo
 *.user
@ -21,6 +23,7 @@ build/
 bld/
 [Bb]in/
 [Oo]bj/
+*.binlog

 # Visual Studio 2015 cache/options directory
 .vs/
--- a/CodeAnalysis.ruleset
+++ b/CodeAnalysis.ruleset
@ -116,100 +116,4 @@
    <Rule Id="CA3076" Action="None" />
    <Rule Id="CA3077" Action="None" />
  </Rules>
-  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-    <Rule Id="SA0000" Action="Warning" />
-    <Rule Id="SA1000" Action="None" />
-    <Rule Id="SA1001" Action="None" />
-    <Rule Id="SA1002" Action="None" />
-    <Rule Id="SA1003" Action="None" />
-    <Rule Id="SA1004" Action="None" />
-    <Rule Id="SA1005" Action="None" />
-    <Rule Id="SA1008" Action="None" />
-    <Rule Id="SA1009" Action="None" />
-    <Rule Id="SA1010" Action="None" />
-    <Rule Id="SA1011" Action="None" />
-    <Rule Id="SA1012" Action="None" />
-    <Rule Id="SA1013" Action="None" />
-    <Rule Id="SA1014" Action="None" />
-    <Rule Id="SA1015" Action="None" />
-    <Rule Id="SA1024" Action="None" />
-    <Rule Id="SA1025" Action="None" />
-    <Rule Id="SA1028" Action="None" />
-    <Rule Id="SA1101" Action="None" />
-    <Rule Id="SA1106" Action="None" />
-    <Rule Id="SA1107" Action="None" />
-    <Rule Id="SA1108" Action="None" />
-    <Rule Id="SA1110" Action="None" />
-    <Rule Id="SA1111" Action="None" />
-    <Rule Id="SA1115" Action="None" />
-    <Rule Id="SA1116" Action="None" />
-    <Rule Id="SA1117" Action="None" />
-    <Rule Id="SA1118" Action="None" />
-    <Rule Id="SA1119" Action="None" />
-    <Rule Id="SA1120" Action="None" />
-    <Rule Id="SA1121" Action="None" />
-    <Rule Id="SA1122" Action="None" />
-    <Rule Id="SA1124" Action="None" />
-    <Rule Id="SA1127" Action="None" />
-    <Rule Id="SA1128" Action="None" />
-    <Rule Id="SA1129" Action="None" />
-    <Rule Id="SA1132" Action="None" />
-    <Rule Id="SA1200" Action="None" />
-    <Rule Id="SA1201" Action="None" />
-    <Rule Id="SA1202" Action="None" />
-    <Rule Id="SA1203" Action="None" />
-    <Rule Id="SA1204" Action="None" />
-    <Rule Id="SA1205" Action="None" />
-    <Rule Id="SA1206" Action="None" />
-    <Rule Id="SA1207" Action="None" />
-    <Rule Id="SA1208" Action="None" />
-    <Rule Id="SA1209" Action="None" />
-    <Rule Id="SA1210" Action="None" />
-    <Rule Id="SA1211" Action="None" />
-    <Rule Id="SA1212" Action="None" />
-    <Rule Id="SA1214" Action="None" />
-    <Rule Id="SA1300" Action="None" />
-    <Rule Id="SA1303" Action="None" />
-    <Rule Id="SA1306" Action="None" />
-    <Rule Id="SA1307" Action="None" />
-    <Rule Id="SA1308" Action="None" />
-    <Rule Id="SA1309" Action="None" />
-    <Rule Id="SA1310" Action="None" />
-    <Rule Id="SA1312" Action="None" />
-    <Rule Id="SA1313" Action="None" />
-    <Rule Id="SA1400" Action="None" />
-    <Rule Id="SA1401" Action="None" />
-    <Rule Id="SA1402" Action="None" />
-    <Rule Id="SA1405" Action="None" />
-    <Rule Id="SA1407" Action="None" />
-    <Rule Id="SA1500" Action="None" />
-    <Rule Id="SA1501" Action="None" />
-    <Rule Id="SA1502" Action="None" />
-    <Rule Id="SA1503" Action="None" />
-    <Rule Id="SA1504" Action="None" />
-    <Rule Id="SA1505" Action="None" />
-    <Rule Id="SA1506" Action="None" />
-    <Rule Id="SA1507" Action="None" />
-    <Rule Id="SA1508" Action="None" />
-    <Rule Id="SA1509" Action="None" />
-    <Rule Id="SA1512" Action="None" />
-    <Rule Id="SA1513" Action="None" />
-    <Rule Id="SA1514" Action="None" />
-    <Rule Id="SA1515" Action="None" />
-    <Rule Id="SA1516" Action="None" />
-    <Rule Id="SA1518" Action="None" />
-    <Rule Id="SA1604" Action="None" />
-    <Rule Id="SA1609" Action="Warning" />
-    <Rule Id="SA1611" Action="None" />
-    <Rule Id="SA1612" Action="None" />
-    <Rule Id="SA1615" Action="None" />
-    <Rule Id="SA1618" Action="None" />
-    <Rule Id="SA1625" Action="None" />
-    <Rule Id="SA1626" Action="None" />
-    <Rule Id="SA1633" Action="None" />
-    <Rule Id="SA1639" Action="Warning" />
-    <Rule Id="SA1642" Action="None" />
-    <Rule Id="SA1649" Action="None" />
-    <Rule Id="SA1652" Action="None" />
-  </Rules>
 </RuleSet>
--- a/Demos/DepthDemo/DepthDemo
+++ b/Demos/DepthDemo/DepthDemo
@ -0,0 +1,75 @@
+<?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>
+    <PathToXAMLWinRTImplementations>DepthDemo\</PathToXAMLWinRTImplementations>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <PropertyGroup>
+    <ProjectGuid>479855a2-c397-46d6-a034-ecb60fd91780</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>..\DepthDemo\DepthDemo.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="..\DepthDemo\DepthDemo.csproj">
+      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
+      <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0-experimental1]">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="[1.0.0-experimental1]">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+</Project>
--- a/(Package)/Images/LockScreenLogo.scale-200.png
+++ b/(Package)/Images/LockScreenLogo.scale-200.png
--- a/(Package)/Images/SplashScreen.scale-200.png
+++ b/(Package)/Images/SplashScreen.scale-200.png
--- a/(Package)/Images/Square150x150Logo.scale-200.png
+++ b/(Package)/Images/Square150x150Logo.scale-200.png
--- a/(Package)/Images/Square44x44Logo.scale-200.png
+++ b/(Package)/Images/Square44x44Logo.scale-200.png
--- a/(Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/(Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/(Package)/Images/StoreLogo.png
+++ b/(Package)/Images/StoreLogo.png
--- a/(Package)/Images/Wide310x150Logo.scale-200.png
+++ b/(Package)/Images/Wide310x150Logo.scale-200.png
--- a/(Package)/Package.appxmanifest
+++ b/(Package)/Package.appxmanifest
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="c59a86e9-55fe-41a7-a2d2-1fc698cbc615"
+    Publisher="CN=getrou"
+    Version="1.0.0.0" />
+
+  <Properties>
+    <DisplayName>DepthDemo (Package)</DisplayName>
+    <PublisherDisplayName>getrou</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="DepthDemo (Package)"
+        Description="DepthDemo (Package)"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Images\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
--- a/Demos/DepthDemo/DepthDemo.sln
+++ b/Demos/DepthDemo/DepthDemo.sln
@ -1,65 +1,91 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26403.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31613.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DepthDemo", "DepthDemo\DepthDemo.csproj", "{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C} = {97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}
-	EndProjectSection
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "DepthDemo (Package)", "DepthDemo (Package)\DepthDemo (Package).wapproj", "{479855A2-C397-46D6-A034-ECB60FD91780}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressionBuilder", "..\..\ExpressionBuilder\ExpressionBuilder\ExpressionBuilder.csproj", "{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DepthDemo", "DepthDemo\DepthDemo.csproj", "{C372EB28-7139-4A46-A243-57420A6F2FB9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExpressionBuilder", "..\..\ExpressionBuilder\ExpressionBuilder\ExpressionBuilder.csproj", "{F2E3EB38-85EE-4DF6-B601-6325E86C318C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
+		Debug|arm64 = Debug|arm64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|ARM = Release|ARM
+		Release|arm64 = Release|arm64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Debug|ARM.ActiveCfg = Debug|ARM
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Debug|ARM.Build.0 = Debug|ARM
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Debug|ARM.Deploy.0 = Debug|ARM
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Debug|x64.ActiveCfg = Debug|x64
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Debug|x64.Build.0 = Debug|x64
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Debug|x64.Deploy.0 = Debug|x64
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Debug|x86.ActiveCfg = Debug|x86
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Debug|x86.Build.0 = Debug|x86
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Debug|x86.Deploy.0 = Debug|x86
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Release|Any CPU.ActiveCfg = Release|x86
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Release|ARM.ActiveCfg = Release|ARM
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Release|ARM.Build.0 = Release|ARM
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Release|ARM.Deploy.0 = Release|ARM
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Release|x64.ActiveCfg = Release|x64
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Release|x64.Build.0 = Release|x64
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Release|x64.Deploy.0 = Release|x64
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Release|x86.ActiveCfg = Release|x86
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Release|x86.Build.0 = Release|x86
-		{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}.Release|x86.Deploy.0 = Release|x86
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Debug|ARM.ActiveCfg = Debug|ARM
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Debug|ARM.Build.0 = Debug|ARM
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Debug|x64.ActiveCfg = Debug|x64
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Debug|x64.Build.0 = Debug|x64
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Debug|x86.ActiveCfg = Debug|x86
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Debug|x86.Build.0 = Debug|x86
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Release|ARM.ActiveCfg = Release|ARM
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Release|ARM.Build.0 = Release|ARM
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Release|x64.ActiveCfg = Release|x64
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Release|x64.Build.0 = Release|x64
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Release|x86.ActiveCfg = Release|x86
-		{97F79CB4-FB7B-4DC3-8A08-28FA5694A73C}.Release|x86.Build.0 = Release|x86
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Debug|ARM.ActiveCfg = Debug|x86
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Debug|arm64.ActiveCfg = Debug|arm64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Debug|arm64.Build.0 = Debug|arm64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Debug|arm64.Deploy.0 = Debug|arm64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Debug|x64.ActiveCfg = Debug|x64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Debug|x64.Build.0 = Debug|x64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Debug|x64.Deploy.0 = Debug|x64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Debug|x86.ActiveCfg = Debug|x86
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Debug|x86.Build.0 = Debug|x86
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Debug|x86.Deploy.0 = Debug|x86
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Release|Any CPU.ActiveCfg = Release|x86
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Release|ARM.ActiveCfg = Release|x86
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Release|arm64.ActiveCfg = Release|arm64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Release|arm64.Build.0 = Release|arm64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Release|arm64.Deploy.0 = Release|arm64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Release|x64.ActiveCfg = Release|x64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Release|x64.Build.0 = Release|x64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Release|x64.Deploy.0 = Release|x64
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Release|x86.ActiveCfg = Release|x86
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Release|x86.Build.0 = Release|x86
+		{479855A2-C397-46D6-A034-ECB60FD91780}.Release|x86.Deploy.0 = Release|x86
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Debug|ARM.ActiveCfg = Debug|x86
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Debug|arm64.ActiveCfg = Debug|arm64
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Debug|arm64.Build.0 = Debug|arm64
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Debug|x64.ActiveCfg = Debug|x64
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Debug|x64.Build.0 = Debug|x64
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Debug|x86.ActiveCfg = Debug|x86
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Debug|x86.Build.0 = Debug|x86
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Release|Any CPU.ActiveCfg = Release|x86
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Release|ARM.ActiveCfg = Release|x86
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Release|arm64.ActiveCfg = Release|arm64
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Release|arm64.Build.0 = Release|arm64
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Release|x64.ActiveCfg = Release|x64
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Release|x64.Build.0 = Release|x64
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Release|x86.ActiveCfg = Release|x86
+		{C372EB28-7139-4A46-A243-57420A6F2FB9}.Release|x86.Build.0 = Release|x86
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Debug|arm64.Build.0 = Debug|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Debug|x64.ActiveCfg = Debug|x64
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Debug|x64.Build.0 = Debug|x64
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Debug|x86.ActiveCfg = Debug|x86
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Debug|x86.Build.0 = Debug|x86
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Release|ARM.Build.0 = Release|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Release|arm64.ActiveCfg = Release|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Release|arm64.Build.0 = Release|Any CPU
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Release|x64.ActiveCfg = Release|x64
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Release|x64.Build.0 = Release|x64
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Release|x86.ActiveCfg = Release|x86
+		{F2E3EB38-85EE-4DF6-B601-6325E86C318C}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0C642F89-EBC8-4C1C-94B4-4A8B9AF54391}
+	EndGlobalSection
 EndGlobal
--- a/Demos/DepthDemo/DepthDemo/App.xaml
+++ b/Demos/DepthDemo/DepthDemo/App.xaml
@ -2,11 +2,14 @@
    x:Class="DepthDemo.App"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:DepthDemo"
-    RequestedTheme="Light">
-
+    xmlns:local="using:DepthDemo">
    <Application.Resources>
        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!-- Other merged dictionaries here -->
+            </ResourceDictionary.MergedDictionaries>
+            <!-- Other app resources here -->
            <Style x:Key="ButtonStyle" TargetType="Button">
                <Setter Property="Foreground" Value="#009999"/>
                <Setter Property="Background" Value="White"/>
@ -15,5 +18,4 @@
            </Style>
        </ResourceDictionary>
    </Application.Resources>
-
 </Application>
--- a/Demos/DepthDemo/DepthDemo/App.xaml.cs
+++ b/Demos/DepthDemo/DepthDemo/App.xaml.cs
@ -1,16 +1,44 @@
-using System;
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Microsoft.UI.Xaml.Shapes;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.

 namespace DepthDemo
 {
    /// <summary>
    /// Provides application-specific behavior to supplement the default Application class.
    /// </summary>
-    sealed partial class App : Application
+    public partial class App : Application
    {
        /// <summary>
        /// Initializes the singleton application object.  This is the first line of authored code
@ -19,72 +47,19 @@ namespace DepthDemo
        public App()
        {
            this.InitializeComponent();
-            this.Suspending += OnSuspending;
        }

        /// <summary>
        /// Invoked when the application is launched normally by the end user.  Other entry points
        /// will be used such as when the application is launched to open a specific file.
        /// </summary>
-        /// <param name="e">Details about the launch request and process.</param>
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
+        /// <param name="args">Details about the launch request and process.</param>
+        protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
        {
-            Frame rootFrame = Window.Current.Content as Frame;
-
-            // Do not repeat app initialization when the Window already has content,
-            // just ensure that the window is active
-            if (rootFrame == null)
-            {
-                // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new Frame();
-
-                rootFrame.NavigationFailed += OnNavigationFailed;
-
-                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
-                {
-                    // Load state from previously suspended application
+            m_window = new MainWindow();
+            m_window.Activate();
        }

-                // Place the frame in the current Window
-                Window.Current.Content = rootFrame;
-            }
-
-            if (e.PrelaunchActivated == false)
-            {
-                if (rootFrame.Content == null)
-                {
-                    // When the navigation stack isn't restored navigate to the first page,
-                    // configuring the new page by passing required information as a navigation
-                    // parameter
-                    rootFrame.Navigate(typeof(MainPage), e.Arguments);
-                }
-                // Ensure the current window is active
-                Window.Current.Activate();
-            }
-        }
-
-        /// <summary>
-        /// Invoked when Navigation to a certain page fails
-        /// </summary>
-        /// <param name="sender">The Frame which failed navigation</param>
-        /// <param name="e">Details about the navigation failure</param>
-        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-        {
-            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
-        }
-
-        /// <summary>
-        /// Invoked when application execution is being suspended.  Application state is saved
-        /// without knowing whether the application will be terminated or resumed with the contents
-        /// of memory still intact.
-        /// </summary>
-        /// <param name="sender">The source of the suspend request.</param>
-        /// <param name="e">Details about the suspend request.</param>
-        private void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var deferral = e.SuspendingOperation.GetDeferral();
-            // Save application state and stop any background activity
-            deferral.Complete();
-        }
+        private Window m_window;
    }
 }
--- a/Demos/DepthDemo/DepthDemo/Assets/LockScreenLogo.scale-200.png
+++ b/Demos/DepthDemo/DepthDemo/Assets/LockScreenLogo.scale-200.png
--- a/Demos/DepthDemo/DepthDemo/Assets/SplashScreen.scale-200.png
+++ b/Demos/DepthDemo/DepthDemo/Assets/SplashScreen.scale-200.png
--- a/Demos/DepthDemo/DepthDemo/Assets/Square150x150Logo.scale-200.png
+++ b/Demos/DepthDemo/DepthDemo/Assets/Square150x150Logo.scale-200.png
--- a/Demos/DepthDemo/DepthDemo/Assets/Square44x44Logo.scale-200.png
+++ b/Demos/DepthDemo/DepthDemo/Assets/Square44x44Logo.scale-200.png
--- a/Demos/DepthDemo/DepthDemo/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/Demos/DepthDemo/DepthDemo/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/Demos/DepthDemo/DepthDemo/Assets/StoreLogo.png
+++ b/Demos/DepthDemo/DepthDemo/Assets/StoreLogo.png
--- a/Demos/DepthDemo/DepthDemo/Assets/Wide310x150Logo.scale-200.png
+++ b/Demos/DepthDemo/DepthDemo/Assets/Wide310x150Logo.scale-200.png
--- a/Demos/DepthDemo/DepthDemo/DepthDemo.csproj
+++ b/Demos/DepthDemo/DepthDemo/DepthDemo.csproj
@ -1,159 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{D1CB5475-4A5F-4070-AE46-385FEB1B19E5}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
    <RootNamespace>DepthDemo</RootNamespace>
-    <AssemblyName>DepthDemo</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
-    <PackageCertificateKeyFile>DepthDemo_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
-    <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Platforms>x86;x64;arm64</Platforms>
+    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <UseWinUI>true</UseWinUI>
  </PropertyGroup>
+
  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="DepthTreatmentConfigurations.cs" />
-    <Compile Include="Layer.cs" />
-    <Compile Include="MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Scenario.cs" />
-    <Compile Include="Scenarios\BasicElementsScenario.cs" />
-    <Compile Include="Scenarios\NestedScenario.cs" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-experimental1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK.Foundation" Version="1.0.0-experimental1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="1.0.0-experimental1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="1.0.0-experimental1" />
+    <Manifest Include="$(ApplicationManifest)" />
  </ItemGroup>
+
  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-    <None Include="DepthDemo_TemporaryKey.pfx" />
+    <ProjectReference Include="..\..\..\ExpressionBuilder\ExpressionBuilder\ExpressionBuilder.csproj" />
  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\SplashScreen.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>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.1.9</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\ExpressionBuilder\ExpressionBuilder\ExpressionBuilder.csproj">
-      <Project>{97f79cb4-fb7b-4dc3-8a08-28fa5694a73c}</Project>
-      <Name>ExpressionBuilder</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
--- a/Demos/DepthDemo/DepthDemo/DepthTreatmentConfigurations.cs
+++ b/Demos/DepthDemo/DepthDemo/DepthTreatmentConfigurations.cs
@ -1,7 +1,22 @@
-using System;
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using Microsoft.UI;
+using Microsoft.UI.Composition;
+using System;
 using System.Numerics;
 using Windows.UI;
-using Windows.UI.Composition;

 namespace DepthDemo
 {
--- a/Demos/DepthDemo/DepthDemo/Layer.cs
+++ b/Demos/DepthDemo/DepthDemo/Layer.cs
@ -1,6 +1,20 @@
-using System.Collections.Generic;
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using Microsoft.UI.Composition;
+using System.Collections.Generic;
 using System.Numerics;
-using Windows.UI.Composition;

 namespace DepthDemo
 {
--- a/Demos/DepthDemo/DepthDemo/MainPage.xaml.cs
+++ b/Demos/DepthDemo/DepthDemo/MainPage.xaml.cs
@ -1,17 +1,32 @@
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
 using DepthDemo.Scenarios;
 using ExpressionBuilder;
+using Microsoft.UI;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Composition.Interactions;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Media;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
 using Windows.Foundation;
 using Windows.UI;
-using Windows.UI.Composition;
-using Windows.UI.Composition.Interactions;
 using Windows.UI.Popups;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Hosting;
-using Windows.UI.Xaml.Media;

 using EF = ExpressionBuilder.ExpressionFunctions;

@ -194,7 +209,7 @@ namespace DepthDemo
        }

        #region PointerHandlers
-        private void MainGrid_PointerPressed(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
+        private void MainGrid_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
        {
            if (e.Pointer.PointerDeviceType == Windows.Devices.Input.PointerDeviceType.Touch)
            {
@ -209,7 +224,7 @@ namespace DepthDemo
            }
        }

-        private void MainCanvas_PointerPressed(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
+        private void MainCanvas_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
        {
            // Pass event on to the scenario that's in view
            foreach (Scenario scenario in _scenarios)
@ -221,7 +236,7 @@ namespace DepthDemo
            }
        }

-        private void MainCanvas_PointerMoved(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
+        private void MainCanvas_PointerMoved(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
        {
            // Pass event on to the scenario that's in view
            foreach (Scenario scenario in _scenarios)
@ -233,7 +248,7 @@ namespace DepthDemo
            }
        }

-        private void MainCanvas_DoubleTapped(object sender, Windows.UI.Xaml.Input.DoubleTappedRoutedEventArgs e)
+        private void MainCanvas_DoubleTapped(object sender, Microsoft.UI.Xaml.Input.DoubleTappedRoutedEventArgs e)
        {
            // Pass event on to the scenario that's in view
            foreach (Scenario scenario in _scenarios)
@ -291,6 +306,7 @@ namespace DepthDemo
            string helpTextInfo = _currentScenario.HelpTextInstructions;

            var messageDialog = new MessageDialog(helpTextInfo);
+            WinRT.Interop.InitializeWithWindow.Initialize(messageDialog, WinRT.Interop.WindowNative.GetWindowHandle(MainWindow.CurrentWindow));
            await messageDialog.ShowAsync();
        }
        #endregion
--- a/Demos/DepthDemo/DepthDemo/MainWindow.xaml
+++ b/Demos/DepthDemo/DepthDemo/MainWindow.xaml
@ -0,0 +1,11 @@
+<Window
+    x:Class="DepthDemo.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:DepthDemo"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <local:MainPage/>
+</Window>
--- a/Demos/DepthDemo/DepthDemo/MainWindow.xaml.cs
+++ b/Demos/DepthDemo/DepthDemo/MainWindow.xaml.cs
@ -0,0 +1,49 @@
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace DepthDemo
+{
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class MainWindow : Window
+    {
+        public static MainWindow CurrentWindow { get; private set; }
+
+        public MainWindow()
+        {
+            this.InitializeComponent();
+            this.Title = "Depth Demo - Windows App SDK";
+            CurrentWindow = this;
+        }
+    }
+}
--- a/Demos/DepthDemo/DepthDemo/Package.appxmanifest
+++ b/Demos/DepthDemo/DepthDemo/Package.appxmanifest
@ -1,28 +0,0 @@
-<?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">
-  <Identity Name="aa21e080-ce1e-45fd-8762-0a78ed37d41b" Publisher="CN=daneuber" Version="1.0.0.0" />
-  <mp:PhoneIdentity PhoneProductId="aa21e080-ce1e-45fd-8762-0a78ed37d41b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
-  <Properties>
-    <DisplayName>DepthDemo</DisplayName>
-    <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-  <Resources>
-    <Resource Language="x-generate" />
-  </Resources>
-  <Applications>
-    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="DepthDemo.App">
-      <uap:VisualElements DisplayName="DepthDemo" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="DepthDemo" BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
-        </uap:DefaultTile>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClient" />
-  </Capabilities>
-</Package>
--- a/Demos/DepthDemo/DepthDemo/Properties/AssemblyInfo.cs
+++ b/Demos/DepthDemo/DepthDemo/Properties/AssemblyInfo.cs
@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("DepthDemo")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DepthDemo")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
--- a/Demos/DepthDemo/DepthDemo/Properties/Default.rd.xml
+++ b/Demos/DepthDemo/DepthDemo/Properties/Default.rd.xml
@ -1,31 +0,0 @@
-<!--
-    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
-    developers. However, you can modify these parameters to modify the behavior of the .NET Native
-    optimizer.
-
-    Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919
-
-    To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
-
-    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
-    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
-
-    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
-->
-
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
-      An Assembly element with Name="*Application*" applies to all assemblies in
-      the application package. The asterisks are not wildcards.
-    -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
-    <!-- Add your application specific runtime directives here. -->
-
-
-  </Application>
-</Directives>
--- a/Demos/DepthDemo/DepthDemo/Properties/PublishProfiles/win10-arm64.pubxml
+++ b/Demos/DepthDemo/DepthDemo/Properties/PublishProfiles/win10-arm64.pubxml
@ -0,0 +1,19 @@
+<?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>True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
--- a/Demos/DepthDemo/DepthDemo/Properties/PublishProfiles/win10-x64.pubxml
+++ b/Demos/DepthDemo/DepthDemo/Properties/PublishProfiles/win10-x64.pubxml
@ -0,0 +1,19 @@
+<?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>True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
--- a/Demos/DepthDemo/DepthDemo/Properties/PublishProfiles/win10-x86.pubxml
+++ b/Demos/DepthDemo/DepthDemo/Properties/PublishProfiles/win10-x86.pubxml
@ -0,0 +1,19 @@
+<?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>True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
--- a/Demos/DepthDemo/DepthDemo/Scenario.cs
+++ b/Demos/DepthDemo/DepthDemo/Scenario.cs
@ -1,11 +1,25 @@
-using System.Collections.Generic;
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using Windows.Foundation;
 using Windows.UI;
-using Windows.UI.Composition;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;

 namespace DepthDemo
 {
--- a/Demos/DepthDemo/DepthDemo/Scenarios/BasicElementsScenario.cs
+++ b/Demos/DepthDemo/DepthDemo/Scenarios/BasicElementsScenario.cs
@ -1,11 +1,25 @@
-using System;
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using Windows.UI;
-using Windows.UI.Composition;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;

 namespace DepthDemo.Scenarios
 {
--- a/Demos/DepthDemo/DepthDemo/Scenarios/NestedScenario.cs
+++ b/Demos/DepthDemo/DepthDemo/Scenarios/NestedScenario.cs
@ -1,9 +1,23 @@
-using System.Collections.Generic;
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using System.Collections.Generic;
 using System.Numerics;
 using Windows.UI;
-using Windows.UI.Composition;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;

 namespace DepthDemo.Scenarios
 {
--- a/Demos/DepthDemo/DepthDemo/app.manifest
+++ b/Demos/DepthDemo/DepthDemo/app.manifest
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="DepthDemo.Desktop.app"/>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <!-- The combination of below two tags have the following effect:
+           1) Per-Monitor for >= Windows 10 Anniversary Update
+           2) System < Windows 10 Anniversary Update
+      -->
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
--- a/Demos/EffectEditor/App.xaml
+++ b/Demos/EffectEditor/App.xaml
@ -2,10 +2,14 @@
    x:Class="EffectEditor.App"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:EffectEditor"
-    RequestedTheme="Light">
-    
+    xmlns:local="using:EffectEditor">
    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!-- Other merged dictionaries here -->
+            </ResourceDictionary.MergedDictionaries>
+            <!-- Other app resources here -->
            <Style x:Key="EffectPropertyStyle" TargetType="TextBlock">
                <Setter Property="Foreground" Value="#FFFFFF" />
                <Setter Property="FontFamily" Value="Segoe UI Light" />
@ -21,5 +25,6 @@
                <Setter Property="HorizontalAlignment" Value="Left" />
                <Setter Property="VerticalAlignment" Value="Center" />
            </Style>
+        </ResourceDictionary>
    </Application.Resources>
 </Application>
--- a/Demos/EffectEditor/App.xaml.cs
+++ b/Demos/EffectEditor/App.xaml.cs
@ -1,8 +1,7 @@
-//*********************************************************
+//*********************************************************
 //
 // Copyright (c) Microsoft. All rights reserved.
 // This code is licensed under the MIT License (MIT).
-//
 // THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
 // INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@ -13,6 +12,14 @@
 //
 //*********************************************************

+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Microsoft.UI.Xaml.Shapes;
 using System;
 using System.Collections.Generic;
 using System.IO;
@ -22,20 +29,16 @@ using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.

 namespace EffectEditor
 {
    /// <summary>
    /// Provides application-specific behavior to supplement the default Application class.
    /// </summary>
-    sealed partial class App : Application
+    public partial class App : Application
    {
        /// <summary>
        /// Initializes the singleton application object.  This is the first line of authored code
@ -43,81 +46,20 @@ namespace EffectEditor
        /// </summary>
        public App()
        {
-            Microsoft.ApplicationInsights.WindowsAppInitializer.InitializeAsync(
-                Microsoft.ApplicationInsights.WindowsCollectors.Metadata |
-                Microsoft.ApplicationInsights.WindowsCollectors.Session);
            this.InitializeComponent();
-            this.Suspending += OnSuspending;
        }

        /// <summary>
        /// Invoked when the application is launched normally by the end user.  Other entry points
        /// will be used such as when the application is launched to open a specific file.
        /// </summary>
-        /// <param name="e">Details about the launch request and process.</param>
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
+        /// <param name="args">Details about the launch request and process.</param>
+        protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
        {
-
-#if DEBUG
-            if (System.Diagnostics.Debugger.IsAttached)
-            {
-                this.DebugSettings.EnableFrameRateCounter = true;
-            }
-#endif
-
-            Frame rootFrame = Window.Current.Content as Frame;
-
-            // Do not repeat app initialization when the Window already has content,
-            // just ensure that the window is active
-            if (rootFrame == null)
-            {
-                // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new Frame();
-
-                rootFrame.NavigationFailed += OnNavigationFailed;
-
-                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
-                {
-                    //TODO: Load state from previously suspended application
+            m_window = new MainWindow();
+            m_window.Activate();
        }

-                // Place the frame in the current Window
-                Window.Current.Content = rootFrame;
-            }
-
-            if (rootFrame.Content == null)
-            {
-                // When the navigation stack isn't restored navigate to the first page,
-                // configuring the new page by passing required information as a navigation
-                // parameter
-                rootFrame.Navigate(typeof(MainPage), e.Arguments);
-            }
-            // Ensure the current window is active
-            Window.Current.Activate();
-        }
-
-        /// <summary>
-        /// Invoked when Navigation to a certain page fails
-        /// </summary>
-        /// <param name="sender">The Frame which failed navigation</param>
-        /// <param name="e">Details about the navigation failure</param>
-        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-        {
-            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
-        }
-
-        /// <summary>
-        /// Invoked when application execution is being suspended.  Application state is saved
-        /// without knowing whether the application will be terminated or resumed with the contents
-        /// of memory still intact.
-        /// </summary>
-        /// <param name="sender">The source of the suspend request.</param>
-        /// <param name="e">Details about the suspend request.</param>
-        private void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
-            deferral.Complete();
-        }
+        private Window m_window;
    }
 }
--- a/Demos/EffectEditor/ApplicationInsights.config
+++ b/Demos/EffectEditor/ApplicationInsights.config
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ApplicationInsights xmlns = "http://schemas.microsoft.com/ApplicationInsights/2013/Settings">
-</ApplicationInsights>
--- a/Demos/EffectEditor/Assets/LockScreenLogo.scale-200.png
+++ b/Demos/EffectEditor/Assets/LockScreenLogo.scale-200.png
--- a/Demos/EffectEditor/Assets/SplashScreen.scale-200.png
+++ b/Demos/EffectEditor/Assets/SplashScreen.scale-200.png
--- a/Demos/EffectEditor/Assets/Square150x150Logo.scale-200.png
+++ b/Demos/EffectEditor/Assets/Square150x150Logo.scale-200.png
--- a/Demos/EffectEditor/Assets/Square44x44Logo.scale-200.png
+++ b/Demos/EffectEditor/Assets/Square44x44Logo.scale-200.png
--- a/Demos/EffectEditor/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/Demos/EffectEditor/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/Demos/EffectEditor/Assets/StoreLogo.png
+++ b/Demos/EffectEditor/Assets/StoreLogo.png
--- a/Demos/EffectEditor/Assets/Wide310x150Logo.scale-200.png
+++ b/Demos/EffectEditor/Assets/Wide310x150Logo.scale-200.png
--- a/Demos/EffectEditor/EffectEditor
+++ b/Demos/EffectEditor/EffectEditor
@ -0,0 +1,75 @@
+<?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>
+    <PathToXAMLWinRTImplementations>EffectEditor\</PathToXAMLWinRTImplementations>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <PropertyGroup>
+    <ProjectGuid>4e5e4821-d14b-451b-b4a0-9c0a872f4a25</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>..\EffectEditor.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="..\EffectEditor.csproj">
+      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
+      <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0-experimental1]">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="[1.0.0-experimental1]">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+</Project>
--- a/(Package)/Images/LockScreenLogo.scale-200.png
+++ b/(Package)/Images/LockScreenLogo.scale-200.png
--- a/(Package)/Images/SplashScreen.scale-200.png
+++ b/(Package)/Images/SplashScreen.scale-200.png
--- a/(Package)/Images/Square150x150Logo.scale-200.png
+++ b/(Package)/Images/Square150x150Logo.scale-200.png
--- a/(Package)/Images/Square44x44Logo.scale-200.png
+++ b/(Package)/Images/Square44x44Logo.scale-200.png
--- a/(Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/(Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/Demos/EffectEditor/EffectEditor
+++ b/Demos/EffectEditor/EffectEditor
--- a/(Package)/Images/Wide310x150Logo.scale-200.png
+++ b/(Package)/Images/Wide310x150Logo.scale-200.png
--- a/Demos/EffectEditor/EffectEditor
+++ b/Demos/EffectEditor/EffectEditor
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="f5fc2372-49e6-4258-914d-9b470d7ed06c"
+    Publisher="CN=getrou"
+    Version="1.0.0.0" />
+
+  <Properties>
+    <DisplayName>EffectEditor (Package)</DisplayName>
+    <PublisherDisplayName>getrou</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="EffectEditor (Package)"
+        Description="EffectEditor (Package)"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Images\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
--- a/Demos/EffectEditor/EffectEditor.csproj
+++ b/Demos/EffectEditor/EffectEditor.csproj
@ -1,171 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
    <RootNamespace>EffectEditor</RootNamespace>
-    <AssemblyName>EffectEditor</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>EffectEditor_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Platforms>x86;x64;arm64</Platforms>
+    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <UseWinUI>true</UseWinUI>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <NoWarn>1701;1702;CA1416</NoWarn>
  </PropertyGroup>
  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <Content Include="ApplicationInsights.config">
+    <Compile Remove="EffectEditor %28Package%29\**" />
+    <EmbeddedResource Remove="EffectEditor %28Package%29\**" />
+    <None Remove="EffectEditor %28Package%29\**" />
+    <Page Remove="EffectEditor %28Package%29\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove="MainPage.xaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.26-experimental1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-experimental1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK.Foundation" Version="1.0.0-experimental1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="1.0.0-experimental1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK.InteractiveExperiences" Version="1.0.0-experimental1" />
+    <Manifest Include="$(ApplicationManifest)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\SamplesCommon\SamplesCommon\SamplesCommon.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="Assets\Bruno%27sFamily2015 %2813%29-X2.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Checkerboard_100x100.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\CircleMask.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\_P2A8041.jpg">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
  </ItemGroup>
+
  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-    <None Include="EffectEditor_TemporaryKey.pfx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Assets\Bruno%27sFamily2015 %2813%29-X2.jpg" />
-    <Content Include="Assets\Checkerboard_100x100.png" />
-    <Content Include="Assets\CircleMask.png" />
-    <Content Include="Assets\_P2A8041.jpg" />
-    <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\SplashScreen.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>
-    <ApplicationDefinition Include="App.xaml">
+    <Page Update="MainPage.xaml">
      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
    </Page>
  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights">
-      <Version>2.8.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights.PersistenceChannel">
-      <Version>1.2.3</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights.WindowsApps">
-      <Version>1.1.1</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.1.9</Version>
-    </PackageReference>
-    <PackageReference Include="Win2D.uwp">
-      <Version>1.23.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\SamplesCommon\SamplesCommon\SamplesCommon.csproj">
-      <Project>{0b6a4830-d1ff-4018-baa2-7257eb4579fe}</Project>
-      <Name>SamplesCommon</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
--- a/Demos/EffectEditor/EffectEditor.sln
+++ b/Demos/EffectEditor/EffectEditor.sln
@ -1,81 +1,81 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28124.53
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31702.278
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EffectEditor", "EffectEditor.csproj", "{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}"
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "EffectEditor (Package)", "EffectEditor (Package)\EffectEditor (Package).wapproj", "{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SamplesCommon", "..\..\SamplesCommon\SamplesCommon\SamplesCommon.csproj", "{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EffectEditor", "EffectEditor.csproj", "{88202DFF-DC7A-447F-B4BB-18045C8D6C71}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SamplesNative", "..\..\SamplesNative\SamplesNative.vcxproj", "{B0DCA768-5521-406C-803D-FDCCF67181D1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplesCommon", "..\..\SamplesCommon\SamplesCommon\SamplesCommon.csproj", "{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
+		Debug|arm64 = Debug|arm64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
+		Release|arm64 = Release|arm64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Debug|ARM.ActiveCfg = Debug|ARM
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Debug|ARM.Build.0 = Debug|ARM
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Debug|ARM.Deploy.0 = Debug|ARM
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Debug|x64.ActiveCfg = Debug|x64
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Debug|x64.Build.0 = Debug|x64
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Debug|x64.Deploy.0 = Debug|x64
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Debug|x86.ActiveCfg = Debug|x86
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Debug|x86.Build.0 = Debug|x86
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Debug|x86.Deploy.0 = Debug|x86
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Release|Any CPU.ActiveCfg = Release|x86
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Release|ARM.ActiveCfg = Release|ARM
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Release|ARM.Build.0 = Release|ARM
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Release|ARM.Deploy.0 = Release|ARM
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Release|x64.ActiveCfg = Release|x64
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Release|x64.Build.0 = Release|x64
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Release|x64.Deploy.0 = Release|x64
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Release|x86.ActiveCfg = Release|x86
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Release|x86.Build.0 = Release|x86
-		{5A5AB5B9-CAEC-475A-8878-C13E7788F4D8}.Release|x86.Deploy.0 = Release|x86
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Debug|ARM.ActiveCfg = Debug|ARM
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Debug|ARM.Build.0 = Debug|ARM
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Debug|x64.ActiveCfg = Debug|x64
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Debug|x64.Build.0 = Debug|x64
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Debug|x86.ActiveCfg = Debug|x86
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Debug|x86.Build.0 = Debug|x86
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Release|ARM.ActiveCfg = Release|ARM
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Release|ARM.Build.0 = Release|ARM
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Release|x64.ActiveCfg = Release|x64
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Release|x64.Build.0 = Release|x64
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Release|x86.ActiveCfg = Release|x86
-		{0B6A4830-D1FF-4018-BAA2-7257EB4579FE}.Release|x86.Build.0 = Release|x86
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Debug|ARM.ActiveCfg = Debug|ARM
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Debug|ARM.Build.0 = Debug|ARM
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Debug|x64.ActiveCfg = Debug|x64
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Debug|x64.Build.0 = Debug|x64
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Debug|x86.ActiveCfg = Debug|Win32
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Debug|x86.Build.0 = Debug|Win32
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Release|Any CPU.ActiveCfg = Release|Win32
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Release|ARM.ActiveCfg = Release|ARM
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Release|ARM.Build.0 = Release|ARM
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Release|x64.ActiveCfg = Release|x64
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Release|x64.Build.0 = Release|x64
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Release|x86.ActiveCfg = Release|Win32
-		{B0DCA768-5521-406C-803D-FDCCF67181D1}.Release|x86.Build.0 = Release|Win32
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Debug|arm64.ActiveCfg = Debug|arm64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Debug|arm64.Build.0 = Debug|arm64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Debug|arm64.Deploy.0 = Debug|arm64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Debug|x64.ActiveCfg = Debug|x64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Debug|x64.Build.0 = Debug|x64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Debug|x64.Deploy.0 = Debug|x64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Debug|x86.ActiveCfg = Debug|x86
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Debug|x86.Build.0 = Debug|x86
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Debug|x86.Deploy.0 = Debug|x86
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Release|Any CPU.ActiveCfg = Release|x86
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Release|arm64.ActiveCfg = Release|arm64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Release|arm64.Build.0 = Release|arm64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Release|arm64.Deploy.0 = Release|arm64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Release|x64.ActiveCfg = Release|x64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Release|x64.Build.0 = Release|x64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Release|x64.Deploy.0 = Release|x64
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Release|x86.ActiveCfg = Release|x86
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Release|x86.Build.0 = Release|x86
+		{4E5E4821-D14B-451B-B4A0-9C0A872F4A25}.Release|x86.Deploy.0 = Release|x86
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Debug|arm64.ActiveCfg = Debug|arm64
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Debug|arm64.Build.0 = Debug|arm64
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Debug|x64.ActiveCfg = Debug|x64
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Debug|x64.Build.0 = Debug|x64
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Debug|x86.ActiveCfg = Debug|x86
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Debug|x86.Build.0 = Debug|x86
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Release|Any CPU.ActiveCfg = Release|x86
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Release|arm64.ActiveCfg = Release|arm64
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Release|arm64.Build.0 = Release|arm64
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Release|x64.ActiveCfg = Release|x64
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Release|x64.Build.0 = Release|x64
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Release|x86.ActiveCfg = Release|x86
+		{88202DFF-DC7A-447F-B4BB-18045C8D6C71}.Release|x86.Build.0 = Release|x86
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Debug|arm64.Build.0 = Debug|Any CPU
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Debug|x64.ActiveCfg = Debug|x64
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Debug|x64.Build.0 = Debug|x64
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Debug|x86.ActiveCfg = Debug|x86
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Debug|x86.Build.0 = Debug|x86
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Release|arm64.ActiveCfg = Release|Any CPU
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Release|arm64.Build.0 = Release|Any CPU
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Release|x64.ActiveCfg = Release|x64
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Release|x64.Build.0 = Release|x64
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Release|x86.ActiveCfg = Release|x86
+		{8DD0F60D-803E-40F2-9F4C-8BDE4ACF9E45}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E543F7FF-6197-471C-AFB4-BA6DF9E2150A}
+		SolutionGuid = {33A700AD-D46B-4699-956A-5E5A199F932C}
 	EndGlobalSection
 EndGlobal
--- a/Demos/EffectEditor/MainPage.xaml.cs
+++ b/Demos/EffectEditor/MainPage.xaml.cs
@ -13,6 +13,15 @@
 //
 //*********************************************************

+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
 using System;
 using System.Collections.Generic;
 using System.IO;
@ -30,15 +39,6 @@ using Windows.Foundation.Collections;
 using Windows.Graphics.Imaging;
 using Windows.Storage;
 using Windows.UI;
-using Windows.UI.Composition;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Hosting;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
 using SamplesCommon;
 using static SamplesCommon.ImageLoader;

--- a/Demos/EffectEditor/MainWindow.xaml
+++ b/Demos/EffectEditor/MainWindow.xaml
@ -0,0 +1,11 @@
+<Window
+    x:Class="EffectEditor.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:EffectEditor"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <local:MainPage/>
+</Window>
--- a/Demos/EffectEditor/MainWindow.xaml.cs
+++ b/Demos/EffectEditor/MainWindow.xaml.cs
@ -0,0 +1,46 @@
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace EffectEditor
+{
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            this.InitializeComponent();
+            this.Title = "Effect Editor - Windows App SDK";
+        }
+    }
+}
--- a/Demos/EffectEditor/Package.appxmanifest
+++ b/Demos/EffectEditor/Package.appxmanifest
@ -1,53 +0,0 @@
-<?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">
-
-  <Identity
-    Name="c68bfd1f-ce90-4c51-a1f8-404d8ed125d3"
-    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="c68bfd1f-ce90-4c51-a1f8-404d8ed125d3" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>EffectEditor</DisplayName>
-    <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="EffectEditor.App">
-      <uap:VisualElements
-        DisplayName="EffectEditor"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="EffectEditor"
-        BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-        <uap:InitialRotationPreference>
-          <uap:Rotation Preference="landscape" />
-          <uap:Rotation Preference="landscapeFlipped" />
-        </uap:InitialRotationPreference>
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <Capability Name="internetClient" />
-  </Capabilities>
-</Package>
--- a/Demos/EffectEditor/Properties/AssemblyInfo.cs
+++ b/Demos/EffectEditor/Properties/AssemblyInfo.cs
@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("EffectEditor")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("EffectEditor")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
--- a/Demos/EffectEditor/Properties/Default.rd.xml
+++ b/Demos/EffectEditor/Properties/Default.rd.xml
@ -1,31 +0,0 @@
-<!--
-    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
-    developers. However, you can modify these parameters to modify the behavior of the .NET Native
-    optimizer.
-
-    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
-
-    To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
-
-    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
-    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
-
-    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
-->
-
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
-      An Assembly element with Name="*Application*" applies to all assemblies in
-      the application package. The asterisks are not wildcards.
-    -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
-    <!-- Add your application specific runtime directives here. -->
-
-
-  </Application>
-</Directives>
--- a/Demos/EffectEditor/Properties/PublishProfiles/win10-arm64.pubxml
+++ b/Demos/EffectEditor/Properties/PublishProfiles/win10-arm64.pubxml
@ -0,0 +1,19 @@
+<?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>True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
--- a/Demos/EffectEditor/Properties/PublishProfiles/win10-x64.pubxml
+++ b/Demos/EffectEditor/Properties/PublishProfiles/win10-x64.pubxml
@ -0,0 +1,19 @@
+<?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>True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
--- a/Demos/EffectEditor/Properties/PublishProfiles/win10-x86.pubxml
+++ b/Demos/EffectEditor/Properties/PublishProfiles/win10-x86.pubxml
@ -0,0 +1,19 @@
+<?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>True</PublishReadyToRun>
+   <!-- 
+    See https://github.com/microsoft/CsWinRT/issues/373
+    <PublishTrimmed>True</PublishTrimmed>
+    -->
+  </PropertyGroup>
+</Project>
--- a/Demos/EffectEditor/app.manifest
+++ b/Demos/EffectEditor/app.manifest
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="EffectEditor.app"/>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <!-- The combination of below two tags have the following effect:
+           1) Per-Monitor for >= Windows 10 Anniversary Update
+           2) System < Windows 10 Anniversary Update
+      -->
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
--- a/Demos/EffectEditor/project.lock.json
+++ b/Demos/EffectEditor/project.lock.json
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample.sln
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample.sln
@ -1,40 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FrameworklessVideoSample", "FrameworklessVideoSample\FrameworklessVideoSample.csproj", "{DC47B688-AFD5-4791-9020-8677CAAFDA6C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Debug|ARM.ActiveCfg = Debug|ARM
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Debug|ARM.Build.0 = Debug|ARM
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Debug|ARM.Deploy.0 = Debug|ARM
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Debug|x64.ActiveCfg = Debug|x64
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Debug|x64.Build.0 = Debug|x64
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Debug|x64.Deploy.0 = Debug|x64
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Debug|x86.ActiveCfg = Debug|x86
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Debug|x86.Build.0 = Debug|x86
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Debug|x86.Deploy.0 = Debug|x86
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Release|ARM.ActiveCfg = Release|ARM
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Release|ARM.Build.0 = Release|ARM
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Release|ARM.Deploy.0 = Release|ARM
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Release|x64.ActiveCfg = Release|x64
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Release|x64.Build.0 = Release|x64
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Release|x64.Deploy.0 = Release|x64
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Release|x86.ActiveCfg = Release|x86
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Release|x86.Build.0 = Release|x86
-		{DC47B688-AFD5-4791-9020-8677CAAFDA6C}.Release|x86.Deploy.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/ApplicationInsights.config
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/ApplicationInsights.config
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ApplicationInsights xmlns = "http://schemas.microsoft.com/ApplicationInsights/2013/Settings">
-</ApplicationInsights>
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/LockScreenLogo.scale-200.png
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/LockScreenLogo.scale-200.png
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/SplashScreen.scale-200.png
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/SplashScreen.scale-200.png
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/Square150x150Logo.scale-200.png
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/Square150x150Logo.scale-200.png
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/Square44x44Logo.scale-200.png
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/Square44x44Logo.scale-200.png
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/StoreLogo.png
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/StoreLogo.png
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/Wide310x150Logo.scale-200.png
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Assets/Wide310x150Logo.scale-200.png
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/CompositionVisualVideo.cs
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/CompositionVisualVideo.cs
@ -1,294 +0,0 @@
-
-//*********************************************************
-//
-// Copyright (c) Microsoft. All rights reserved.
-// This code is licensed under the MIT License (MIT).
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH 
-// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//*********************************************************
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.ApplicationModel.Core;
-using Windows.Foundation;
-using Windows.UI;
-using Windows.UI.Composition;
-using Windows.UI.Core;
-using Windows.Media.Core;
-using Windows.Media.Playback;
-
-namespace CompositionVisualVideo
-{
-    class VideoPlayer : IFrameworkView
-    {
-        // Media set up
-
-        //------------------------------------------------------------------------------
-        //
-        // StartPlayback
-        //
-        // News up a MediaPlayer, creates a playback item then 
-        // MediaPlayer hands out a surface that can be put on brush
-        // We call this below when we set up the tree init the composition
-        //
-        //------------------------------------------------------------------------------
-        private void StartPlayback()
-        {
-
-
-            // MediaPlayer set up with a create from URI
-            _mediaPlayer = new MediaPlayer();
-
-            // Get a source from a URI. This could also be from a file via a picker or a stream
-
-            var source = MediaSource.CreateFromUri(new Uri("http://go.microsoft.com/fwlink/?LinkID=809007&clcid=0x409"));
-            var item = new MediaPlaybackItem(source);
-            _mediaPlayer.Source = item;
-
-            // MediaPlayer supports many of the starndard MediaElement vars like looping
-            _mediaPlayer.IsLoopingEnabled = true;
-
-            // Get the surface from MediaPlayer and put it on a brush
-            _videoSurface = _mediaPlayer.GetSurface(_compositor);
-            _videoVisual.Brush = _compositor.CreateSurfaceBrush(_videoSurface.CompositionSurface);
-
-            // Play the video on app run.
-
-            PlayVideo();
-
-        }
-
-        //------------------------------------------------------------------------------
-        //
-        // Play and Pause
-        //
-        // Sets up private PlayVideo() and PauseVideo() methods wrapping public MediaPlayer methods
-        // which match MediaElement methods. We only use PlayVideo() in this sample
-        //
-        //------------------------------------------------------------------------------
-        private void PlayVideo()
-        {
-            // MediaPlayer public play method. By wrapping this in a private you can add behaviors. 
-            _mediaPlayer.Play();
-        }
-
-        private void PauseVideo()
-        {
-            // MediaPlayer pause method. By wrapping this you can add behaviors later 
-            _mediaPlayer.Pause();
-        }
-
-
-        // Frameworkless App Set Up: tree and visuals including those that host video
-
-        //------------------------------------------------------------------------------
-        //
-        // VideoPlayer.Initialize
-        //
-        // This method is called during startup to associate the IFrameworkView with the
-        // CoreApplicationView.
-        //
-        //------------------------------------------------------------------------------
-
-        void IFrameworkView.Initialize(CoreApplicationView view)
-        {
-            _view = view;
-
-        }
-
-        //------------------------------------------------------------------------------
-        //
-        // VideoPlayer.SetWindow
-        //
-        // This method is called when the CoreApplication has created a new CoreWindow,
-        // allowing the application to configure the window and start producing content
-        // to display.
-        //
-        //------------------------------------------------------------------------------
-
-
-        void IFrameworkView.SetWindow(CoreWindow window)
-        {
-            _window = window;
-            InitNewComposition();
-
-        }
-
-
-        //------------------------------------------------------------------------------
-        //
-        // VideoPlayer.Load
-        //
-        // This method is called when a specific page is being loaded in the
-        // application.  It is not used for this application.
-        //
-        //------------------------------------------------------------------------------
-
-        void IFrameworkView.Load(string unused)
-        {
-
-        }
-
-        //------------------------------------------------------------------------------
-        //
-        // VideoPlayer.Run
-        //
-        // This method is called by CoreApplication.Run() to actually run the
-        // dispatcher's message pump.
-        //
-        //------------------------------------------------------------------------------
-
-        void IFrameworkView.Run()
-        {
-            _window.Activate();
-            _window.Dispatcher.ProcessEvents(CoreProcessEventsOption.ProcessUntilQuit);
-        }
-
-        //------------------------------------------------------------------------------
-        //
-        // VideoPlayer.Uninitialize
-        //
-        // This method is called during shutdown to disconnect the CoreApplicationView,
-        // and CoreWindow from the IFrameworkView.
-        //
-        //------------------------------------------------------------------------------
-
-        void IFrameworkView.Uninitialize()
-        {
-            _window = null;
-            _view = null;
-        }
-
-        //------------------------------------------------------------------------------
-        //
-        // VideoPlayer.InitNewComposition
-        //
-        // This method is called by SetWindow(), where we initialize Composition after
-        // the CoreWindow has been created.
-        //
-        //------------------------------------------------------------------------------
-
-        void InitNewComposition()
-        {
-            //
-            // Set up Windows.UI.Composition Compositor, root ContainerVisual, and associate with
-            // the CoreWindow.
-            //
-
-            _compositor = new Compositor();
-
-            _root = _compositor.CreateContainerVisual();
-
-            _compositionTarget = _compositor.CreateTargetForCurrentView();
-            _compositionTarget.Root = _root;
-
-
-            // Create a few visuals for our window
-
-            {
-                _root.Children.InsertAtTop(CreateChildElement());
-            }
-
-
-        }
-
-
-        //------------------------------------------------------------------------------
-        //
-        // VideoPlayer.CreateChildElement
-        //
-        // Creates a child to represent a visible element in our application then hangs
-        // a SpriteVisual videoHost off it to host the brush that holds the video.
-        //
-        //------------------------------------------------------------------------------
-
-        Visual CreateChildElement()
-        {
-            // ContainerVisual to allow for a simple tree.
-
-            var element = _compositor.CreateContainerVisual();
-            element.Size = new Vector2(100.0f, 100.0f);
-
-            //
-            // Position this visual within our window
-            //
-            element.Offset = new Vector3(100f, 100f, 0f);
-
-            // Create the child SpriteVisual to host video. It's size is the video size.
-            // Puts it in the tree then adds the brush with the video surface.
-
-            var videoHost = _compositor.CreateSpriteVisual();
-            videoHost.Size = new Vector2(600.0f, 500.0f);
-            element.Children.InsertAtTop(videoHost);
-            _videoVisual = videoHost;
-
-            // This calls the method that wraps all of playback business
-
-            StartPlayback();
-
-
-            return element;
-        }
-
-
-
-        // CoreWindow / CoreApplicationView
-        private CoreWindow _window;
-        private CoreApplicationView _view;
-
-        // Windows.UI.Composition
-        private Compositor _compositor;
-        private CompositionTarget _compositionTarget;
-        private ContainerVisual _root;
-
-        // Media Helpers
-        private MediaPlayer _mediaPlayer;
-        private SpriteVisual _videoVisual;
-        private MediaPlayerSurface _videoSurface;
-
-    }
-
-
-    public sealed class VideoPlayerFactory : IFrameworkViewSource
-    {
-        //------------------------------------------------------------------------------
-        //
-        // VideoPlayerFactory.CreateView
-        //
-        // This method is called by CoreApplication to provide a new IFrameworkView for
-        // a CoreWindow that is being created.
-        //
-        //------------------------------------------------------------------------------
-
-        IFrameworkView IFrameworkViewSource.CreateView()
-        {
-            return new VideoPlayer();
-        }
-
-
-        //------------------------------------------------------------------------------
-        // main
-        // Application main
-        //
-        //------------------------------------------------------------------------------
-
-        static int Main(string[] args)
-        {
-            CoreApplication.Run(new VideoPlayerFactory());
-
-            return 0;
-        }
-    }
-}
-
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/FrameworklessVideoSample.csproj
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/FrameworklessVideoSample.csproj
@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{DC47B688-AFD5-4791-9020-8677CAAFDA6C}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FrameworklessVideoSample</RootNamespace>
-    <AssemblyName>FrameworklessVideoSample</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>FrameworklessVideoSample_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <Content Include="ApplicationInsights.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CompositionVisualVideo.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-    <None Include="FrameworklessVideoSample_TemporaryKey.pfx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\SplashScreen.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.ApplicationInsights">
-      <Version>2.8.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights.PersistenceChannel">
-      <Version>1.2.3</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights.WindowsApps">
-      <Version>1.1.1</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.1.9</Version>
-    </PackageReference>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Package.appxmanifest
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Package.appxmanifest
@ -1,28 +0,0 @@
-<?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">
-  <Identity Name="486228b9-0c42-4bed-8945-107ef2948a5b" Publisher="CN=jserna" Version="1.0.0.0" />
-  <mp:PhoneIdentity PhoneProductId="486228b9-0c42-4bed-8945-107ef2948a5b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
-  <Properties>
-    <DisplayName>FrameworklessVideoSample</DisplayName>
-    <PublisherDisplayName>jserna</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-  <Resources>
-    <Resource Language="x-generate" />
-  </Resources>
-  <Applications>
-    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="FrameworklessVideoSample.App">
-      <uap:VisualElements DisplayName="FrameworklessVideoSample" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="FrameworklessVideoSample" BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
-        </uap:DefaultTile>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="white" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClient" />
-  </Capabilities>
-</Package>
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Properties/AssemblyInfo.cs
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Properties/AssemblyInfo.cs
@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("FrameworklessVideoSample")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("FrameworklessVideoSample")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
--- a/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Properties/Default.rd.xml
+++ b/Demos/FrameworklessVideoSample/FrameworklessVideoSample/Properties/Default.rd.xml
@ -1,31 +0,0 @@
-<!--
-    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
-    developers. However, you can modify these parameters to modify the behavior of the .NET Native
-    optimizer.
-
-    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
-
-    To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
-
-    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
-    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
-
-    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
-->
-
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
-      An Assembly element with Name="*Application*" applies to all assemblies in
-      the application package. The asterisks are not wildcards.
-    -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
-    <!-- Add your application specific runtime directives here. -->
-
-
-  </Application>
-</Directives>
--- a/Demos/MaterialCreator/App.xaml
+++ b/Demos/MaterialCreator/App.xaml
@ -2,11 +2,14 @@
    x:Class="MaterialCreator.App"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:MaterialCreator"
-    RequestedTheme="Light">
-
+    xmlns:local="using:MaterialCreator">
    <Application.Resources>
        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!-- Other merged dictionaries here -->
+            </ResourceDictionary.MergedDictionaries>
+            <!-- Other app resources here -->
            <Style x:Key="MaterialButton" TargetType="Button">
                <Setter Property="Background" Value="Transparent" />
                <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}"/>
@ -89,7 +92,6 @@
                    </Setter.Value>
                </Setter>
            </Style>
-
        </ResourceDictionary>
    </Application.Resources>
 </Application>
--- a/Demos/MaterialCreator/App.xaml.cs
+++ b/Demos/MaterialCreator/App.xaml.cs
@ -1,4 +1,26 @@
-using System;
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// This code is licensed under the MIT License (MIT).
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//*********************************************************
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Microsoft.UI.Xaml.Shapes;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@ -7,20 +29,16 @@ using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.

 namespace MaterialCreator
 {
    /// <summary>
    /// Provides application-specific behavior to supplement the default Application class.
    /// </summary>
-    sealed partial class App : Application
+    public partial class App : Application
    {
        /// <summary>
        /// Initializes the singleton application object.  This is the first line of authored code
@ -29,72 +47,19 @@ namespace MaterialCreator
        public App()
        {
            this.InitializeComponent();
-            this.Suspending += OnSuspending;
        }

        /// <summary>
        /// Invoked when the application is launched normally by the end user.  Other entry points
        /// will be used such as when the application is launched to open a specific file.
        /// </summary>
-        /// <param name="e">Details about the launch request and process.</param>
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
+        /// <param name="args">Details about the launch request and process.</param>
+        protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
        {
-            Frame rootFrame = Window.Current.Content as Frame;
-
-            // Do not repeat app initialization when the Window already has content,
-            // just ensure that the window is active
-            if (rootFrame == null)
-            {
-                // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new Frame();
-
-                rootFrame.NavigationFailed += OnNavigationFailed;
-
-                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
-                {
-                    //TODO: Load state from previously suspended application
+            m_window = new MainWindow();
+            m_window.Activate();
        }

-                // Place the frame in the current Window
-                Window.Current.Content = rootFrame;
-            }
-
-            if (e.PrelaunchActivated == false)
-            {
-                if (rootFrame.Content == null)
-                {
-                    // When the navigation stack isn't restored navigate to the first page,
-                    // configuring the new page by passing required information as a navigation
-                    // parameter
-                    rootFrame.Navigate(typeof(MainPage), e.Arguments);
-                }
-                // Ensure the current window is active
-                Window.Current.Activate();
-            }
-        }
-
-        /// <summary>
-        /// Invoked when Navigation to a certain page fails
-        /// </summary>
-        /// <param name="sender">The Frame which failed navigation</param>
-        /// <param name="e">Details about the navigation failure</param>
-        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-        {
-            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
-        }
-
-        /// <summary>
-        /// Invoked when application execution is being suspended.  Application state is saved
-        /// without knowing whether the application will be terminated or resumed with the contents
-        /// of memory still intact.
-        /// </summary>
-        /// <param name="sender">The source of the suspend request.</param>
-        /// <param name="e">Details about the suspend request.</param>
-        private void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
-            deferral.Complete();
-        }
+        private Window m_window;
    }
 }
--- a/Demos/MaterialCreator/Assets/LockScreenLogo.scale-200.png
+++ b/Demos/MaterialCreator/Assets/LockScreenLogo.scale-200.png
--- a/Demos/MaterialCreator/Assets/SplashScreen.scale-200.png
+++ b/Demos/MaterialCreator/Assets/SplashScreen.scale-200.png
--- a/Demos/MaterialCreator/Assets/Square150x150Logo.scale-200.png
+++ b/Demos/MaterialCreator/Assets/Square150x150Logo.scale-200.png
--- a/Demos/MaterialCreator/Assets/Square44x44Logo.scale-200.png
+++ b/Demos/MaterialCreator/Assets/Square44x44Logo.scale-200.png
--- a/Demos/MaterialCreator/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/Demos/MaterialCreator/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/Demos/MaterialCreator/Assets/StoreLogo.png
+++ b/Demos/MaterialCreator/Assets/StoreLogo.png
--- a/Demos/MaterialCreator/Assets/Wide310x150Logo.scale-200.png
+++ b/Demos/MaterialCreator/Assets/Wide310x150Logo.scale-200.png
--- a/Demos/MaterialCreator/Controls/EditEffectControl.xaml.cs
+++ b/Demos/MaterialCreator/Controls/EditEffectControl.xaml.cs
@ -12,10 +12,10 @@
 //
 //*********************************************************

+using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Diagnostics;
 using System.Reflection;
-using Windows.UI.Xaml.Controls;

 namespace MaterialCreator
 {
--- a/Demos/MaterialCreator/Controls/EditLayerControl.xaml.cs
+++ b/Demos/MaterialCreator/Controls/EditLayerControl.xaml.cs
@ -12,6 +12,9 @@
 //
 //*********************************************************

+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
@ -19,10 +22,8 @@ using System.Linq;
 using System.Reflection;
 using Windows.Storage;
 using Windows.Storage.Pickers;
-using Windows.UI.Composition.Effects;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Composition.Effects;
+using Microsoft.UI.Xaml.Hosting;

 namespace MaterialCreator
 {
@ -233,6 +234,7 @@ namespace MaterialCreator
            openPicker.FileTypeFilter.Add(".jpg");
            openPicker.FileTypeFilter.Add(".jpeg");
            openPicker.FileTypeFilter.Add(".png");
+            WinRT.Interop.InitializeWithWindow.Initialize(openPicker, WinRT.Interop.WindowNative.GetWindowHandle(MainWindow.CurrentWindow));
            StorageFile file = await openPicker.PickSingleFileAsync();

            if (file != null)
@ -262,11 +264,11 @@ namespace MaterialCreator
                        }
                        break;

-                    case LayerType.BackdropHost:
-                        {
-                            layer = new BackdropHostLayer();
-                        }
-                        break;
+                    //case LayerType.BackdropHost:
+                    //    {
+                    //        layer = new BackdropHostLayer();
+                    //    }
+                    //    break;

                    case LayerType.Color:
                        {
--- a/Demos/MaterialCreator/Controls/EditLightControl.xaml.cs
+++ b/Demos/MaterialCreator/Controls/EditLightControl.xaml.cs
@ -12,11 +12,11 @@
 //
 //*********************************************************

+using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Diagnostics;
 using System.Numerics;
 using Windows.UI;
-using Windows.UI.Xaml.Controls;


 namespace MaterialCreator
@ -52,31 +52,31 @@ namespace MaterialCreator
            ComboBoxItem item = LightTypeSelection.SelectedItem as ComboBoxItem;
            LightTypes lightType = (LightTypes)item.Tag;

-            PointProperties.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
-            SpotProperties.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
-            DirectionProperties.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
-            DefaultProperties.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
+            PointProperties.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
+            SpotProperties.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
+            DirectionProperties.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
+            DefaultProperties.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;

            switch (lightType)
            {
                case LightTypes.Point:
-                    DefaultProperties.Visibility = Windows.UI.Xaml.Visibility.Visible;
-                    PointProperties.Visibility = Windows.UI.Xaml.Visibility.Visible;
+                    DefaultProperties.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
+                    PointProperties.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
                    break;

                case LightTypes.Spot:
-                    DefaultProperties.Visibility = Windows.UI.Xaml.Visibility.Visible;
-                    SpotProperties.Visibility = Windows.UI.Xaml.Visibility.Visible;
-                    DirectionProperties.Visibility = Windows.UI.Xaml.Visibility.Visible;
+                    DefaultProperties.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
+                    SpotProperties.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
+                    DirectionProperties.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
                    break;

                case LightTypes.Distant:
-                    PointProperties.Visibility = Windows.UI.Xaml.Visibility.Visible;
-                    DirectionProperties.Visibility = Windows.UI.Xaml.Visibility.Visible;
+                    PointProperties.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
+                    DirectionProperties.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
                    break;

                case LightTypes.Ambient:
-                    PointProperties.Visibility = Windows.UI.Xaml.Visibility.Visible;
+                    PointProperties.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
                    break;

                default:
@ -229,7 +229,7 @@ namespace MaterialCreator
            UpdateLight();
        }

-        private void Slider_ValueChanged(object sender, Windows.UI.Xaml.Controls.Primitives.RangeBaseValueChangedEventArgs e)
+        private void Slider_ValueChanged(object sender, Microsoft.UI.Xaml.Controls.Primitives.RangeBaseValueChangedEventArgs e)
        {
            if (InnerCone != null && OuterCone != null)
            {
--- a/Demos/MaterialCreator/Controls/EffectControl.xaml.cs
+++ b/Demos/MaterialCreator/Controls/EffectControl.xaml.cs
@ -12,14 +12,15 @@
 //
 //*********************************************************

+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
 using SamplesCommon;
 using System.ComponentModel;
 using Windows.UI;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;

 namespace MaterialCreator
 {
--- a/Demos/MaterialCreator/Controls/LayerControl.xaml.cs
+++ b/Demos/MaterialCreator/Controls/LayerControl.xaml.cs
@ -12,18 +12,19 @@
 //
 //*********************************************************

+using Microsoft.UI;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
 using SamplesCommon;
 using System.ComponentModel;
 using System.Numerics;
 using Windows.Graphics.Effects;
 using Windows.UI;
-using Windows.UI.Composition;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Hosting;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;

 namespace MaterialCreator
 {
--- a/Demos/MaterialCreator/Controls/LightControl.xaml.cs
+++ b/Demos/MaterialCreator/Controls/LightControl.xaml.cs
@ -12,14 +12,15 @@
 //
 //*********************************************************

+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
 using SamplesCommon;
 using System.Numerics;
 using Windows.UI;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;

 namespace MaterialCreator
 {
--- a/Demos/MaterialCreator/Controls/Matrix5x4Control.xaml.cs
+++ b/Demos/MaterialCreator/Controls/Matrix5x4Control.xaml.cs
@ -13,8 +13,8 @@
 //*********************************************************

 using Microsoft.Graphics.Canvas.Effects;
+using Microsoft.UI.Xaml.Controls;
 using System;
-using Windows.UI.Xaml.Controls;

 namespace MaterialCreator
 {
--- a/Demos/MaterialCreator/Controls/VectorControl.xaml.cs
+++ b/Demos/MaterialCreator/Controls/VectorControl.xaml.cs
@ -12,11 +12,11 @@
 //
 //*********************************************************

+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Diagnostics;
 using System.Numerics;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;


 namespace MaterialCreator
--- a/Показать больше
+++ b/Показать больше