From 465e969e2e41e2135dce07f3ccbd264a4f057a6e Mon Sep 17 00:00:00 2001
From: Stephen L Peters <stpete@microsoft.com>
Date: Wed, 22 Sep 2021 15:37:01 -0700
Subject: [PATCH] Backport project file changes from 2.7 release. (#5946)

* Set up infra to remove WebView with FeatureProps

* Disable webview2.

* Update intellisense files

* remove not arm requirement for webview in cx test app.

* revert MUXControls.sln

* pull in MUXControls.sln from main

* revert unchanged file

Co-authored-by: Ranjesh Jaganathan <28935693+ranjeshj@users.noreply.github.com>
---
 dev/WebView2/WebView2.vcxitems   |  1 +
 test/TestAppCX/MainPage.xaml.cpp |  4 ++--
 test/TestAppCX/TestAppCX.vcxproj | 19 ++++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dev/WebView2/WebView2.vcxitems b/dev/WebView2/WebView2.vcxitems
index 16e76e648b..86946e224b 100644
--- a/dev/WebView2/WebView2.vcxitems
+++ b/dev/WebView2/WebView2.vcxitems
@@ -8,6 +8,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(XamlPublicHeadersPath);$(LiftedIXPIncludePaths)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);WEBVIEW2_INCLUDED</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/test/TestAppCX/MainPage.xaml.cpp b/test/TestAppCX/MainPage.xaml.cpp
index 715d10a040..8f4e5a6fea 100644
--- a/test/TestAppCX/MainPage.xaml.cpp
+++ b/test/TestAppCX/MainPage.xaml.cpp
@@ -13,7 +13,7 @@
 #include "CornerRadiusTestPage.xaml.h"
 #include "TreeViewTestPage.xaml.h"
 #include "BackdropMaterialTestPage.xaml.h"
-#ifndef _ARM_
+#ifdef WEBVIEW2_INCLUDED
 #include "WebView2TestPage.xaml.h"
 #endif
 
@@ -76,7 +76,7 @@ void TestAppCX::MainPage::GoToBackdropMaterialTestPage(Platform::Object^ sender,
 void TestAppCX::MainPage::GoToWebView2TestPage(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
 {
     auto app = dynamic_cast<App^>(Application::Current);
-#ifndef _ARM_
+#ifdef WEBVIEW2_INCLUDED
     app->RootFrame->Navigate(TypeName(WebView2TestPage::typeid), nullptr);
 #endif
 }
diff --git a/test/TestAppCX/TestAppCX.vcxproj b/test/TestAppCX/TestAppCX.vcxproj
index 9e5c0808a1..5e5a3b546c 100644
--- a/test/TestAppCX/TestAppCX.vcxproj
+++ b/test/TestAppCX/TestAppCX.vcxproj
@@ -4,6 +4,7 @@
   <Import Project="$(MSBuildProjectDirectory)\..\..\mux.controls.props" Condition="Exists('$(MSBuildProjectDirectory)\..\..\mux.controls.props') And $(BuildingWithBuildExe) != 'true'" />
   <Import Project="$(MSBuildProjectDirectory)\..\..\environment.props" />
   <Import Project="$(MSBuildProjectDirectory)\..\..\SdkVersion.props" Condition="$(BuildingWithBuildExe) == 'true'" />
+  <Import Project="$(MSBuildProjectDirectory)\..\..\FeatureAreas.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{92081f61-98bb-4105-a90f-b6d524b4f5c9}</ProjectGuid>
     <RootNamespace>TestAppCX</RootNamespace>
@@ -129,6 +130,7 @@
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4453;28204;4691</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions Condition="$(FeatureWebView2Enabled) == 'true'">%(PreprocessorDefinitions);WEBVIEW2_INCLUDED</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -136,6 +138,7 @@
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4453;28204;4691</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions Condition="$(FeatureWebView2Enabled) == 'true'">%(PreprocessorDefinitions);WEBVIEW2_INCLUDED</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -143,6 +146,7 @@
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4453;28204;4691</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions Condition="$(FeatureWebView2Enabled) == 'true'">%(PreprocessorDefinitions);WEBVIEW2_INCLUDED</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -150,6 +154,7 @@
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4453;28204;4691</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions Condition="$(FeatureWebView2Enabled) == 'true'">%(PreprocessorDefinitions);WEBVIEW2_INCLUDED</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -157,6 +162,7 @@
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4453;28204;4691</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions Condition="$(FeatureWebView2Enabled) == 'true'">%(PreprocessorDefinitions);WEBVIEW2_INCLUDED</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -164,6 +170,7 @@
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4453;28204;4691</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions Condition="$(FeatureWebView2Enabled) == 'true'">%(PreprocessorDefinitions);WEBVIEW2_INCLUDED</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
@@ -171,6 +178,7 @@
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions Condition="$(FeatureWebView2Enabled) == 'true'">%(PreprocessorDefinitions);WEBVIEW2_INCLUDED</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
@@ -178,6 +186,7 @@
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions Condition="$(FeatureWebView2Enabled) == 'true'">%(PreprocessorDefinitions);WEBVIEW2_INCLUDED</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -203,7 +212,7 @@
     <ClInclude Include="TreeViewTestPage.xaml.h">
       <DependentUpon>TreeViewTestPage.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="WebView2TestPage.xaml.h">
+    <ClInclude Include="WebView2TestPage.xaml.h" Condition="$(FeatureWebView2Enabled) == 'true'">
       <DependentUpon>WebView2TestPage.xaml</DependentUpon>
     </ClInclude>
   </ItemGroup>
@@ -229,7 +238,7 @@
     <Page Include="TreeViewTestPage.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="WebView2TestPage.xaml">
+    <Page Include="WebView2TestPage.xaml" Condition="$(FeatureWebView2Enabled) == 'true'">
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
@@ -281,7 +290,7 @@
     <ClCompile Include="TreeViewTestPage.xaml.cpp">
       <DependentUpon>TreeViewTestPage.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="WebView2TestPage.xaml.cpp">
+    <ClCompile Include="WebView2TestPage.xaml.cpp" Condition="$(FeatureWebView2Enabled) == 'true'">
       <DependentUpon>WebView2TestPage.xaml</DependentUpon>
     </ClCompile>
   </ItemGroup>
@@ -292,13 +301,13 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="..\RetargetCopyLocalFiles.targets" />
-  <ImportGroup Label="ExtensionTargets">
+  <ImportGroup Label="ExtensionTargets" Condition="$(FeatureWebView2Enabled) == 'true'">
     <Import Project="..\..\packages\Microsoft.Web.WebView2.1.0.1018-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\packages\Microsoft.Web.WebView2.1.0.1018-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <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.Web.WebView2.1.0.1018-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Web.WebView2.1.0.1018-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
+    <Error Condition="$(FeatureWebView2Enabled) == 'true' And !Exists('..\..\packages\Microsoft.Web.WebView2.1.0.1018-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Web.WebView2.1.0.1018-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
   </Target>
 </Project>
\ No newline at end of file