未验证 提交 688206b7 编写于 作者: C Carlos Sanchez Lopez 提交者: GitHub

Update MicrosoftPrivateIntellisensePackage and XmlDocFileRoot (#38109)

* Update MicrosoftPrivateIntellisensePackage and XmlDocFileRoot

* Update eng/Versions.props
Co-authored-by: NSantiago Fernandez Madero <safern@microsoft.com>

* Update eng/Versions.props
Co-authored-by: NSantiago Fernandez Madero <safern@microsoft.com>
上级 11c08b50
......@@ -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)' != ''" />
......
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册