microsoft · Jun 10, 2019 · May 6, 2019 · May 8, 2019 · May 9, 2019 · May 10, 2019
diff --git a/vnext/Playground/Playground/Playground.csproj b/vnext/Playground/Playground/Playground.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Playground</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>

diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props
@@ -4,8 +4,8 @@
   <PropertyGroup Label="Globals">
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <!-- Use RS5 SDK (10.0.17763.0)  Support running on RS2+ (10.0.15063.0) -->
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <!-- Use 19H1 SDK (10.0.18362.0)  Support running on RS2+ (10.0.15063.0) -->
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
 

diff --git a/vnext/ReactUWP/Modules/NativeUIManager.cpp b/vnext/ReactUWP/Modules/NativeUIManager.cpp
@@ -93,6 +93,25 @@ void NativeUIManager::DirtyYogaNode(int64_t tag)
   }
 }
 
+winrt::XamlRoot NativeUIManager::tryGetXamlRoot()
+{
+  if (m_host)
+  {
+    for (auto const tag : m_host->GetAllRootTags())
+    {
+      if (auto shadowNode = static_cast<ShadowNodeBase*>(m_host->FindShadowNodeForTag(tag)))
+      {
+        if (auto uiElement10 = shadowNode->GetView().try_as<winrt::IUIElement10>())
+        {
+          if (auto xamlRoot = uiElement10.XamlRoot())
+            return xamlRoot;
+        }
+      }
+    }
+  }
+  return nullptr;
+}
+
 NativeUIManager::NativeUIManager()
 {
 #if defined(_DEBUG)

diff --git a/vnext/ReactUWP/Modules/NativeUIManager.h b/vnext/ReactUWP/Modules/NativeUIManager.h
@@ -53,6 +53,11 @@ class NativeUIManager : public facebook::react::INativeUIManager
   // Other public functions
   void DirtyYogaNode(int64_t tag);
 
+  // For unparented node like Flyout, XamlRoot should be set to handle XamlIsland/AppWindow scenarios.
+  // Since it doesn't have parent, and all nodes in the tree should have the same XamlRoot,
+  // this function iterates all roots and try to get a valid XamlRoot.
+  winrt::XamlRoot tryGetXamlRoot();
+
 private:
   void DoLayout();
   void UpdateExtraLayout(int64_t tag);

diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj
@@ -77,8 +77,9 @@
       <SDLCheck>true</SDLCheck>
       <!-- 
         REACTWINDOWS_BUILD - building with REACTWINDOWS_API as dll exports
+        OLD_CPPWINRT is a workaround to make target version to 19H1
       -->
-      <PreprocessorDefinitions>REACTWINDOWS_BUILD;RN_PLATFORM=uwp;USE_EDGEMODE_JSRT;NOMINMAX;FOLLY_NO_CONFIG;RN_EXPORT=;JSI_EXPORT=;WIN32=0;WINRT=1;NOJSC;_HAS_AUTO_PTR_ETC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OLD_CPPWINRT;REACTWINDOWS_BUILD;RN_PLATFORM=uwp;USE_EDGEMODE_JSRT;NOMINMAX;FOLLY_NO_CONFIG;RN_EXPORT=;JSI_EXPORT=;WIN32=0;WINRT=1;NOJSC;_HAS_AUTO_PTR_ETC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Pch;$(ReactNativeWindowsDir)ReactUWP\GeneratedWinmdHeader;$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactUWP;$(YogaDir);$(ReactNativeDir)\ReactCommon;$(ReactNativeWindowsDir)include;$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)Shared;$(FollyDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
@@ -135,7 +136,7 @@
     </PropertyGroup>
     <ItemGroup Condition="'$(ApplicationTypeRevision)' == '10.0'">
       <MetaDataDir Include="$(WindowsSDK_MetadataPath)\$(WindowsTargetPlatformVersion)\Windows.Foundation.FoundationContract\3.0.0.0" />
-      <MetaDataDir Include="$(WindowsSDK_MetadataPath)\$(WindowsTargetPlatformVersion)\Windows.Foundation.UniversalApiContract\7.0.0.0" />
+      <MetaDataDir Include="$(WindowsSDK_MetadataPath)\$(WindowsTargetPlatformVersion)\Windows.Foundation.UniversalApiContract\8.0.0.0" />
     </ItemGroup>
     <Message Text="$(MdMergeExe) -v @(MetaDataDir -> '-metadata_dir &quot;%(Identity)&quot;', ' ') -o &quot;$(MergedWinmdDirectory)&quot; -i &quot;$(UnmergedWinmdDirectory)&quot; -partial -n:-1" />
     <Exec Command="$(MdMergeExe) -v @(MetaDataDir -> '-metadata_dir &quot;%(Identity)&quot;', ' ') -o &quot;$(MergedWinmdDirectory)&quot; -i &quot;$(UnmergedWinmdDirectory)&quot; -partial -n:-1" />

diff --git a/vnext/ReactUWP/Views/FlyoutViewManager.cpp b/vnext/ReactUWP/Views/FlyoutViewManager.cpp
@@ -150,6 +150,18 @@ void FlyoutShadowNode::createView()
     if (!m_updating && instance != nullptr)
       OnFlyoutClosed(*instance, m_tag, false);
   });
+
+  // Set XamlRoot on the Flyout to handle XamlIsland/AppWindow scenarios.
+  if (auto flyoutBase6 = m_flyout.try_as<winrt::IFlyoutBase6>())
+  {
+    if (auto instance = wkinstance.lock())
+    {
+      if (auto xamlRoot = static_cast<NativeUIManager*>(instance->NativeUIManager())->tryGetXamlRoot())
+      {
+        flyoutBase6.XamlRoot(xamlRoot);
+      }
+    }
+  }
 }
 
 /*static*/ void FlyoutShadowNode::OnFlyoutClosed(IReactInstance& instance, int64_t tag, bool newValue)

diff --git a/vnext/V8Inspector/V8Inspector.vcxproj b/vnext/V8Inspector/V8Inspector.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{F1B91D19-79E4-461B-AC8E-E3E6E747F65F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>V8Inspector</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/vnext/docs/GettingStarted.md b/vnext/docs/GettingStarted.md
@@ -14,8 +14,7 @@ This is a summary of setup steps needed to install and work with React Native fo
       * Node.js development support
     * SDKs, libraries, and frameworks per your versioning needs
       * Windows 10 SDK (10.0.15063.0)
-      * Windows 10 SDK (10.0.16299.0)
-      * Windows 10 SDK (10.0.17763.0)
+      * Windows 10 SDK (10.0.18362.0)
 
 ## Dependencies
 * Install the dependencies [specified by React Native](http://facebook.github.io/react-native/docs/getting-started.html#node-python2-jdk). Specifically, make sure a recent version of [Node.js](https://nodejs.org) is installed. [Chocolatey](https://chocolatey.org/) is the React Native recommended installation method. On an elevated Command Prompt, run:

diff --git a/vnext/local-cli/generator-windows/templates/proj/MyApp.csproj b/vnext/local-cli/generator-windows/templates/proj/MyApp.csproj
@@ -14,8 +14,8 @@
     <AssemblyName><%=ns%></AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>