Skip to content

Support packing new R2R maps to SFX packages #7738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hoyosjs merged 2 commits into from
Aug 12, 2021
Merged

Support packing new R2R maps to SFX packages #7738

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cab3074
Support packing new R2R files
hoyosjs Aug 11, 2021
8455a14
Update sharedfx.targets
hoyosjs Aug 11, 2021
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
11 changes: 10 additions & 1 deletion src/Microsoft.DotNet.SharedFramework.Sdk/targets/sharedfx.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PublishReadyToRunUseCrossgen2 Condition="'$(PublishReadyToRunUseCrossgen2)' == '' and '$(PublishReadyToRun)' == 'true' and '$(_TargetFrameworkVersionWithoutV)' >= '6.0'">true</PublishReadyToRunUseCrossgen2>
<PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
<PublishReadyToRunShowWarnings>true</PublishReadyToRunShowWarnings>
<AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>$(AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder);.map;.dbg;.debug;.dwarf</AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>
<AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>$(AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder);.map;.r2rmap;.dbg;.debug;.dwarf</AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder>
<_DefaultHostJsonTargetPath>runtimes/$(RuntimeIdentifier)/lib/$(TargetFramework)</_DefaultHostJsonTargetPath>
<HostJsonTargetPath Condition="'$(HostJsonTargetPath)' == ''">$(_DefaultHostJsonTargetPath)</HostJsonTargetPath>
<IncludeFallbacksInDepsFile Condition="'$(IncludeFallbacksInDepsFile)' == ''">false</IncludeFallbacksInDepsFile>
Expand Down Expand Up @@ -77,15 +77,19 @@
<FilesToPackage Include="@(ResolvedFileToPublish)" Exclude="@(RuntimePackAsset)" />
<FilesToPackage Condition="'%(FilesToPackage.AssetType)' == 'native'" IsNative="true" />
<_r2rSymbolFiles Include="@(ResolvedFileToPublish->'%(RootDir)%(Directory)%(FileName).ni.pdb')" />
<!-- This accounts for perfmaps generated by crossgen2 when specifying perfmap-format-version:1, which is the new default. -->
<_r2rV1MapFiles Include="@(ResolvedFileToPublish->'%(RootDir)%(Directory)%(FileName).ni.r2rmap')" />
Copy link
Member

@jkoritzinsky jkoritzinsky Aug 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add comments around here as well for the different type of files like the comments added below? Would make it easier to evolve this as time goes on (and possibly remove the crossgen1 support for TFMs where only crossgen2 exists).

Copy link
Member Author

@hoyosjs hoyosjs Aug 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Crossgen2 can generate both files. Right now they differ mostly by name.

</ItemGroup>
<!-- MSBuild does not resolve globs from item transformations,
so round-trip through a property to activate glob resolution. -->
<PropertyGroup>
<!-- This accounts for legagy-named perfmaps generated by crossgen2 when specifying perfmap-format-version:0. -->
<_r2rSymbolFilePattern>@(ResolvedFileToPublish->'%(RootDir)%(Directory)%(FileName).ni.*.map')</_r2rSymbolFilePattern>
</PropertyGroup>
<ItemGroup>
<FilesToPackage Include="@(_r2rSymbolFiles)" Condition="Exists('%(Identity)')" IsSymbolFile="true" />
<FilesToPackage Include="$(_r2rSymbolFilePattern)" IsSymbolFile="true" />
<FilesToPackage Include="@(_r2rV1MapFiles)" Condition="Exists('%(Identity)')" IsSymbolFile="true" />
</ItemGroup>
</Target>

Expand Down Expand Up @@ -136,11 +140,16 @@
<IsPgoData>true</IsPgoData>
<TargetPath>PgoData</TargetPath>
</FilesToPackage>
<!-- Legacy crossgen perf map files. Supported by crossgen2 using perfmap-format-version:0. -->
<FilesToPackage Condition="$([System.String]::new('%(Filename)').Contains('.ni.{')) and
$([System.String]::new('%(Filename)').EndsWith('}')) and
'%(Extension)' == '.map'">
<IsSymbolFile>true</IsSymbolFile>
</FilesToPackage>
<!-- crossgen2 v1 perf map files. -->
<FilesToPackage Condition="'%(Extension)' == '.r2rmap'">
<IsSymbolFile>true</IsSymbolFile>
</FilesToPackage>
</ItemGroup>

<ItemGroup Condition="'$(PlatformPackageType)' == 'TargetingPack'">
Expand Down