提交 a34e329d 编写于 作者: D Davis Goodin 提交者: GitHub

Remove DiaSymReader prebuilt in source-build (dotnet/core-setup#7319)



Commit migrated from https://github.com/dotnet/core-setup/commit/22326dadefcc7115c0edbd41450dca65b8d163f8
上级 9af7e7f0
......@@ -168,9 +168,14 @@
<ItemGroup>
<CrossgenToolPackageReference Include="Microsoft.Private.CoreFx.NETCoreApp" Version="$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)" />
<CrossgenToolPackageReference Include="transport.Microsoft.NETCore.Runtime.CoreCLR" Version="$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)" />
<CrossgenToolPackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativePackageVersion)" />
<CrossgenToolPackageReference Include="$(MicrosoftTargetingPackPrivateWinRTPackage)" Version="$(MicrosoftTargetingPackPrivateWinRTPackageVersion)" />
<!-- This tool is a prebuilt not buildable from source. -->
<CrossgenToolPackageReference
Condition="'$(DotNetBuildFromSource)' != 'true'"
Include="Microsoft.DiaSymReader.Native"
Version="$(MicrosoftDiaSymReaderNativePackageVersion)" />
<!--
If any tool packages are missing, add them with ExcludeAssets=All. Be careful not to modify
existing PackageReferences.
......@@ -251,6 +256,14 @@
<_diaSymReaderToolDir>%(_diaSymReaderAssembly.RootDir)%(_diaSymReaderAssembly.Directory)</_diaSymReaderToolDir>
</PropertyGroup>
<!--
DiaSymReader can't be built from source, so use an unrelated default directory in that case.
This is used as the working directory for crossgen calls.
-->
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
<_diaSymReaderToolDir>$(IntermediateOutputPath)</_diaSymReaderToolDir>
</PropertyGroup>
<ItemGroup>
<_requiredProperty Include="_coreLibDirectory;_crossGenPath;_jitPath;_fxLibDirectory;_windowsWinMDDirectory;_diaSymReaderToolDir" />
</ItemGroup>
......
......@@ -7,12 +7,16 @@
<ItemGroup>
<PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp" Version="$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)" />
<PackageReference Include="transport.Microsoft.NETCore.Runtime.CoreCLR" Version="$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)" />
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativePackageVersion)" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="$(MicrosoftNETCoreTargetsPackageVersion)" />
<PackageReference Include="NETStandard.Library" Version="$(NETStandardLibraryPackageVersion)" />
</ItemGroup>
<!-- This tool is a prebuilt not buildable from source. -->
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativePackageVersion)" />
</ItemGroup>
<ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
<!-- Bring in Platforms for RID graph, NETStandard.Library for build-tools,
Targets for an empty runtime.json to reduce conflicts from 1.x packages -->
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册