From 688206b76481d00a61110d9f28218cb2bc58957c Mon Sep 17 00:00:00 2001
From: Carlos Sanchez Lopez <1175054+carlossanlop@users.noreply.github.com>
Date: Fri, 19 Jun 2020 10:45:14 -0700
Subject: [PATCH] Update MicrosoftPrivateIntellisensePackage and XmlDocFileRoot
 (#38109)

* Update MicrosoftPrivateIntellisensePackage and XmlDocFileRoot

* Update eng/Versions.props

Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>

* Update eng/Versions.props

Co-authored-by: Santiago Fernandez Madero <safern@microsoft.com>
---
 eng/Versions.props       | 7 ++++++-
 eng/packaging.props      | 3 ---
 eng/restore/docs.targets | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 9cf7f5a06a9..3e6b4ed9ff1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -113,7 +113,7 @@
     <NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
     <MoqVersion>4.12.0</MoqVersion>
     <!-- Docs -->
-    <MicrosoftPrivateIntellisenseVersion>3.1.0-preview-20200129.1</MicrosoftPrivateIntellisenseVersion>
+    <MicrosoftPrivateIntellisenseVersion>3.0.0-preview-20200602.3</MicrosoftPrivateIntellisenseVersion>
     <!-- ILLink -->
     <MicrosoftNETILLinkTasksVersion>5.0.0-preview.3.20317.2</MicrosoftNETILLinkTasksVersion>
     <!-- Mono LLVM -->
@@ -138,6 +138,11 @@
     <MicrosoftDotNetBuildTasksFeedPackage>Microsoft.DotNet.Build.Tasks.Feed</MicrosoftDotNetBuildTasksFeedPackage>
     <MicrosoftNETCoreTargetsPackage>Microsoft.NETCore.Targets</MicrosoftNETCoreTargetsPackage>
     <MicrosoftNETCoreRuntimeCoreCLRPackage>Microsoft.NETCore.Runtime.CoreCLR</MicrosoftNETCoreRuntimeCoreCLRPackage>
+    <!-- XmlDocFileRoot needs to be defined here since we use it in packaging.props and docs.targets.
+    It also uses Arcade defined property NuGetPackageRoot, this is the only codepath shared in between
+    packaging.props and docs.targets with arcade properties defined. 
+    -->
+    <XmlDocFileRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', '$(MicrosoftPrivateIntellisensePackage)', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles', 'net'))</XmlDocFileRoot>
   </PropertyGroup>
   <!-- Override isolated build dependency versions with versions from Repo API. -->
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
diff --git a/eng/packaging.props b/eng/packaging.props
index eea246c0980..9db71c397b4 100644
--- a/eng/packaging.props
+++ b/eng/packaging.props
@@ -12,9 +12,6 @@
     <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
     <PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>
 
-    <!-- Used by PackageLibs.targets -->
-    <XmlDocFileRoot>$(NuGetPackageRoot)$(MicrosoftPrivateIntellisensePackage)/$(MicrosoftPrivateIntellisenseVersion)/IntellisenseFiles/netcoreapp</XmlDocFileRoot>
-
     <!-- By default the packaging targets will package desktop facades as ref,
          but we don't use this as we now build partial-reference-facades. -->
     <PackageDesktopAsRef>false</PackageDesktopAsRef>
diff --git a/eng/restore/docs.targets b/eng/restore/docs.targets
index 2437815a0f3..072564d9ac7 100644
--- a/eng/restore/docs.targets
+++ b/eng/restore/docs.targets
@@ -9,7 +9,7 @@
           AfterTargets="Restore">
 
     <ItemGroup>
-      <DocFile Include="$(NuGetPackageRoot)$(MicrosoftPrivateIntellisensePackage)/$(MicrosoftPrivateIntellisenseVersion)/IntellisenseFiles/netcoreapp/**/*.xml"/>
+      <DocFile Include="$(XmlDocFileRoot)**\*.xml"/>
       <DocFile>
         <!-- trim off slash since it differs by platform and we need to do a string compare -->
         <LCID>$([System.String]::new('%(RecursiveDir)').TrimEnd('\/'))</LCID>
-- 
GitLab