From 02e8b58f826424a2e70082186a29d53a9ea08ba7 Mon Sep 17 00:00:00 2001
From: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
Date: Thu, 1 Dec 2022 19:08:08 -0800
Subject: [PATCH 01/27] Copy local intellisense xmls for assemblies with source
 of truth.

---
 eng/restore/docs.targets | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/eng/restore/docs.targets b/eng/restore/docs.targets
index 764bc5bbefb64..47889fb82ae85 100644
--- a/eng/restore/docs.targets
+++ b/eng/restore/docs.targets
@@ -6,10 +6,17 @@
 
   <!-- the intellisense package doesn't use nuget conventions so we need to select manually -->
   <Target Name="GetDocFiles"
-          AfterTargets="Restore">
+          AfterTargets="Build">
 
     <ItemGroup>
-      <DocFile Include="$(XmlDocFileRoot)**\*.xml"/>
+      <AssemblyWithDocsSourceOfTruth Include="System.Formats.Cbor" />
+      <AssemblyWithDocsSourceOfTruth Include="System.IO.Compression.Brotli" />
+      <AssemblyWithDocsSourceOfTruth Include="System.Numerics.Vectors" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <DocFile Include="$(XmlDocFileRoot)**\*.xml"
+               Exclude="@(AssemblyWithDocsSourceOfTruth->'$(XmlDocFileRoot)\**\%(Identity).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>
@@ -30,17 +37,24 @@
         <Culture Condition="'%(LCID)' == '3082'">es/</Culture>
       </DocFile>
       <DocFile>
-        <SubFolder>%(Culture)/</SubFolder>
+        <SubFolder>%(Culture)</SubFolder>
       </DocFile>
     </ItemGroup>
 
     <Error Condition="'%(DocFile.Culture)' == 'unknown'" Text="Unknown language folder '%(LCID)' for doc files '@(DocFile)'" />
     
     <Copy SourceFiles="@(DocFile)"
-          DestinationFiles="$(XmlDocDir)\%(SubFolder)%(FileName)%(Extension)"
+          DestinationFiles="$(XmlDocDir)%(SubFolder)%(FileName)%(Extension)"
+          SkipUnchangedFiles="true"
+          UseHardlinksIfPossible="true" />
+
+    <!-- No subfolder, do we only generate english? -->
+    <Copy SourceFiles="@(AssemblyWithDocsSourceOfTruth->'$(ArtifactsBinDir)%(Identity)/$(Configuration)/$(NetCoreAppCurrent)/%(Identity).xml')"
+          DestinationFiles="$(XmlDocDir)%(Identity).xml"
           SkipUnchangedFiles="true"
           UseHardlinksIfPossible="true" />
 
+    <!-- TODO: Look into tasks.proj, the first ProjectReference accesses the csproj files -->
   </Target>
 
 </Project>

From 3227c678577445dd6da7d457bdb2dbd74ec249af Mon Sep 17 00:00:00 2001
From: smasher164 <akhilindurti@microsoft.com>
Date: Tue, 3 Jan 2023 09:35:49 -0800
Subject: [PATCH 02/27] use UseIntellisenseDocumentationFile instead

---
 eng/packaging.targets                         | 12 +++++
 eng/restore/docs.targets                      | 53 -------------------
 .../src/System.Formats.Cbor.csproj            |  1 +
 3 files changed, 13 insertions(+), 53 deletions(-)

diff --git a/eng/packaging.targets b/eng/packaging.targets
index e5cfa659cfaf9..a8252f9cd9f8b 100644
--- a/eng/packaging.targets
+++ b/eng/packaging.targets
@@ -118,6 +118,18 @@
     </ItemGroup>
   </Target>
 
+  <!-- <Target Name="CopyDocumentationFileToXmlDocDir"
+          AfterTargets="CoreCompile"
+          Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"
+          BeforeTargets="ChangeDocumentationFileForPackaging">
+
+    <Copy SourceFiles="@(DocumentationProjectOutputGroupOutput)"
+          DestinationFolder="$(XmlDocDir)"
+          SkipUnchangedFiles="true"
+          UseHardlinksIfPossible="true" />
+
+  </Target> -->
+
   <!-- Add runtime specific file into the package if the tfm is RID specific. -->
   <Target Name="AddRuntimeSpecificFilesToPackage"
           DependsOnTargets="BuiltProjectOutputGroup;
diff --git a/eng/restore/docs.targets b/eng/restore/docs.targets
index 47889fb82ae85..c04ba94cba1f8 100644
--- a/eng/restore/docs.targets
+++ b/eng/restore/docs.targets
@@ -4,57 +4,4 @@
     <PackageDownload Include="Microsoft.Private.Intellisense" Version="[$(MicrosoftPrivateIntellisenseVersion)]" />
   </ItemGroup>
 
-  <!-- the intellisense package doesn't use nuget conventions so we need to select manually -->
-  <Target Name="GetDocFiles"
-          AfterTargets="Build">
-
-    <ItemGroup>
-      <AssemblyWithDocsSourceOfTruth Include="System.Formats.Cbor" />
-      <AssemblyWithDocsSourceOfTruth Include="System.IO.Compression.Brotli" />
-      <AssemblyWithDocsSourceOfTruth Include="System.Numerics.Vectors" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <DocFile Include="$(XmlDocFileRoot)**\*.xml"
-               Exclude="@(AssemblyWithDocsSourceOfTruth->'$(XmlDocFileRoot)\**\%(Identity).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>
-      </DocFile>
-      <DocFile>
-        <!-- map LCID to culture name that VS expects -->
-        <Culture>unknown</Culture>
-        <Culture Condition="'%(LCID)' == '1028'">zh-hant/</Culture>
-        <Culture Condition="'%(LCID)' == '1031'">de/</Culture>
-        <!-- english is placed in the root -->
-        <Culture Condition="'%(LCID)' == '1033'"></Culture>
-        <Culture Condition="'%(LCID)' == '1036'">fr/</Culture>
-        <Culture Condition="'%(LCID)' == '1040'">it/</Culture>
-        <Culture Condition="'%(LCID)' == '1041'">ja/</Culture>
-        <Culture Condition="'%(LCID)' == '1042'">ko/</Culture>
-        <Culture Condition="'%(LCID)' == '1049'">ru/</Culture>
-        <Culture Condition="'%(LCID)' == '2052'">zh-hans/</Culture>
-        <Culture Condition="'%(LCID)' == '3082'">es/</Culture>
-      </DocFile>
-      <DocFile>
-        <SubFolder>%(Culture)</SubFolder>
-      </DocFile>
-    </ItemGroup>
-
-    <Error Condition="'%(DocFile.Culture)' == 'unknown'" Text="Unknown language folder '%(LCID)' for doc files '@(DocFile)'" />
-    
-    <Copy SourceFiles="@(DocFile)"
-          DestinationFiles="$(XmlDocDir)%(SubFolder)%(FileName)%(Extension)"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="true" />
-
-    <!-- No subfolder, do we only generate english? -->
-    <Copy SourceFiles="@(AssemblyWithDocsSourceOfTruth->'$(ArtifactsBinDir)%(Identity)/$(Configuration)/$(NetCoreAppCurrent)/%(Identity).xml')"
-          DestinationFiles="$(XmlDocDir)%(Identity).xml"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="true" />
-
-    <!-- TODO: Look into tasks.proj, the first ProjectReference accesses the csproj files -->
-  </Target>
-
 </Project>
diff --git a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
index bb71e12e648e4..d9002cc07965f 100644
--- a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
+++ b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPackable>true</IsPackable>
+    <!-- <UseIntellisenseDocumentationFile>false</UseIntellisenseDocumentationFile> -->
     <PackageDescription>Provides classes that can read and write the CBOR data format.
 
 Commonly Used Types:

From 175deeef6ebb7ed36b97b208311694935e70f998 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Mon, 9 Jan 2023 19:40:40 -0800
Subject: [PATCH 03/27] Create intellisense.targets, which contains the Target
 that defines the set of files to copy, and the Target that copies each of
 those files into the artifacts/bin/docs folder. The paths of the files to
 copy are dynamically defined depending if the assembly IsPackable property is
 set or not, and if the UseIntellisenseDocumentationFile boolean is set or
 not.

---
 Directory.Build.props    |  2 +-
 Directory.Build.targets  |  1 +
 eng/intellisense.targets | 32 ++++++++++++++++++++++++++++++++
 eng/packaging.targets    | 26 +-------------------------
 4 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 eng/intellisense.targets

diff --git a/Directory.Build.props b/Directory.Build.props
index 6738ab7a8d26c..7797b54b9e548 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -105,7 +105,7 @@
     <IbcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))</IbcOptimizationDataDir>
     <MibcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'mibc'))</MibcOptimizationDataDir>
     <XmlDocDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs'))</XmlDocDir>
-    <XmlDocFileRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles', 'net'))</XmlDocFileRoot>
+    <XmlDocFileRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</XmlDocFileRoot>
     <DocsDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'docs'))</DocsDir>
     <ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages'))</ManPagesDir>
 
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 5f92d5d4685e8..4f68c36320d50 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -12,6 +12,7 @@
   <Import Project="$(RepositoryEngineeringDir)generators.targets" />
   <Import Project="$(RepositoryEngineeringDir)python.targets" />
   <Import Project="$(RepositoryEngineeringDir)resolveContract.targets" Condition="'$(IsSourceProject)' == 'true'" />
+  <Import Project="$(RepositoryEngineeringDir)intellisense.targets" Condition="'$(MSBuildProjectExtension)' != '.pkgproj'" />
   <Import Project="$(RepositoryEngineeringDir)packaging.targets" Condition="'$(IsPackable)' == 'true' and '$(MSBuildProjectExtension)' != '.pkgproj'" />
 
   <!--
diff --git a/eng/intellisense.targets b/eng/intellisense.targets
new file mode 100644
index 0000000000000..8627722532047
--- /dev/null
+++ b/eng/intellisense.targets
@@ -0,0 +1,32 @@
+<Project>
+
+  <PropertyGroup>
+      <!-- Search for the documentation file in the intellisense package and otherwise pick up the generated one. -->
+    <IntellisensePackageFolderName Condition="'$(IsPackable)' == '' or '$(IsPackable)' == 'false'">net</IntellisensePackageFolderName>
+    <IntellisensePackageFolderName Condition="'$(IsPackable)' == 'true'">dotnet-plat-ext</IntellisensePackageFolderName>
+    <LibIntellisenseDocumentationFilePath Condition="'$(UseIntellisenseDocumentationFile)' == 'true'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', '$(MSBuildProjectName)', '$(LibrariesConfiguration)', '$(NetCoreAppCurrent)', '$(MSBuildProjectName).xml'))</LibIntellisenseDocumentationFilePath>
+    <LibIntellisenseDocumentationFilePath Condition="'$(UseIntellisenseDocumentationFile)' == '' or '$(UseIntellisenseDocumentationFile)' == 'false'">$([MSBuild]::NormalizePath('$(XmlDocFileRoot)', '$(IntellisensePackageFolderName)', '1033', '$(AssemblyName).xml'))</LibIntellisenseDocumentationFilePath>
+    <UseIntellisenseDocumentationFile Condition="'$(UseIntellisenseDocumentationFile)' == '' and Exists('$(LibIntellisenseDocumentationFilePath)')">true</UseIntellisenseDocumentationFile>
+  </PropertyGroup>
+
+  <!-- TODO: Remove this target when no library relies on the intellisense documentation file anymore.-->
+  <Target Name="ChangeDocumentationFileForPackaging"
+          AfterTargets="DocumentationProjectOutputGroup"
+          Condition="'$(UseIntellisenseDocumentationFile)' == 'true'">
+    <ItemGroup>
+      <DocumentationProjectOutputGroupOutput Remove="@(DocumentationProjectOutputGroupOutput)" />
+      <DocumentationProjectOutputGroupOutput Include="$(LibIntellisenseDocumentationFilePath)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="CopyDocumentationFileToXmlDocDir"
+          AfterTargets="CoreCompile"
+          Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"
+          DependsOnTargets="ChangeDocumentationFileForPackaging">
+    <Copy SourceFiles="@(DocumentationProjectOutputGroupOutput)"
+          DestinationFolder="$(XmlDocDir)"
+          SkipUnchangedFiles="true"
+          UseHardlinksIfPossible="true" />
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/eng/packaging.targets b/eng/packaging.targets
index a8252f9cd9f8b..3280c79c475d4 100644
--- a/eng/packaging.targets
+++ b/eng/packaging.targets
@@ -28,9 +28,7 @@
     <GeneratePackageOnBuild Condition="'$(GeneratePackageOnBuild)' != 'true' and
                                        '$(BuildAllConfigurations)' == 'true' and
                                        '$(DotNetBuildFromSource)' == 'true'">true</GeneratePackageOnBuild>
-    <!-- Search for the documentation file in the intellisense package and otherwise pick up the generated one. -->
-    <LibIntellisenseDocumentationFilePath>$(XmlDocFileRoot)1033\$(AssemblyName).xml</LibIntellisenseDocumentationFilePath>
-    <UseIntellisenseDocumentationFile Condition="'$(UseIntellisenseDocumentationFile)' == '' and Exists('$(LibIntellisenseDocumentationFilePath)')">true</UseIntellisenseDocumentationFile>
+
     <!-- During NoBuild pack invocations, skip project reference build. Necessary for the IncludeProjectReferencesWithPackAttributeInPackage target. -->
     <BuildProjectReferences Condition="'$(NoBuild)' == 'true'">false</BuildProjectReferences>
   </PropertyGroup>
@@ -108,28 +106,6 @@
                                        ($(TargetFrameworks.Contains('$(NetFrameworkMinimum)')) or $(TargetFrameworks.Contains('net47')) or $(TargetFrameworks.Contains('net48')))" />
   </ItemGroup>
 
-  <!-- TODO: Remove this target when no library relies on the intellisense documentation file anymore.-->
-  <Target Name="ChangeDocumentationFileForPackaging"
-          AfterTargets="DocumentationProjectOutputGroup"
-          Condition="'$(UseIntellisenseDocumentationFile)' == 'true'">
-    <ItemGroup>
-      <DocumentationProjectOutputGroupOutput Remove="@(DocumentationProjectOutputGroupOutput)" />
-      <DocumentationProjectOutputGroupOutput Include="$(LibIntellisenseDocumentationFilePath)" />
-    </ItemGroup>
-  </Target>
-
-  <!-- <Target Name="CopyDocumentationFileToXmlDocDir"
-          AfterTargets="CoreCompile"
-          Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"
-          BeforeTargets="ChangeDocumentationFileForPackaging">
-
-    <Copy SourceFiles="@(DocumentationProjectOutputGroupOutput)"
-          DestinationFolder="$(XmlDocDir)"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="true" />
-
-  </Target> -->
-
   <!-- Add runtime specific file into the package if the tfm is RID specific. -->
   <Target Name="AddRuntimeSpecificFilesToPackage"
           DependsOnTargets="BuiltProjectOutputGroup;

From 33d63d896e3d35baa0561bbda776571bd1dfceed Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Mon, 9 Jan 2023 19:41:08 -0800
Subject: [PATCH 04/27] Set UseIntellisenseDocumentationFile to true for the 3
 assemblies that already have their source of truth in triple slash.

---
 .../System.Formats.Cbor/src/System.Formats.Cbor.csproj          | 2 +-
 .../src/System.IO.Compression.Brotli.csproj                     | 1 +
 .../System.Numerics.Vectors/src/System.Numerics.Vectors.csproj  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
index d9002cc07965f..389505e238c09 100644
--- a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
+++ b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
@@ -3,7 +3,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPackable>true</IsPackable>
-    <!-- <UseIntellisenseDocumentationFile>false</UseIntellisenseDocumentationFile> -->
+    <UseIntellisenseDocumentationFile>true</UseIntellisenseDocumentationFile>
     <PackageDescription>Provides classes that can read and write the CBOR data format.
 
 Commonly Used Types:
diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
index 6c884b2ee6d96..57519b4353fe1 100644
--- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
+++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)</TargetFrameworks>
+    <UseIntellisenseDocumentationFile>true</UseIntellisenseDocumentationFile>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
diff --git a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
index 8e784c9864ff8..474110e216f71 100644
--- a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
+++ b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <UseIntellisenseDocumentationFile>true</UseIntellisenseDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(CoreLibProject)" />

From 4cdf9268d5cbd4fd0bd06180f8d6240c9d9b6ebc Mon Sep 17 00:00:00 2001
From: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
Date: Thu, 19 Jan 2023 17:39:08 -0800
Subject: [PATCH 05/27] Delete docs.targets, move package download to
 Build.proj

---
 Build.proj               | 5 ++++-
 eng/restore/docs.targets | 7 -------
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 eng/restore/docs.targets

diff --git a/Build.proj b/Build.proj
index 5f47e869fb6e4..0ade4db20a37d 100644
--- a/Build.proj
+++ b/Build.proj
@@ -10,7 +10,10 @@
   <Import Project="$(RepositoryEngineeringDir)SubsetValidation.targets" />
 
   <!-- Upfront restore hooks -->
-  <Import Project="$(RepositoryEngineeringDir)restore\docs.targets" />
+  <ItemGroup>
+    <PackageDownload Include="Microsoft.Private.Intellisense" Version="[$(MicrosoftPrivateIntellisenseVersion)]" />
+  </ItemGroup>
+  
   <Import Project="$(RepositoryEngineeringDir)restore\optimizationData.targets" Condition="'$(DotNetBuildFromSource)' != 'true'" />
 
   <Target Name="BuildLocalTasks"
diff --git a/eng/restore/docs.targets b/eng/restore/docs.targets
deleted file mode 100644
index c04ba94cba1f8..0000000000000
--- a/eng/restore/docs.targets
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-
-  <ItemGroup>
-    <PackageDownload Include="Microsoft.Private.Intellisense" Version="[$(MicrosoftPrivateIntellisenseVersion)]" />
-  </ItemGroup>
-
-</Project>

From 4785850fc294e893415d7a97101f892378c2c421 Mon Sep 17 00:00:00 2001
From: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
Date: Thu, 19 Jan 2023 17:40:11 -0800
Subject: [PATCH 06/27] Consume $(XmlDocDir) in
 Microsoft.NetCore.App.Ref.sfxproj

---
 .../sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
index f1e52a78e99c1..61787ca6ca173 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
@@ -14,7 +14,7 @@
   <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild" BeforeTargets="GetFilesToPackage">
     <ItemGroup>
       <ReferencePath Include="@(LibrariesRefAssemblies)" />
-      <DocFilesToPackage Include="$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml" Condition="Exists('$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml')"/>
+      <DocFilesToPackage Include="$(XmlDocDir)/%(LibrariesRefAssemblies.FileName).xml" Condition="Exists('$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml')"/>
       <Analyzer Include="$(MicrosoftNetCoreAppRefPackDir)/analyzers/**/*.*" />
       <FilesToPackage Include="@(Analyzer)" ExcludeFromValidation="true" TargetPath="analyzers/%(RecursiveDir)" />
     </ItemGroup>

From 27ae4a66655cd2cb67399cc2aeef30a57c922852 Mon Sep 17 00:00:00 2001
From: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
Date: Thu, 19 Jan 2023 17:41:01 -0800
Subject: [PATCH 07/27] Change condition to import intellisense.targets: Use
 $(IsSourceProject) == true

---
 Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 4f68c36320d50..7d25657c2047a 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -12,7 +12,7 @@
   <Import Project="$(RepositoryEngineeringDir)generators.targets" />
   <Import Project="$(RepositoryEngineeringDir)python.targets" />
   <Import Project="$(RepositoryEngineeringDir)resolveContract.targets" Condition="'$(IsSourceProject)' == 'true'" />
-  <Import Project="$(RepositoryEngineeringDir)intellisense.targets" Condition="'$(MSBuildProjectExtension)' != '.pkgproj'" />
+  <Import Project="$(RepositoryEngineeringDir)intellisense.targets" Condition="'$(IsSourceProject)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)packaging.targets" Condition="'$(IsPackable)' == 'true' and '$(MSBuildProjectExtension)' != '.pkgproj'" />
 
   <!--

From d5cbf966ff44a38717977386f54395e9be2fb9b9 Mon Sep 17 00:00:00 2001
From: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
Date: Thu, 19 Jan 2023 17:45:41 -0800
Subject: [PATCH 08/27] Move XmlDocFileRoot to intellisense.targets, address
 suggestions for collecting xml file.

---
 Directory.Build.props    |  1 -
 eng/intellisense.targets | 23 ++++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 7797b54b9e548..3378021e12a91 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -105,7 +105,6 @@
     <IbcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))</IbcOptimizationDataDir>
     <MibcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'mibc'))</MibcOptimizationDataDir>
     <XmlDocDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs'))</XmlDocDir>
-    <XmlDocFileRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</XmlDocFileRoot>
     <DocsDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'docs'))</DocsDir>
     <ManPagesDir>$([MSBuild]::NormalizeDirectory('$(DocsDir)', 'manpages'))</ManPagesDir>
 
diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index 8627722532047..b1acfa571d243 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -1,21 +1,30 @@
 <Project>
 
   <PropertyGroup>
-      <!-- Search for the documentation file in the intellisense package and otherwise pick up the generated one. -->
-    <IntellisensePackageFolderName Condition="'$(IsPackable)' == '' or '$(IsPackable)' == 'false'">net</IntellisensePackageFolderName>
-    <IntellisensePackageFolderName Condition="'$(IsPackable)' == 'true'">dotnet-plat-ext</IntellisensePackageFolderName>
-    <LibIntellisenseDocumentationFilePath Condition="'$(UseIntellisenseDocumentationFile)' == 'true'">$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', '$(MSBuildProjectName)', '$(LibrariesConfiguration)', '$(NetCoreAppCurrent)', '$(MSBuildProjectName).xml'))</LibIntellisenseDocumentationFilePath>
-    <LibIntellisenseDocumentationFilePath Condition="'$(UseIntellisenseDocumentationFile)' == '' or '$(UseIntellisenseDocumentationFile)' == 'false'">$([MSBuild]::NormalizePath('$(XmlDocFileRoot)', '$(IntellisensePackageFolderName)', '1033', '$(AssemblyName).xml'))</LibIntellisenseDocumentationFilePath>
-    <UseIntellisenseDocumentationFile Condition="'$(UseIntellisenseDocumentationFile)' == '' and Exists('$(LibIntellisenseDocumentationFilePath)')">true</UseIntellisenseDocumentationFile>
+    <XmlDocFileRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</XmlDocFileRoot>
   </PropertyGroup>
 
+  <!-- If the project is not generating its own documentation yet, retrieve it from the dotnet-api-docs nuget package. -->
+  <Choose>
+    <When Condition="('$(UseIntellisenseDocumentationFile)' == '' or '$(UseIntellisenseDocumentationFile)' == 'false') and Exists($([MSBuild]::NormalizePath('$(XmlDocFileRoot)', 'net', '1033', '$(AssemblyName).xml')))">
+      <PropertyGroup>
+        <IntellisenseFilePath>$([MSBuild]::NormalizePath('$(XmlDocFileRoot)', 'net', '1033', '$(AssemblyName).xml')</IntellisenseFilePath>
+      </PropertyGroup>
+    </When>
+    <When Condition="('$(UseIntellisenseDocumentationFile)' == '' or '$(UseIntellisenseDocumentationFile)' == 'false') and Exists($([MSBuild]::NormalizePath('$(XmlDocFileRoot)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml')))">
+      <PropertyGroup>
+        <IntellisenseFilePath Condition="">$([MSBuild]::NormalizePath('$(XmlDocFileRoot)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml')</IntellisenseFilePath>
+      </PropertyGroup>
+    </When>
+  </Choose>
+
   <!-- TODO: Remove this target when no library relies on the intellisense documentation file anymore.-->
   <Target Name="ChangeDocumentationFileForPackaging"
           AfterTargets="DocumentationProjectOutputGroup"
           Condition="'$(UseIntellisenseDocumentationFile)' == 'true'">
     <ItemGroup>
       <DocumentationProjectOutputGroupOutput Remove="@(DocumentationProjectOutputGroupOutput)" />
-      <DocumentationProjectOutputGroupOutput Include="$(LibIntellisenseDocumentationFilePath)" />
+      <DocumentationProjectOutputGroupOutput Include="$(IntellisenseFilePath)" />
     </ItemGroup>
   </Target>
 

From 15ff2cde75656e743e0fc1847b035bc9635acc20 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Fri, 20 Jan 2023 14:31:37 -0800
Subject: [PATCH 09/27] Expand condition of CopyDocumentationFileToXmlDocDir to
 also check if IsNetCoreAppSrc == true.

---
 eng/intellisense.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index b1acfa571d243..22e970ffff179 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -30,7 +30,7 @@
 
   <Target Name="CopyDocumentationFileToXmlDocDir"
           AfterTargets="CoreCompile"
-          Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'"
+          Condition="'$(IsNetCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'"
           DependsOnTargets="ChangeDocumentationFileForPackaging">
     <Copy SourceFiles="@(DocumentationProjectOutputGroupOutput)"
           DestinationFolder="$(XmlDocDir)"

From 4d3633db72593ae8f8244b0579afa014b71f0f97 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Fri, 20 Jan 2023 14:32:17 -0800
Subject: [PATCH 10/27] Change AfterTargets of CopyDocumentationFileToXmlDocDir
 from CoreCompile to CopyFilesToOutputDirectory

---
 eng/intellisense.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index 22e970ffff179..098cf9f64962e 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -29,7 +29,7 @@
   </Target>
 
   <Target Name="CopyDocumentationFileToXmlDocDir"
-          AfterTargets="CoreCompile"
+          AfterTargets="CopyFilesToOutputDirectory"
           Condition="'$(IsNetCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'"
           DependsOnTargets="ChangeDocumentationFileForPackaging">
     <Copy SourceFiles="@(DocumentationProjectOutputGroupOutput)"

From 74a4b4ed36782924aa18e17a2040beb392895929 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Thu, 26 Jan 2023 11:37:56 -0800
Subject: [PATCH 11/27] Move PackageDownload to intellisense.targets

---
 Build.proj               | 6 ------
 eng/intellisense.targets | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Build.proj b/Build.proj
index 0ade4db20a37d..baa240685ae5d 100644
--- a/Build.proj
+++ b/Build.proj
@@ -8,12 +8,6 @@
   </ItemGroup>
 
   <Import Project="$(RepositoryEngineeringDir)SubsetValidation.targets" />
-
-  <!-- Upfront restore hooks -->
-  <ItemGroup>
-    <PackageDownload Include="Microsoft.Private.Intellisense" Version="[$(MicrosoftPrivateIntellisenseVersion)]" />
-  </ItemGroup>
-  
   <Import Project="$(RepositoryEngineeringDir)restore\optimizationData.targets" Condition="'$(DotNetBuildFromSource)' != 'true'" />
 
   <Target Name="BuildLocalTasks"
diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index 098cf9f64962e..ac37837ee5899 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -18,6 +18,10 @@
     </When>
   </Choose>
 
+  <ItemGroup>
+    <PackageDownload Include="Microsoft.Private.Intellisense" Version="[$(MicrosoftPrivateIntellisenseVersion)]" />
+  </ItemGroup>
+
   <!-- TODO: Remove this target when no library relies on the intellisense documentation file anymore.-->
   <Target Name="ChangeDocumentationFileForPackaging"
           AfterTargets="DocumentationProjectOutputGroup"

From 19249f5b3632e4b71c1c150292cee3880dcad5ee Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Thu, 26 Jan 2023 14:55:48 -0800
Subject: [PATCH 12/27] Remove Choose+When. Readjust properties for
 Private.Intellisense files/folders. Fix conditions for doc file swap.

---
 eng/intellisense.targets | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index ac37837ee5899..405924387589b 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -1,40 +1,32 @@
 <Project>
 
   <PropertyGroup>
-    <XmlDocFileRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</XmlDocFileRoot>
+    <XmlDocPrivateIntellisenseRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</XmlDocPrivateIntellisenseRoot>
+    <XmlDocPrivateIntellisenseFileFromNetFolder>$([MSBuild]::NormalizePath('$(XmlDocPrivateIntellisenseRoot)', 'net', '1033', '$(AssemblyName).xml'))</XmlDocPrivateIntellisenseFileFromNetFolder>
+    <XmlDocPrivateIntellisenseFileFromDotNetPlatExtFolder>$([MSBuild]::NormalizePath('$(XmlDocPrivateIntellisenseRoot)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml'))</XmlDocPrivateIntellisenseFileFromDotNetPlatExtFolder>
+    <XmlDocPrivateIntellisenseFileFolder Condition="'$(UseIntellisenseDocumentationFile)' != 'true' and Exists($(XmlDocPrivateIntellisenseFileFromNetFolder))">net</XmlDocPrivateIntellisenseFileFolder>
+    <XmlDocPrivateIntellisenseFileFolder Condition="'$(UseIntellisenseDocumentationFile)' != 'true' and Exists($(XmlDocPrivateIntellisenseFileFromDotNetPlatExtFolder))">dotnet-plat-ext</XmlDocPrivateIntellisenseFileFolder>
+    <XmlDocPrivateIntellisenseFilePath Condition="'$(UseIntellisenseDocumentationFile)' != 'true'">$([MSBuild]::NormalizePath('$(XmlDocPrivateIntellisenseRoot)', '$(XmlDocPrivateIntellisenseFileFolder)', '1033', '$(AssemblyName).xml'))</XmlDocPrivateIntellisenseFilePath>
   </PropertyGroup>
 
-  <!-- If the project is not generating its own documentation yet, retrieve it from the dotnet-api-docs nuget package. -->
-  <Choose>
-    <When Condition="('$(UseIntellisenseDocumentationFile)' == '' or '$(UseIntellisenseDocumentationFile)' == 'false') and Exists($([MSBuild]::NormalizePath('$(XmlDocFileRoot)', 'net', '1033', '$(AssemblyName).xml')))">
-      <PropertyGroup>
-        <IntellisenseFilePath>$([MSBuild]::NormalizePath('$(XmlDocFileRoot)', 'net', '1033', '$(AssemblyName).xml')</IntellisenseFilePath>
-      </PropertyGroup>
-    </When>
-    <When Condition="('$(UseIntellisenseDocumentationFile)' == '' or '$(UseIntellisenseDocumentationFile)' == 'false') and Exists($([MSBuild]::NormalizePath('$(XmlDocFileRoot)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml')))">
-      <PropertyGroup>
-        <IntellisenseFilePath Condition="">$([MSBuild]::NormalizePath('$(XmlDocFileRoot)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml')</IntellisenseFilePath>
-      </PropertyGroup>
-    </When>
-  </Choose>
-
   <ItemGroup>
     <PackageDownload Include="Microsoft.Private.Intellisense" Version="[$(MicrosoftPrivateIntellisenseVersion)]" />
   </ItemGroup>
 
   <!-- TODO: Remove this target when no library relies on the intellisense documentation file anymore.-->
+  <!-- This replaces the default xml file generated in the obj folder with the one that comes from the docs feed. -->
   <Target Name="ChangeDocumentationFileForPackaging"
           AfterTargets="DocumentationProjectOutputGroup"
-          Condition="'$(UseIntellisenseDocumentationFile)' == 'true'">
+          Condition="'$(UseIntellisenseDocumentationFile)' != 'true'">
     <ItemGroup>
       <DocumentationProjectOutputGroupOutput Remove="@(DocumentationProjectOutputGroupOutput)" />
-      <DocumentationProjectOutputGroupOutput Include="$(IntellisenseFilePath)" />
+      <DocumentationProjectOutputGroupOutput Include="$(XmlDocPrivateIntellisenseFilePath)" />
     </ItemGroup>
   </Target>
 
   <Target Name="CopyDocumentationFileToXmlDocDir"
           AfterTargets="CopyFilesToOutputDirectory"
-          Condition="'$(IsNetCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'"
+          Condition="'$(UseIntellisenseDocumentationFile)' != 'true' and '$(IsNetCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'"
           DependsOnTargets="ChangeDocumentationFileForPackaging">
     <Copy SourceFiles="@(DocumentationProjectOutputGroupOutput)"
           DestinationFolder="$(XmlDocDir)"

From 83773b73a23b07fb7d09b0c86b567d84de5fb5cd Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Thu, 26 Jan 2023 17:04:54 -0800
Subject: [PATCH 13/27] Rename csproj property to something more clear.

---
 eng/intellisense.targets                      | 23 +++++++++----------
 .../src/System.Formats.Cbor.csproj            |  2 +-
 .../src/System.IO.Compression.Brotli.csproj   |  2 +-
 .../src/System.Numerics.Vectors.csproj        |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index 405924387589b..12ac63d72f661 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -1,12 +1,11 @@
 <Project>
 
   <PropertyGroup>
-    <XmlDocPrivateIntellisenseRoot>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</XmlDocPrivateIntellisenseRoot>
-    <XmlDocPrivateIntellisenseFileFromNetFolder>$([MSBuild]::NormalizePath('$(XmlDocPrivateIntellisenseRoot)', 'net', '1033', '$(AssemblyName).xml'))</XmlDocPrivateIntellisenseFileFromNetFolder>
-    <XmlDocPrivateIntellisenseFileFromDotNetPlatExtFolder>$([MSBuild]::NormalizePath('$(XmlDocPrivateIntellisenseRoot)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml'))</XmlDocPrivateIntellisenseFileFromDotNetPlatExtFolder>
-    <XmlDocPrivateIntellisenseFileFolder Condition="'$(UseIntellisenseDocumentationFile)' != 'true' and Exists($(XmlDocPrivateIntellisenseFileFromNetFolder))">net</XmlDocPrivateIntellisenseFileFolder>
-    <XmlDocPrivateIntellisenseFileFolder Condition="'$(UseIntellisenseDocumentationFile)' != 'true' and Exists($(XmlDocPrivateIntellisenseFileFromDotNetPlatExtFolder))">dotnet-plat-ext</XmlDocPrivateIntellisenseFileFolder>
-    <XmlDocPrivateIntellisenseFilePath Condition="'$(UseIntellisenseDocumentationFile)' != 'true'">$([MSBuild]::NormalizePath('$(XmlDocPrivateIntellisenseRoot)', '$(XmlDocPrivateIntellisenseFileFolder)', '1033', '$(AssemblyName).xml'))</XmlDocPrivateIntellisenseFilePath>
+    <IntellisensePackageXmlRootFolder>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</IntellisensePackageXmlRootFolder>
+    <IntellisensePackageXmlFileFromNetFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromNetFolder>
+    <IntellisensePackageXmlFileFromDotNetPlatExtFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromDotNetPlatExtFolder>
+    <IntellisensePackageXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' != 'true' and Exists($(IntellisensePackageXmlFileFromNetFolder))">$(IntellisensePackageXmlFileFromNetFolder)</IntellisensePackageXmlFile>
+    <IntellisensePackageXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' != 'true' and Exists($(IntellisensePackageXmlFileFromDotNetPlatExtFolder))">$(IntellisensePackageXmlFileFromDotNetPlatExtFolder)</IntellisensePackageXmlFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,21 +13,21 @@
   </ItemGroup>
 
   <!-- TODO: Remove this target when no library relies on the intellisense documentation file anymore.-->
-  <!-- This replaces the default xml file generated in the obj folder with the one that comes from the docs feed. -->
+  <!-- Replace the default xml file generated in the obj folder with the one that comes from the docs feed. -->
   <Target Name="ChangeDocumentationFileForPackaging"
           AfterTargets="DocumentationProjectOutputGroup"
-          Condition="'$(UseIntellisenseDocumentationFile)' != 'true'">
+          Condition="'$(UseIntellisensePackageDocXmlFile)' != 'true'">
     <ItemGroup>
-      <DocumentationProjectOutputGroupOutput Remove="@(DocumentationProjectOutputGroupOutput)" />
-      <DocumentationProjectOutputGroupOutput Include="$(XmlDocPrivateIntellisenseFilePath)" />
+      <DocFileItem Remove="@(DocFileItem)" />
+      <DocFileItem Include="$(IntellisensePackageXmlFile)" />
     </ItemGroup>
   </Target>
 
   <Target Name="CopyDocumentationFileToXmlDocDir"
           AfterTargets="CopyFilesToOutputDirectory"
-          Condition="'$(UseIntellisenseDocumentationFile)' != 'true' and '$(IsNetCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'"
+          Condition="'$(UseIntellisensePackageDocXmlFile)' != 'true' and '$(IsNetCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'"
           DependsOnTargets="ChangeDocumentationFileForPackaging">
-    <Copy SourceFiles="@(DocumentationProjectOutputGroupOutput)"
+    <Copy SourceFiles="@(DocFileItem)"
           DestinationFolder="$(XmlDocDir)"
           SkipUnchangedFiles="true"
           UseHardlinksIfPossible="true" />
diff --git a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
index 389505e238c09..1dd4257798df2 100644
--- a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
+++ b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
@@ -3,7 +3,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPackable>true</IsPackable>
-    <UseIntellisenseDocumentationFile>true</UseIntellisenseDocumentationFile>
+    <UseIntellisensePackageDocXmlFile>true</UseIntellisensePackageDocXmlFile>
     <PackageDescription>Provides classes that can read and write the CBOR data format.
 
 Commonly Used Types:
diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
index 57519b4353fe1..acd0bc6114f37 100644
--- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
+++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)</TargetFrameworks>
-    <UseIntellisenseDocumentationFile>true</UseIntellisenseDocumentationFile>
+    <UseIntellisensePackageDocXmlFile>true</UseIntellisensePackageDocXmlFile>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
diff --git a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
index 474110e216f71..180e7f027540b 100644
--- a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
+++ b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-    <UseIntellisenseDocumentationFile>true</UseIntellisenseDocumentationFile>
+    <UseIntellisensePackageDocXmlFile>true</UseIntellisensePackageDocXmlFile>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(CoreLibProject)" />

From ba8ac9ad0513f1611e212729321619a7d73fb55e Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Thu, 26 Jan 2023 17:14:04 -0800
Subject: [PATCH 14/27] Default csproj property to true.

---
 eng/intellisense.targets                                 | 9 +++++----
 .../System.Formats.Cbor/src/System.Formats.Cbor.csproj   | 2 +-
 .../src/System.IO.Compression.Brotli.csproj              | 2 +-
 .../src/System.Numerics.Vectors.csproj                   | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index 12ac63d72f661..c3e179c5eeeed 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -1,11 +1,12 @@
 <Project>
 
   <PropertyGroup>
+    <UseIntellisensePackageDocXmlFile>true</UseIntellisensePackageDocXmlFile>
     <IntellisensePackageXmlRootFolder>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</IntellisensePackageXmlRootFolder>
     <IntellisensePackageXmlFileFromNetFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromNetFolder>
     <IntellisensePackageXmlFileFromDotNetPlatExtFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromDotNetPlatExtFolder>
-    <IntellisensePackageXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' != 'true' and Exists($(IntellisensePackageXmlFileFromNetFolder))">$(IntellisensePackageXmlFileFromNetFolder)</IntellisensePackageXmlFile>
-    <IntellisensePackageXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' != 'true' and Exists($(IntellisensePackageXmlFileFromDotNetPlatExtFolder))">$(IntellisensePackageXmlFileFromDotNetPlatExtFolder)</IntellisensePackageXmlFile>
+    <IntellisensePackageXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true' and Exists($(IntellisensePackageXmlFileFromNetFolder))">$(IntellisensePackageXmlFileFromNetFolder)</IntellisensePackageXmlFile>
+    <IntellisensePackageXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true' and Exists($(IntellisensePackageXmlFileFromDotNetPlatExtFolder))">$(IntellisensePackageXmlFileFromDotNetPlatExtFolder)</IntellisensePackageXmlFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,7 +17,7 @@
   <!-- Replace the default xml file generated in the obj folder with the one that comes from the docs feed. -->
   <Target Name="ChangeDocumentationFileForPackaging"
           AfterTargets="DocumentationProjectOutputGroup"
-          Condition="'$(UseIntellisensePackageDocXmlFile)' != 'true'">
+          Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true'">
     <ItemGroup>
       <DocFileItem Remove="@(DocFileItem)" />
       <DocFileItem Include="$(IntellisensePackageXmlFile)" />
@@ -25,7 +26,7 @@
 
   <Target Name="CopyDocumentationFileToXmlDocDir"
           AfterTargets="CopyFilesToOutputDirectory"
-          Condition="'$(UseIntellisensePackageDocXmlFile)' != 'true' and '$(IsNetCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'"
+          Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true' and '$(IsNetCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'"
           DependsOnTargets="ChangeDocumentationFileForPackaging">
     <Copy SourceFiles="@(DocFileItem)"
           DestinationFolder="$(XmlDocDir)"
diff --git a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
index 1dd4257798df2..2e43a07a64d86 100644
--- a/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
+++ b/src/libraries/System.Formats.Cbor/src/System.Formats.Cbor.csproj
@@ -3,7 +3,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPackable>true</IsPackable>
-    <UseIntellisensePackageDocXmlFile>true</UseIntellisensePackageDocXmlFile>
+    <UseIntellisensePackageDocXmlFile>false</UseIntellisensePackageDocXmlFile>
     <PackageDescription>Provides classes that can read and write the CBOR data format.
 
 Commonly Used Types:
diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
index acd0bc6114f37..71243ea7f46d2 100644
--- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
+++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)</TargetFrameworks>
-    <UseIntellisensePackageDocXmlFile>true</UseIntellisensePackageDocXmlFile>
+    <UseIntellisensePackageDocXmlFile>false</UseIntellisensePackageDocXmlFile>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
diff --git a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
index 180e7f027540b..60deaa36692cd 100644
--- a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
+++ b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-    <UseIntellisensePackageDocXmlFile>true</UseIntellisensePackageDocXmlFile>
+    <UseIntellisensePackageDocXmlFile>false</UseIntellisensePackageDocXmlFile>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(CoreLibProject)" />

From 8c39ea95fcdfbf0ca2c7ea7abd13c5394b72dea6 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Thu, 26 Jan 2023 17:44:40 -0800
Subject: [PATCH 15/27] Missed adding the "not previously set" condition for
 UseIntellisensePackageDocXmlFile in intellisense.targets.

---
 eng/intellisense.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index c3e179c5eeeed..99605f66c4cb6 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <UseIntellisensePackageDocXmlFile>true</UseIntellisensePackageDocXmlFile>
+    <UseIntellisensePackageDocXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' == ''">true</UseIntellisensePackageDocXmlFile>
     <IntellisensePackageXmlRootFolder>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</IntellisensePackageXmlRootFolder>
     <IntellisensePackageXmlFileFromNetFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromNetFolder>
     <IntellisensePackageXmlFileFromDotNetPlatExtFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromDotNetPlatExtFolder>

From 61979453dde8198a30a4172331421cf1e8bc553e Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Thu, 26 Jan 2023 17:57:40 -0800
Subject: [PATCH 16/27] Remove incorrect condition in
 CopyDocumentationFileToXmlDocDir.

---
 eng/intellisense.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index 99605f66c4cb6..1021fe4186a7f 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -26,7 +26,7 @@
 
   <Target Name="CopyDocumentationFileToXmlDocDir"
           AfterTargets="CopyFilesToOutputDirectory"
-          Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true' and '$(IsNetCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'"
+          Condition="'$(IsNetCoreAppSrc)' == 'true' and '$(TargetFramework)' == '$(NetCoreAppCurrent)'"
           DependsOnTargets="ChangeDocumentationFileForPackaging">
     <Copy SourceFiles="@(DocFileItem)"
           DestinationFolder="$(XmlDocDir)"

From 4d94daa1ec354fc6ba843fffa697b7f084db30d2 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Fri, 27 Jan 2023 09:13:35 -0800
Subject: [PATCH 17/27] Missed property reuse in Condition in sfxproj

---
 .../sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
index 61787ca6ca173..8b571956c5674 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
@@ -14,7 +14,7 @@
   <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild" BeforeTargets="GetFilesToPackage">
     <ItemGroup>
       <ReferencePath Include="@(LibrariesRefAssemblies)" />
-      <DocFilesToPackage Include="$(XmlDocDir)/%(LibrariesRefAssemblies.FileName).xml" Condition="Exists('$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml')"/>
+      <DocFilesToPackage Include="$(XmlDocDir)/%(LibrariesRefAssemblies.FileName).xml" Condition="Exists('$(XmlDocDir)/%(LibrariesRefAssemblies.FileName).xml')"/>
       <Analyzer Include="$(MicrosoftNetCoreAppRefPackDir)/analyzers/**/*.*" />
       <FilesToPackage Include="@(Analyzer)" ExcludeFromValidation="true" TargetPath="analyzers/%(RecursiveDir)" />
     </ItemGroup>

From 80d0d0da92d966745a349a737f38cff7804feb8a Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Fri, 27 Jan 2023 09:14:10 -0800
Subject: [PATCH 18/27] Only evaluate second IntellisensePackageXmlFile if the
 first one did not acquire any value.

---
 eng/intellisense.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index 1021fe4186a7f..000f7c7617f96 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -6,7 +6,7 @@
     <IntellisensePackageXmlFileFromNetFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromNetFolder>
     <IntellisensePackageXmlFileFromDotNetPlatExtFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromDotNetPlatExtFolder>
     <IntellisensePackageXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true' and Exists($(IntellisensePackageXmlFileFromNetFolder))">$(IntellisensePackageXmlFileFromNetFolder)</IntellisensePackageXmlFile>
-    <IntellisensePackageXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true' and Exists($(IntellisensePackageXmlFileFromDotNetPlatExtFolder))">$(IntellisensePackageXmlFileFromDotNetPlatExtFolder)</IntellisensePackageXmlFile>
+    <IntellisensePackageXmlFile Condition="'$(IntellisensePackageXmlFile)' == '' and '$(UseIntellisensePackageDocXmlFile)' == 'true' and Exists($(IntellisensePackageXmlFileFromDotNetPlatExtFolder))">$(IntellisensePackageXmlFileFromDotNetPlatExtFolder)</IntellisensePackageXmlFile>
   </PropertyGroup>
 
   <ItemGroup>

From d2a60f9a7802f4ff47a1f0eab3361ed923490818 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Fri, 27 Jan 2023 09:19:48 -0800
Subject: [PATCH 19/27] Move intellisense.targets import from root to
 libraries, right after the IsNetCoreAppSrc property is declared so we can use
 it.

---
 Directory.Build.targets               | 1 -
 src/libraries/Directory.Build.targets | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 7d25657c2047a..5f92d5d4685e8 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -12,7 +12,6 @@
   <Import Project="$(RepositoryEngineeringDir)generators.targets" />
   <Import Project="$(RepositoryEngineeringDir)python.targets" />
   <Import Project="$(RepositoryEngineeringDir)resolveContract.targets" Condition="'$(IsSourceProject)' == 'true'" />
-  <Import Project="$(RepositoryEngineeringDir)intellisense.targets" Condition="'$(IsSourceProject)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)packaging.targets" Condition="'$(IsPackable)' == 'true' and '$(MSBuildProjectExtension)' != '.pkgproj'" />
 
   <!--
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 75732bff0f717..1166d3133f38c 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -77,6 +77,7 @@
   </PropertyGroup>
 
   <Import Project="$(RepositoryEngineeringDir)versioning.targets" />
+  <Import Project="$(RepositoryEngineeringDir)intellisense.targets" Condition="'$(IsSourceProject)' == 'true'" />
 
   <!-- Libraries-specific binplacing properties -->
   <PropertyGroup>

From f4ce3cb22d8736239686ab19a2bb1dacbe428bb9 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Fri, 27 Jan 2023 09:35:31 -0800
Subject: [PATCH 20/27] Enable CS1591, skip arcade warning

---
 eng/Versions.props       | 1 +
 eng/intellisense.targets | 1 +
 2 files changed, 2 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index 382a810e71286..a658967ee949b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,6 +23,7 @@
     <UsingToolXliff>false</UsingToolXliff>
     <LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
     <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
+    <SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
   </PropertyGroup>
   <ItemGroup>
     <WorkloadSdkBandVersions Include="$(SdkBandVersion)" SupportsMachineArch="true" />
diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index 000f7c7617f96..eb84f99278f15 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <UseIntellisensePackageDocXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' == ''">true</UseIntellisensePackageDocXmlFile>
+    <NoWarn Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true'">$(NoWarn);1591</NoWarn>
     <IntellisensePackageXmlRootFolder>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</IntellisensePackageXmlRootFolder>
     <IntellisensePackageXmlFileFromNetFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromNetFolder>
     <IntellisensePackageXmlFileFromDotNetPlatExtFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromDotNetPlatExtFolder>

From 2c7048e39e02b36bf787350c0f8bc2c78a29ed87 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Fri, 27 Jan 2023 10:27:15 -0800
Subject: [PATCH 21/27] Move SkipArcadeNoWarnCS1591 to
 src/libraries/Directory.Build.props to avoid coreclr failures

---
 eng/Versions.props                  | 1 -
 src/libraries/Directory.Build.props | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index a658967ee949b..382a810e71286 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,7 +23,6 @@
     <UsingToolXliff>false</UsingToolXliff>
     <LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
     <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
-    <SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
   </PropertyGroup>
   <ItemGroup>
     <WorkloadSdkBandVersions Include="$(SdkBandVersion)" SupportsMachineArch="true" />
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index d17a577688e15..96875aaa8f024 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -30,6 +30,10 @@
     <EnableDefaultItems>false</EnableDefaultItems>
     <!-- Libraries packages use the incremental servicing infrastructure. -->
     <PackageUseIncrementalServicingVersion>true</PackageUseIncrementalServicingVersion>
+    <!-- Enabling this rule will cause build failures on undocumented public APIs.
+         We cannot add it in eng/Versions.props because src/coreclr does not have access to UseIntellisensePackageDocXmlFile, which ensures
+         we only enable it in specific projects. so to avoid duplicating this property in coreclr, we can first scope it to src/libraries. -->
+    <SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
   </PropertyGroup>
 
   <!-- Language configuration -->

From 459ce39d70db13d2aacb3a48bf278df2833a93e3 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Fri, 27 Jan 2023 12:08:53 -0800
Subject: [PATCH 22/27] Remove unnecessary slashes in sfxproj

---
 .../sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
index 8b571956c5674..5efeb4c15690e 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
@@ -14,7 +14,7 @@
   <Target Name="AddFrameworkFilesToPackage" DependsOnTargets="ResolveLibrariesFromLocalBuild" BeforeTargets="GetFilesToPackage">
     <ItemGroup>
       <ReferencePath Include="@(LibrariesRefAssemblies)" />
-      <DocFilesToPackage Include="$(XmlDocDir)/%(LibrariesRefAssemblies.FileName).xml" Condition="Exists('$(XmlDocDir)/%(LibrariesRefAssemblies.FileName).xml')"/>
+      <DocFilesToPackage Include="$(XmlDocDir)%(LibrariesRefAssemblies.FileName).xml" Condition="Exists('$(XmlDocDir)%(LibrariesRefAssemblies.FileName).xml')"/>
       <Analyzer Include="$(MicrosoftNetCoreAppRefPackDir)/analyzers/**/*.*" />
       <FilesToPackage Include="@(Analyzer)" ExcludeFromValidation="true" TargetPath="analyzers/%(RecursiveDir)" />
     </ItemGroup>

From 2d70d61c34b702591eb859609bd2a4777b7ef03f Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Fri, 27 Jan 2023 12:09:52 -0800
Subject: [PATCH 23/27] Move SkipArcadeNoWarn up to the top of
 src/libraries/Directory.Build.props to ensure it gets loaded before importing
 arcade.

---
 src/libraries/Directory.Build.props | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 96875aaa8f024..0b38402028533 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -2,6 +2,11 @@
   <PropertyGroup>
     <SkipInferTargetOSName>true</SkipInferTargetOSName>
     <DisableArcadeTestFramework>true</DisableArcadeTestFramework>
+    <!-- Enabling this rule will cause build failures on undocumented public APIs.
+         We cannot add it in eng/Versions.props because src/coreclr does not have access to UseIntellisensePackageDocXmlFile, which ensures
+         we only enable it in specific projects. so to avoid duplicating this property in coreclr, we can first scope it to src/libraries.
+         This property needs to be declared before the ..\..\Directory.Build.props import. -->
+    <SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
   </PropertyGroup>
 
   <Import Project="..\..\Directory.Build.props" />
@@ -30,10 +35,6 @@
     <EnableDefaultItems>false</EnableDefaultItems>
     <!-- Libraries packages use the incremental servicing infrastructure. -->
     <PackageUseIncrementalServicingVersion>true</PackageUseIncrementalServicingVersion>
-    <!-- Enabling this rule will cause build failures on undocumented public APIs.
-         We cannot add it in eng/Versions.props because src/coreclr does not have access to UseIntellisensePackageDocXmlFile, which ensures
-         we only enable it in specific projects. so to avoid duplicating this property in coreclr, we can first scope it to src/libraries. -->
-    <SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
   </PropertyGroup>
 
   <!-- Language configuration -->

From c689a050202d881f3ef221e1a0e4d9635071ab4e Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Tue, 31 Jan 2023 13:44:58 -0800
Subject: [PATCH 24/27] Revert Brotli and Vectors csproj changes. Those
 assemblies are either a partial facade or use PNSE.

---
 .../src/System.IO.Compression.Brotli.csproj                      | 1 -
 .../System.Numerics.Vectors/src/System.Numerics.Vectors.csproj   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
index 71243ea7f46d2..6c884b2ee6d96 100644
--- a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
+++ b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)</TargetFrameworks>
-    <UseIntellisensePackageDocXmlFile>false</UseIntellisensePackageDocXmlFile>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
diff --git a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
index 60deaa36692cd..8e784c9864ff8 100644
--- a/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
+++ b/src/libraries/System.Numerics.Vectors/src/System.Numerics.Vectors.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-    <UseIntellisensePackageDocXmlFile>false</UseIntellisensePackageDocXmlFile>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(CoreLibProject)" />

From 4d3e55008e2fd511bf0d307ab8fa16d4f3300e44 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Tue, 31 Jan 2023 13:45:46 -0800
Subject: [PATCH 25/27] Add target to intellisense.targets that runs as
 InitialTarget of the current project, and throws errors if the
 UseIntellisensePackageDocXmlFile is set to false and the assembly is either a
 partial facade or uses PNSE.

---
 eng/intellisense.targets | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index eb84f99278f15..dff12ded2059d 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -1,4 +1,4 @@
-<Project>
+<Project InitialTargets="VerifyAssemblySupportsDocsXmlGeneration">
 
   <PropertyGroup>
     <UseIntellisensePackageDocXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' == ''">true</UseIntellisensePackageDocXmlFile>
@@ -10,6 +10,11 @@
     <IntellisensePackageXmlFile Condition="'$(IntellisensePackageXmlFile)' == '' and '$(UseIntellisensePackageDocXmlFile)' == 'true' and Exists($(IntellisensePackageXmlFileFromDotNetPlatExtFolder))">$(IntellisensePackageXmlFileFromDotNetPlatExtFolder)</IntellisensePackageXmlFile>
   </PropertyGroup>
 
+  <Target Name="VerifyAssemblySupportsDocsXmlGeneration">
+    <Error Condition="'$(UseIntellisensePackageDocXmlFile)' == 'false' and '$(IsPartialFacadeAssembly)' == 'true'" Text="Cannot currently generate full xml documentation for an assembly that is a partial facade." />
+    <Error Condition="'$(UseIntellisensePackageDocXmlFile)' == 'false' and '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''" Text="Cannot currently generate full xml documentation for an assembly that generates PNSE." />
+  </Target>
+
   <ItemGroup>
     <PackageDownload Include="Microsoft.Private.Intellisense" Version="[$(MicrosoftPrivateIntellisenseVersion)]" />
   </ItemGroup>

From 981d201a8d8a63cde5002ea5742b9472acbf8b8c Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Tue, 31 Jan 2023 16:40:20 -0800
Subject: [PATCH 26/27] Improve error message: Mention the problematic property
 and the offending assembly.

---
 eng/intellisense.targets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index dff12ded2059d..e69da905b25ab 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -11,8 +11,12 @@
   </PropertyGroup>
 
   <Target Name="VerifyAssemblySupportsDocsXmlGeneration">
-    <Error Condition="'$(UseIntellisensePackageDocXmlFile)' == 'false' and '$(IsPartialFacadeAssembly)' == 'true'" Text="Cannot currently generate full xml documentation for an assembly that is a partial facade." />
-    <Error Condition="'$(UseIntellisensePackageDocXmlFile)' == 'false' and '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''" Text="Cannot currently generate full xml documentation for an assembly that generates PNSE." />
+    <Error
+      Condition="'$(UseIntellisensePackageDocXmlFile)' == 'false' and '$(IsPartialFacadeAssembly)' == 'true'"
+      Text="The 'UseIntellisensePackageDocXmlFile' property is not supported for partial facade assemblies: $(AssemblyName)" />
+    <Error
+      Condition="'$(UseIntellisensePackageDocXmlFile)' == 'false' and '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''"
+      Text="The 'UseIntellisensePackageDocXmlFile' property is not supported for assemblies that throw PlatformNotSupportedException: $(AssemblyName)" />
   </Target>
 
   <ItemGroup>

From dc8ef9ad8e397c01444f1fd539dd0f0e3ca6835f Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Wed, 1 Feb 2023 12:14:24 -0800
Subject: [PATCH 27/27] Added extra condition to verification target to only
 run when UseIntellisense... is not set to true. Also moved the initial
 definition to its own solitary property group right before the verification
 target runs.

Rename the properties that acquire the value of a file path to "FilePath" instead of just "File", for clarity.
---
 eng/intellisense.targets | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index e69da905b25ab..f00dab6e5fc30 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -2,23 +2,27 @@
 
   <PropertyGroup>
     <UseIntellisensePackageDocXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' == ''">true</UseIntellisensePackageDocXmlFile>
-    <NoWarn Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true'">$(NoWarn);1591</NoWarn>
-    <IntellisensePackageXmlRootFolder>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</IntellisensePackageXmlRootFolder>
-    <IntellisensePackageXmlFileFromNetFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromNetFolder>
-    <IntellisensePackageXmlFileFromDotNetPlatExtFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFileFromDotNetPlatExtFolder>
-    <IntellisensePackageXmlFile Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true' and Exists($(IntellisensePackageXmlFileFromNetFolder))">$(IntellisensePackageXmlFileFromNetFolder)</IntellisensePackageXmlFile>
-    <IntellisensePackageXmlFile Condition="'$(IntellisensePackageXmlFile)' == '' and '$(UseIntellisensePackageDocXmlFile)' == 'true' and Exists($(IntellisensePackageXmlFileFromDotNetPlatExtFolder))">$(IntellisensePackageXmlFileFromDotNetPlatExtFolder)</IntellisensePackageXmlFile>
   </PropertyGroup>
 
-  <Target Name="VerifyAssemblySupportsDocsXmlGeneration">
+  <Target Name="VerifyAssemblySupportsDocsXmlGeneration"
+    Condition="'$(UseIntellisensePackageDocXmlFile)' != 'true'">
     <Error
-      Condition="'$(UseIntellisensePackageDocXmlFile)' == 'false' and '$(IsPartialFacadeAssembly)' == 'true'"
+      Condition="'$(IsPartialFacadeAssembly)' == 'true'"
       Text="The 'UseIntellisensePackageDocXmlFile' property is not supported for partial facade assemblies: $(AssemblyName)" />
     <Error
-      Condition="'$(UseIntellisensePackageDocXmlFile)' == 'false' and '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''"
+      Condition="'$(GeneratePlatformNotSupportedAssemblyMessage)' != ''"
       Text="The 'UseIntellisensePackageDocXmlFile' property is not supported for assemblies that throw PlatformNotSupportedException: $(AssemblyName)" />
   </Target>
 
+  <PropertyGroup>
+    <NoWarn Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true'">$(NoWarn);1591</NoWarn>
+    <IntellisensePackageXmlRootFolder>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.private.intellisense', '$(MicrosoftPrivateIntellisenseVersion)', 'IntellisenseFiles'))</IntellisensePackageXmlRootFolder>
+    <IntellisensePackageXmlFilePathFromNetFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'net', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFilePathFromNetFolder>
+    <IntellisensePackageXmlFilePathFromDotNetPlatExtFolder>$([MSBuild]::NormalizePath('$(IntellisensePackageXmlRootFolder)', 'dotnet-plat-ext', '1033', '$(AssemblyName).xml'))</IntellisensePackageXmlFilePathFromDotNetPlatExtFolder>
+    <IntellisensePackageXmlFilePath Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true' and Exists($(IntellisensePackageXmlFilePathFromNetFolder))">$(IntellisensePackageXmlFilePathFromNetFolder)</IntellisensePackageXmlFilePath>
+    <IntellisensePackageXmlFilePath Condition="'$(IntellisensePackageXmlFilePath)' == '' and '$(UseIntellisensePackageDocXmlFile)' == 'true' and Exists($(IntellisensePackageXmlFilePathFromDotNetPlatExtFolder))">$(IntellisensePackageXmlFilePathFromDotNetPlatExtFolder)</IntellisensePackageXmlFilePath>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageDownload Include="Microsoft.Private.Intellisense" Version="[$(MicrosoftPrivateIntellisenseVersion)]" />
   </ItemGroup>
@@ -30,7 +34,7 @@
           Condition="'$(UseIntellisensePackageDocXmlFile)' == 'true'">
     <ItemGroup>
       <DocFileItem Remove="@(DocFileItem)" />
-      <DocFileItem Include="$(IntellisensePackageXmlFile)" />
+      <DocFileItem Include="$(IntellisensePackageXmlFilePath)" />
     </ItemGroup>
   </Target>