Add explicit WebView2 reference to prevent Microsoft.VCLibs.Desktop inclusion on UAP

Author: Arlodotexe

MultiTarget/PackageReferences/Uwp/Microsoft.Web.WebView2.props

@@ -0,0 +1,13 @@
+<Project>
+	<!-- Condition must be on a <When> statement in its own file for this to work in Visual Studio. https://stackoverflow.com/a/16557059 -->
+	<Choose>
+		<!-- Explicit WebView2 reference needed to work around WebView2 pulling in Microsoft.VCLibs.Desktop on uap -->
+		<When Condition="'$(HasWinUI)' == 'true' AND '$(MultiTargetPlatformIdentifier)' != 'windows'" >
+			<ItemGroup>
+				<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
+			</ItemGroup>
+		</When>
+		<Otherwise>
+		</Otherwise>
+	</Choose>
+</Project>

MultiTarget/WinUI.Extra.props

@@ -29,12 +29,6 @@
     <None PackagePath="lib/net7.0-windows10.0.18362" Include="$(MSBuildThisFileDirectory)/_._" Pack="true" />
   </ItemGroup>
 
-  <!-- Fixes an issue where the WebView2 reference causes Microsoft.VCLibs.Desktop to be pulled in on uap -->
-  <PropertyGroup Condition="'$(IsUwp)' == 'true' OR '$(MultiTargetPlatformIdentifier)' != 'windows'">
-    <WebView2UseWinRT>false</WebView2UseWinRT>
-    <WebView2UseDispatchAdapter>false</WebView2UseDispatchAdapter>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(IsUwp)' == 'true'">
     <Platforms>x86;x64;arm64</Platforms>