Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Update CoreCLR override to use the sharedFramework output folder instead of comparing with packages #8842

Merged
merged 5 commits into from
Nov 13, 2019
Merged

Update CoreCLR override to use the sharedFramework output folder instead of comparing with packages #8842

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1fe67a
Override the files coming from CoreCLR in the shared framework via th…
jkoritzinsky Nov 9, 2019
6cd2ee3
Fix PDB issues. Correctly place cross-targeting files in the correct …
jkoritzinsky Nov 12, 2019
37921f3
Use NormalizePath to build up paths other than the globs themselves.
jkoritzinsky Nov 12, 2019
f43592c
Fix typo missed by rename.
jkoritzinsky Nov 12, 2019
2b74b76
Normalize as directory. Fix naming.
jkoritzinsky Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 38 additions & 25 deletions src/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,47 @@
<Target Name="OverrideRuntimeFilesFromPackageResolve" Condition="'$(CoreCLROverridePath)' != ''" BeforeTargets="GetFilesFromPackageResolve">
<Error Condition="!Exists('$(CoreCLROverridePath)')" Text="The path provided to CoreCLROverridePath ($(CoreCLROverridePath)) does not exist." />
<PropertyGroup>
<CoreCLRPDBOverridePath Condition="'$(CoreCLRPDBOverridePath)' == '' and Exists('$(CoreCLROverridePath)/PDB')">$(CoreCLROverridePath)/PDB</CoreCLRPDBOverridePath>
<CoreCLRCrossTargetComponentFolderName Condition="'$(TargetArchitecture)' == 'arm64' and '$(BuildArchitecture)' != 'arm64'">x64</CoreCLRCrossTargetComponentFolderName>
<CoreCLRCrossTargetComponentFolderName Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' != 'arm' and '$(TargetsWindows)' == 'true'">x86</CoreCLRCrossTargetComponentFolderName>
<CoreCLRCrossTargetComponentFolderName Condition="'$(TargetArchitecture)' == 'arm' and '$(BuildArchitecture)' != 'arm' and '$(TargetsLinux)' == 'true'">x64</CoreCLRCrossTargetComponentFolderName>
<CoreCLRSharedFrameworkFolder>$([MSBuild]::NormalizePath($(CoreCLROverridePath),'sharedFramework'))</CoreCLRSharedFrameworkFolder>
<CoreCLRCrossTargetComponentFolder
Condition="'$(CoreCLRCrossTargetComponentFolderName)' != ''">$([MSBuild]::NormalizePath($(CoreCLROverridePath),$(CoreCLRCrossTargetComponentFolder),'sharedFramework'))</CoreCLRCrossTargetComponentFolder>
</PropertyGroup>
<ItemGroup>
<CoreCLRFiles Include="$(CoreCLROverridePath)/*.*" />
<CoreCLRFiles Include="$(CoreCLRSharedFrameworkFolder)/*.*" />
<CoreCLRCrossTargetFiles Condition="'$(CoreCLRCrossTargetComponentFolder)' != ''" Include="$(CoreCLRCrossTargetComponentFolder)/*.*" />
<CoreCLRFiles Include="$(CoreCLROverridePath)/Redist/**/*.dll" />
<CoreCLRFiles Condition="'$(CoreCLRPDBOverridePath)' != ''"
Include="$(CoreCLRPDBOverridePath)/*.pdb;$(CoreCLRPDBOverridePath)/*.dbg;$(CoreCLRPDBOverridePath)/*.dwarf" />

<OverriddenRuntimeFiles Include="@(ReferenceCopyLocalPaths)" Condition="'@(CoreCLRFiles->'%(FileName)%(Extension)')' == '%(FileName)%(Extension)'">
<CoreCLRFile>@(CoreCLRFiles)</CoreCLRFile>
</OverriddenRuntimeFiles>

<LongNameDacFile Include="@(ReferenceCopyLocalPaths)" Condition="$([System.String]::Copy('%(FileName)').StartsWith('mscordaccore_'))">
<TargetPath>%(PathInPackage)</TargetPath>
</LongNameDacFile>

<ShortNameDacFileOverride Include="@(CoreCLRFiles)" Condition="'%(FileName)%(Extension)' == 'mscordaccore.dll'" />

<OverriddenRuntimeFiles Include="@(LongNameDacFile)">
<CoreCLRFile>@(ShortNameDacFileOverride)</CoreCLRFile>
</OverriddenRuntimeFiles>

<OverriddenRuntimeFiles>
<IsNative Condition="$([System.String]::new('%(Identity)').ToLowerInvariant().Replace('\', '/').Contains('/native/'))">true</IsNative>
</OverriddenRuntimeFiles>

<ReferenceCopyLocalPaths Remove="@(OverriddenRuntimeFiles)" />
<ReferenceCopyLocalPaths Include="@(OverriddenRuntimeFiles->Metadata('CoreCLRFile'))" />
<CoreCLRFiles>
<IsNative>true</IsNative>
</CoreCLRFiles>
<CoreCLRFiles Include="$(CoreCLROverridePath)/System.Private.CoreLib.dll" />
<CoreCLRFiles
Include="
$(CoreCLRSharedFrameworkFolder)/PDB/*.pdb;
$(CoreCLRSharedFrameworkFolder)/PDB/*.dbg;
$(CoreCLRSharedFrameworkFolder)/PDB/*.dwarf" />
<CoreCLRFiles
Include="$(CoreCLROverridePath)/PDB/System.Private.CoreLib.pdb;$(CoreCLROverridePath)/PDB/System.Private.CoreLib.ni.pdb" />
<CoreCLRCrossTargetFiles Condition="'$(CoreCLRCrossTargetComponentFolder)' != ''"
Include="
$(CoreCLRCrossTargetComponentFolder)/PDB/*.pdb;
$(CoreCLRCrossTargetComponentFolder)/PDB/*.dbg;
$(CoreCLRCrossTargetComponentFolder)/PDB/*.dwarf" />

<CoreCLRFiles>
<TargetPath>runtime/$(RuntimeIdentifier)/native</TargetPath>
</CoreCLRFiles>

<CoreCLRCrossTargetFiles>
<TargetPath>runtime/$(CoreCLRCrossTargetComponentFolderName)_$(TargetArchitecture)/native</TargetPath>
</CoreCLRCrossTargetFiles>

<CoreCLRFiles Include="@(CoreCLRCrossTargetFiles)" />

<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'@(CoreCLRFiles->'%(FileName)%(Extension)')' == '%(FileName)%(Extension)'"/>
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="$([System.String]::Copy('%(FileName)').StartsWith('mscordaccore_'))" />
<ReferenceCopyLocalPaths Include="@(CoreCLRFiles)" />
</ItemGroup>

<Error Condition="'@(CoreCLRFiles)' == ''" Text="The path provided to CoreCLROverridePath ($(CoreCLROverridePath)) does not contain any files." />
Expand Down
3 changes: 2 additions & 1 deletion src/pkg/projects/netcoreapp/src/netcoreapp.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
<!-- Fetches all the runtime items from the packages that we want to redist -->
<Target Name="GetRuntimeFilesFromPackages"
BeforeTargets="GetRuntimeFilesToPackage"
DependsOnTargets="GetCorePackagePaths">
DependsOnTargets="GetCorePackagePaths"
Condition="'$(CoreCLROverridePath)' == ''">
<ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
<_ToolsToPackage Include="$(_runtimePackageDir)tools/**/*.*"/>
<FilesToPackage Include="@(_ToolsToPackage)">
Expand Down