Merged PR 16971: Build streamlining for WindowsAppSdk + tooling

This PR: - Makes it much easier to update the WindowsAppSdk, with the version number being much more consolidated - This also has the bonus of making the .vcxproj files way more readable - Updates the code checker to ignore vscode files and powershell scripts - Adds a `runbuilds.ps1` script that mimics build.cmd, but adds hooks to customize what actually gets built
2021-09-07 18:59:14 +00:00 · 2021-09-07 18:59:14 +00:00 · 5047f60851
--- a/build/Win2D.common.props
+++ b/build/Win2D.common.props
@ -9,7 +9,6 @@
    C++ projects.

  -->
-
  <PropertyGroup>
    <DeviceType Condition="'$(DeviceType)' == ''">$(TargetPlatformIdentifier)</DeviceType>
  </PropertyGroup>
@ -52,4 +51,6 @@

  </PropertyGroup>

+  <Import Project="WindowsAppSdk.common.props" />
+
 </Project>
--- a/build/WindowsAppSdk.common.props
+++ b/build/WindowsAppSdk.common.props
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <!-- This value controls all of the projects consuming the WindowsAppSdk and centralizes it in one spot.
+            When updating the version, don't forget to update all of the package.config files as well. -->
+        <WindowsAppSdkVersion>1.0.0-experimental1</WindowsAppSdkVersion>
+
+        <_PackagesPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\packages'))</_PackagesPath>
+
+        <WindowsAppSdk_props>$(_PackagesPath)\Microsoft.WindowsAppSdk.$(WindowsAppSdkVersion)\build\native\Microsoft.WindowsAppSdk.props</WindowsAppSdk_props>
+        <WindowsAppSdk_Foundation_props>$(_PackagesPath)\Microsoft.WindowsAppSdk.Foundation.$(WindowsAppSdkVersion)\build\native\Microsoft.WindowsAppSdk.Foundation.props</WindowsAppSdk_Foundation_props>
+        <WindowsAppSdk_WinUI_props>$(_PackagesPath)\Microsoft.WindowsAppSdk.WinUI.$(WindowsAppSdkVersion)\build\native\Microsoft.WindowsAppSdk.WinUI.props</WindowsAppSdk_WinUI_props>
+        <WindowsAppSdk_InteractiveExperiences_props>$(_PackagesPath)\Microsoft.WindowsAppSdk.InteractiveExperiences.$(WindowsAppSdkVersion)\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props</WindowsAppSdk_InteractiveExperiences_props>
+
+        <!-- The base WindowsAppSdk has no .targets file, so isn't listed here -->
+        <WindowsAppSdk_Foundation_targets>$(_PackagesPath)\Microsoft.WindowsAppSdk.Foundation.$(WindowsAppSdkVersion)\build\native\Microsoft.WindowsAppSdk.Foundation.targets</WindowsAppSdk_Foundation_targets>
+        <WindowsAppSdk_WinUI_targets>$(_PackagesPath)\Microsoft.WindowsAppSdk.WinUI.$(WindowsAppSdkVersion)\build\native\Microsoft.WindowsAppSdk.WinUI.targets</WindowsAppSdk_WinUI_targets>
+        <WindowsAppSdk_InteractiveExperiences_targets>$(_PackagesPath)\Microsoft.WindowsAppSdk.InteractiveExperiences.$(WindowsAppSdkVersion)\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets</WindowsAppSdk_InteractiveExperiences_targets>
+    </PropertyGroup>
+</Project>
--- a/runbuild.ps1
+++ b/runbuild.ps1
@ -0,0 +1,85 @@
+# Script to run a build of Win2d - this mimics build.cmd but adds more customization options
+# One of the goals is to closely mimic what the ADO pipeline does for more consistency.
+# Examples:
+#       Build Win2D (just Microsoft.Graphics.Canvas.dll) for all versions / revisions
+#       .\runbuild.ps1
+#
+#       Quickly build Win2D for inner loop
+#       .\runbuild.ps1 -BuildConfigurations "Debug" -BuildPlatforms "x64"
+#
+#       Clean (delete bin/obj files)
+#       .\runbuild.ps1 -Clean
+#
+#       Build and run tests
+#       .\runbuild.ps1 -BuildConfigurations "Debug" -BuildPlatforms "Win32;x86" -RunTests
+[CmdletBinding()]
+param (
+    [string]$BuildConfigurations,
+    [string]$BuildPlatforms,
+    [switch]$BuildTests = $false,
+    [switch]$BuildDocs = $false,
+    [switch]$RunTests = $false,
+    [switch]$Clean
+)
+
+$ErrorActionPreference = 'Stop';
+
+if ($Clean) {
+    $objDir = Join-Path $PSScriptRoot "obj"
+    $binDir = Join-Path $PSScriptRoot "bin"
+    if (Test-Path $objDir) { Remove-Item $objDir -Recurse }
+    if (Test-Path $binDir) { Remove-Item $binDir -Recurse }
+    Write-Host "Successfully cleaned binaries!" -ForegroundColor Green
+    return;
+}
+
+# TODO: figure out dynamically what version of visual studio is installed
+$env:VS160COMNTOOLS = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\"
+
+$msbuildExe = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe"
+$projFile = Join-Path $PSScriptRoot "Win2D.proj"
+$slnPath = Join-Path $PSScriptRoot "Microsoft.Graphics.Win2D.sln"
+$nugetExe = Join-Path $PSScriptRoot "build\nuget\nuget.exe"
+
+if (!(Test-Path $msbuildExe)) {
+    Write-Error "Could not find msbuild.exe. Is Visual Studio 2019 installed?`n    Checked for msbuild.exe here: $msbuildExe"
+    return;
+}
+
+
+if (!(Test-Path $nugetExe)) {
+    Write-Error "Could not find nuget.exe ($nugetExe)`n    Please run 'build\nuget\download-nuget.cmd' to install nuget."
+    return;
+}
+
+
+# Step 1 is nuget restore for AnyCPU projects, which MSBuild doesn't do for us
+
+Write-Host "Beginning nuget restore..." -ForegroundColor Green
+
+$env:Platform = "AnyCPU"
+$env:Configuration = "Release"
+Write-Verbose "Restoring Release, AnyCPU"
+& $nugetExe restore $slnPath
+$env:Config = "Debug"
+Write-Verbose "Restoring Debug, AnyCPU"
+& $nugetExe restore $slnPath
+
+Write-Host "Beginning build..." -ForegroundColor Green
+
+$buildConfigArg = ""
+if ($BuildConfigurations) {
+    $buildConfigArg = "/p:BuildConfigurations=$BuildConfigurations"
+}
+
+$buildPlatformsArg = ""
+if ($BuildPlatforms) {
+    $buildPlatformsArg = "/p:BuildPlatforms=$BuildPlatforms"
+}
+
+if ($RunTests) {
+    $BuildTests = $true
+}
+
+Write-Output "$msbuildExe $projFile $buildConfigArg $buildPlatformsArg /p:BuildTests=$BuildTests /p:BuildDocs=$BuildDocs /p:RunTests=$RunTests"
+& $msbuildExe $projFile $buildConfigArg $buildPlatformsArg "/p:BuildTests=$BuildTests" "/p:BuildDocs=$BuildDocs" "/p:RunTests=$RunTests"
--- a/tools/checkcode/RunCodeChecks.proj
+++ b/tools/checkcode/RunCodeChecks.proj
@ -31,8 +31,8 @@
    <!-- File extensions and directories to check vs. ignore -->
    <CppExt>c;cpp;h;inl;cs;idl;rc;hlsl</CppExt>
    <XmlExt>xml;xaml;aml</XmlExt>
-    <SkipExt>;gitattributes;gitignore;orig;jpg;png;dds;txt;md;pfx;cmd;bat;proj;nuspec;props;targets;def;sln;csproj;vcxproj;vcxitems;filters;projitems;shproj;shfbproj;content;config;appxmanifest;suo;ipch;sdf;log;opensdf;user;exe;bmp;ico;tif;vsdx;svg;json;bin;opendb;db;binlog;vsconfig_buildtools</SkipExt>
-    <SkipDir>.git;obj;bin;TestResults;build;.nuget;packages;.vs</SkipDir>
+    <SkipExt>;gitattributes;gitignore;orig;jpg;png;dds;txt;md;pfx;cmd;bat;proj;nuspec;props;targets;def;sln;csproj;vcxproj;vcxitems;filters;projitems;shproj;shfbproj;content;config;appxmanifest;suo;ipch;sdf;log;opensdf;user;exe;bmp;ico;tif;vsdx;svg;json;bin;opendb;db;binlog;vsconfig_buildtools;ps1</SkipExt>
+    <SkipDir>.git;obj;bin;TestResults;build;.nuget;packages;.vs;.vscode</SkipDir>

    <!-- Commandline arguments for the CheckCode.exe tool -->
    <Args>$(CopyrightFile) /rootdir:$(RootDir) /cppext:$(CppExt) /xmlext:$(XmlExt) /skipext:$(SkipExt) /skipdir:$(SkipDir) /checkformatting</Args>
--- a/winrt/dll/winrt.dll.uap.vcxproj
+++ b/winrt/dll/winrt.dll.uap.vcxproj
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props')" />
  <PropertyGroup Label="Globals">
    <ProjectGuid>{8cf21e5d-e0a2-4fe7-8e2b-a025cf52dcfb}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
@ -24,6 +21,9 @@
  </PropertyGroup>
  <Import Project="..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(WindowsAppSdk_props)" Condition="Exists('$(WindowsAppSdk_props)')" />
+  <Import Project="$(WindowsAppSdk_Foundation_props)" Condition="Exists('$(WindowsAppSdk_Foundation_props)')" />
+  <Import Project="$(WindowsAppSdk_WinUI_props)" Condition="Exists('$(WindowsAppSdk_WinUI_props)')" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
@ -102,13 +102,12 @@
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_Foundation_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_Foundation_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_Foundation_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_Foundation_targets)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_WinUI_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_WinUI_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_WinUI_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_WinUI_targets)'))" />
  </Target>
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.targets')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets')" />
+  <Import Project="$(WindowsAppSdk_Foundation_targets)" Condition="Exists('$(WindowsAppSdk_Foundation_targets)')" />
+  <Import Project="$(WindowsAppSdk_WinUI_targets)" Condition="Exists('$(WindowsAppSdk_WinUI_targets)')" />
 </Project>
--- a/winrt/lib/winrt.lib.uap.vcxproj
+++ b/winrt/lib/winrt.lib.uap.vcxproj
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props')" />
  <Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props')" />
  <Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props')" />
  <PropertyGroup Label="Globals">
@ -25,6 +22,9 @@
  </PropertyGroup>
  <Import Project="..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(WindowsAppSdk_props)" Condition="Exists('$(WindowsAppSdk_props)')" />
+  <Import Project="$(WindowsAppSdk_WinUI_props)" Condition="Exists('$(WindowsAppSdk_WinUI_props)')" />
+  <Import Project="$(WindowsAppSdk_InteractiveExperiences_props)" Condition="Exists('$(WindowsAppSdk_InteractiveExperiences_props)')" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <TargetName>winrt</TargetName>
@ -32,7 +32,7 @@
  <PropertyGroup Label="Configuration">
    <DesktopCompatible>true</DesktopCompatible>
  </PropertyGroup>
-  <Import Project="$(MSBuildThisFileDir)..\..\build\midlrt.props" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\build\midlrt.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ItemDefinitionGroup>
    <ClCompile>
@ -488,16 +488,14 @@
    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets'))" />
    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props'))" />
    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_WinUI_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_WinUI_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_WinUI_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_WinUI_targets)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_InteractiveExperiences_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_InteractiveExperiences_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_InteractiveExperiences_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_InteractiveExperiences_targets)'))" />
  </Target>
  <Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" />
  <Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.targets')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets')" />
-
+  <Import Project="$(WindowsAppSdk_WinUI_targets)" Condition="Exists('$(WindowsAppSdk_WinUI_targets)')" />
+  <Import Project="$(WindowsAppSdk_InteractiveExperiences_targets)" Condition="Exists('$(WindowsAppSdk_InteractiveExperiences_targets)')" />
 </Project>
--- a/winrt/projection.net5/winrt.projection.net5.csproj
+++ b/winrt/projection.net5/winrt.projection.net5.csproj
@ -22,7 +22,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSdk" Version="1.0.0-experimental1" />
+    <PackageReference Include="Microsoft.WindowsAppSdk" Version="$(WindowsAppSdkVersion)" />
    <PackageReference Include="Microsoft.Windows.CSWinRT" Version="1.3.0" />
    <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All" />
  
--- a/winrt/test.external/winrt.test.external.uap.vcxproj
+++ b/winrt/test.external/winrt.test.external.uap.vcxproj
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props')" />
  <PropertyGroup Label="Globals">
    <ProjectGuid>{f33c7cb9-5eca-47b7-9393-81e6e8f0bd34}</ProjectGuid>
    <RootNamespace>Canvas.Test</RootNamespace>
@ -20,6 +16,10 @@
  </PropertyGroup>
  <Import Project="..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(WindowsAppSdk_props)" Condition="Exists('$(WindowsAppSdk_props)')" />
+  <Import Project="$(WindowsAppSdk_Foundation_props)" Condition="Exists('$(WindowsAppSdk_Foundation_props)')" />
+  <Import Project="$(WindowsAppSdk_WinUI_props)" Condition="Exists('$(WindowsAppSdk_WinUI_props)')" />
+  <Import Project="$(WindowsAppSdk_InteractiveExperiences_props)" Condition="Exists('$(WindowsAppSdk_InteractiveExperiences_props)')" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
  </PropertyGroup>
@ -175,11 +175,10 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.targets')" />
-    <Import Project="..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets')" />
-    <Import Project="..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets')" />
-    <Import Project="..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets')" />
+  <ImportGroup>
+    <Import Project="$(WindowsAppSdk_Foundation_targets)" Condition="Exists('$(WindowsAppSdk_Foundation_targets)')" />
+    <Import Project="$(WindowsAppSdk_WinUI_targets)" Condition="Exists('$(WindowsAppSdk_WinUI_targets)')" />
+    <Import Project="$(WindowsAppSdk_InteractiveExperiences_targets)" Condition="Exists('$(WindowsAppSdk_InteractiveExperiences_targets)')" />
  </ImportGroup>
  <Import Project="..\..\build\Win2D.cpp.targets" />
  <ItemDefinitionGroup>
@ -199,12 +198,12 @@
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets'))" />
+      <Error Condition="!Exists('$(WindowsAppSdk_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_props)'))" />
+      <Error Condition="!Exists('$(WindowsAppSdk_Foundation_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_Foundation_props)'))" />
+      <Error Condition="!Exists('$(WindowsAppSdk_Foundation_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_Foundation_targets)'))" />
+      <Error Condition="!Exists('$(WindowsAppSdk_WinUI_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_WinUI_props)'))" />
+      <Error Condition="!Exists('$(WindowsAppSdk_WinUI_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_WinUI_targets)'))" />
+      <Error Condition="!Exists('$(WindowsAppSdk_InteractiveExperiences_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_InteractiveExperiences_props)'))" />
+      <Error Condition="!Exists('$(WindowsAppSdk_InteractiveExperiences_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_InteractiveExperiences_targets)'))" />
  </Target>
 </Project>
--- a/winrt/test.internal/winrt.test.internal.uap.vcxproj
+++ b/winrt/test.internal/winrt.test.internal.uap.vcxproj
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props')" />
  <Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props')" />
  <Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props')" />
  <PropertyGroup Label="Globals">
@ -18,6 +14,10 @@
  </PropertyGroup>
  <Import Project="..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(WindowsAppSdk_props)" Condition="Exists('$(WindowsAppSdk_props)')" />
+  <Import Project="$(WindowsAppSdk_Foundation_props)" Condition="Exists('$(WindowsAppSdk_Foundation_props)')" />
+  <Import Project="$(WindowsAppSdk_WinUI_props)" Condition="Exists('$(WindowsAppSdk_WinUI_props)')" />
+  <Import Project="$(WindowsAppSdk_InteractiveExperiences_props)" Condition="Exists('$(WindowsAppSdk_InteractiveExperiences_props)')" />
  <PropertyGroup Label="Configuration">
    <PlatformToolset>v142</PlatformToolset>
    <TargetName>winrt.test.internal.uap</TargetName>
@ -287,13 +287,13 @@
    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets'))" />
    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props'))" />
    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_Foundation_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_Foundation_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_Foundation_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_Foundation_targets)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_WinUI_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_WinUI_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_WinUI_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_WinUI_targets)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_InteractiveExperiences_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_InteractiveExperiences_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_InteractiveExperiences_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_InteractiveExperiences_targets)'))" />
  </Target>
  <Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" />
  <Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" />
@ -310,8 +310,7 @@
      <AdditionalIncludeDirectories>..\..\obj\winrt.lib.uap\$(FullPlatform)\$(Configuration)\Generated Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.targets')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets')" />
+  <Import Project="$(WindowsAppSdk_Foundation_targets)" Condition="Exists('$(WindowsAppSdk_Foundation_targets)')" />
+  <Import Project="$(WindowsAppSdk_WinUI_targets)" Condition="Exists('$(WindowsAppSdk_WinUI_targets)')" />
+  <Import Project="$(WindowsAppSdk_InteractiveExperiences_targets)" Condition="Exists('$(WindowsAppSdk_InteractiveExperiences_targets)')" />
 </Project>
--- a/winrt/test.managed/winrt.test.managed.uap.csproj
+++ b/winrt/test.managed/winrt.test.managed.uap.csproj
@ -156,7 +156,7 @@
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
      <Version>6.2.12</Version>
    </PackageReference>
-    <PackageReference Include="Microsoft.WindowsAppSdk" Version="1.0.0-experimental1" />
+    <PackageReference Include="Microsoft.WindowsAppSdk" Version="$(WindowsAppSdkVersion)" />
    <PackageReference Include="MSTest.TestAdapter">
      <Version>2.2.3</Version>
    </PackageReference>
--- a/winrt/test.nativecomponent/winrt.test.nativecomponent.uap.vcxproj
+++ b/winrt/test.nativecomponent/winrt.test.nativecomponent.uap.vcxproj
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props')" />
  <Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props')" />
  <Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.props')" />
  <PropertyGroup Label="Globals">
@ -24,6 +20,10 @@
  </PropertyGroup>
  <Import Project="..\..\build\Win2D.cpp.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(WindowsAppSdk_props)" Condition="Exists('$(WindowsAppSdk_props)')" />
+  <Import Project="$(WindowsAppSdk_Foundation_props)" Condition="Exists('$(WindowsAppSdk_Foundation_props)')" />
+  <Import Project="$(WindowsAppSdk_WinUI_props)" Condition="Exists('$(WindowsAppSdk_WinUI_props)')" />
+  <Import Project="$(WindowsAppSdk_InteractiveExperiences_props)" Condition="Exists('$(WindowsAppSdk_InteractiveExperiences_props)')" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
@ -82,17 +82,17 @@
    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets'))" />
    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.props'))" />
    <Error Condition="!Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_Foundation_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_Foundation_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_Foundation_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_Foundation_targets)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_WinUI_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_WinUI_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_WinUI_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_WinUI_targets)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_InteractiveExperiences_props)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_InteractiveExperiences_props)'))" />
+    <Error Condition="!Exists('$(WindowsAppSdk_InteractiveExperiences_targets)')" Text="$([System.String]::Format('$(ErrorText)', '$(WindowsAppSdk_InteractiveExperiences_targets)'))" />
  </Target>
  <Import Project="..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.AbiWinRT.2.0.210330.2\build\native\Microsoft.Windows.AbiWinRT.targets')" />
  <Import Project="..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.MidlRT.2.0.200924.1\build\native\Microsoft.Windows.MidlRT.targets')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.Foundation.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.Foundation.targets')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.WinUI.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.WinUI.targets')" />
-  <Import Project="..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets" Condition="Exists('..\..\packages\Microsoft.WindowsAppSdk.InteractiveExperiences.1.0.0-experimental1\build\native\Microsoft.WindowsAppSdk.InteractiveExperiences.targets')" />
+  <Import Project="$(WindowsAppSdk_Foundation_targets)" Condition="Exists('$(WindowsAppSdk_Foundation_targets)')" />
+  <Import Project="$(WindowsAppSdk_WinUI_targets)" Condition="Exists('$(WindowsAppSdk_WinUI_targets)')" />
+  <Import Project="$(WindowsAppSdk_InteractiveExperiences_targets)" Condition="Exists('$(WindowsAppSdk_InteractiveExperiences_targets)')" />
 </Project>