|
24 | 24 |
|
25 | 25 | <!-- Set up artifact subpaths. -->
|
26 | 26 | <PropertyGroup>
|
| 27 | + <CoreCLRArtifactsPdbDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'PDB'))</CoreCLRArtifactsPdbDir> |
27 | 28 | <CoreCLRSharedFrameworkDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework'))</CoreCLRSharedFrameworkDir>
|
| 29 | + <CoreCLRSharedFrameworkPdbDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRSharedFrameworkDir)', 'PDB'))</CoreCLRSharedFrameworkPdbDir> |
28 | 30 | <CoreCLRILCompilerDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'ilc-published'))</CoreCLRILCompilerDir>
|
29 | 31 | <CoreCLRCrossILCompilerDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != ''">$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', '$(BuildArchitecture)', 'ilc'))</CoreCLRCrossILCompilerDir>
|
30 | 32 | <CoreCLRAotSdkDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'aotsdk'))</CoreCLRAotSdkDir>
|
|
67 | 69 | Text="The Mono artifacts path does not exist '$(MonoArtifactsPath)'. The 'mono' subset must be built before building this project. Configuration: '$(MonoConfiguration)'. To use a different configuration, specify the 'RuntimeConfiguration' property." />
|
68 | 70 |
|
69 | 71 | <PropertyGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR'">
|
70 |
| - <CoreCLRArtifactsPath>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)'))</CoreCLRArtifactsPath> |
71 |
| - <CoreCLRArtifactsPdbDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','PDB'))</CoreCLRArtifactsPdbDir> |
72 |
| - <!-- |
73 |
| - Even though CoreCLRSharedFrameworkDir is statically initialized, set it again in case the |
74 |
| - value is different after CoreCLRArtifactsPath is normalized. |
75 |
| - --> |
76 |
| - <CoreCLRSharedFrameworkDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','sharedFramework'))</CoreCLRSharedFrameworkDir> |
77 |
| - <CoreCLRSharedFrameworkPdbDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRSharedFrameworkDir)','PDB'))</CoreCLRSharedFrameworkPdbDir> |
78 | 72 | <CoreCLRCrossTargetComponentDir
|
79 | 73 | Condition="'$(CoreCLRCrossTargetComponentDirName)' != ''">$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','$(CoreCLRCrossTargetComponentDirName)','sharedFramework'))</CoreCLRCrossTargetComponentDir>
|
80 | 74 | </PropertyGroup>
|
81 | 75 |
|
82 |
| - <PropertyGroup Condition="'$(RuntimeFlavor)' == 'Mono'"> |
83 |
| - <MonoArtifactsPath>$([MSBuild]::NormalizeDirectory('$(MonoArtifactsPath)'))</MonoArtifactsPath> |
84 |
| - </PropertyGroup> |
85 |
| - |
86 | 76 | <ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' == 'true'">
|
87 | 77 | <_nativeAotRuntimeFiles Include="$(CoreCLRAotSdkDir)*" />
|
88 | 78 | <RuntimeFiles Include="@(_nativeAotRuntimeFiles)" Condition="'%(Extension)' != '.xml'">
|
|
97 | 87 | <RuntimeFiles>
|
98 | 88 | <IsNative>true</IsNative>
|
99 | 89 | </RuntimeFiles>
|
| 90 | + |
| 91 | + <!-- Include System.Private.CoreLib.dll if it exists; get the one in the 'IL' subdirectory if the one in the root directory is missing. --> |
100 | 92 | <_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll"
|
101 | 93 | Condition="Exists('$(CoreCLRArtifactsPath)System.Private.CoreLib.dll')" />
|
102 | 94 | <_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll"
|
103 | 95 | Condition="Exists('$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll') and '@(_systemPrivateCoreLib)' == ''" />
|
104 | 96 | <RuntimeFiles Include="@(_systemPrivateCoreLib)" />
|
| 97 | + |
| 98 | + <!-- Include debugging symbols --> |
105 | 99 | <RuntimeFiles
|
106 | 100 | Include="
|
107 | 101 | $(CoreCLRSharedFrameworkPdbDir)*.pdb;
|
108 | 102 | $(CoreCLRSharedFrameworkPdbDir)*.dbg;
|
109 | 103 | $(CoreCLRSharedFrameworkPdbDir)*.dwarf;
|
110 |
| - $(CoreCLRSharedFrameworkPdbDir)*.dSYM" |
111 |
| - IsNative="true" /> |
| 104 | + $(CoreCLRSharedFrameworkPdbDir)*.dSYM/**" |
| 105 | + IsNative="true" /> |
112 | 106 | <RuntimeFiles Condition="Exists('$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.pdb')"
|
113 | 107 | Include="$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.pdb" />
|
114 | 108 | <RuntimeFiles Condition="Exists('$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.ni.pdb')"
|
|
119 | 113 | $(CoreCLRSharedFrameworkPdbDir)*.pdb;
|
120 | 114 | $(CoreCLRSharedFrameworkPdbDir)*.dbg;
|
121 | 115 | $(CoreCLRSharedFrameworkPdbDir)*.dwarf;
|
122 |
| - $(CoreCLRSharedFrameworkPdbDir)*.dSYM" /> |
| 116 | + $(CoreCLRSharedFrameworkPdbDir)*.dSYM/**" /> |
123 | 117 |
|
124 | 118 | <CoreCLRCrossTargetFiles>
|
125 | 119 | <TargetPath>runtime/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native</TargetPath>
|
|
195 | 189 | $(LibrariesNativeArtifactsPath)*.so;
|
196 | 190 | $(LibrariesNativeArtifactsPath)*.dbg;
|
197 | 191 | $(LibrariesNativeArtifactsPath)*.dwarf;
|
198 |
| - $(LibrariesNativeArtifactsPath)*.dSYM; |
| 192 | + $(LibrariesNativeArtifactsPath)*.dSYM/**; |
199 | 193 | $(LibrariesNativeArtifactsPath)*.pdb"
|
200 | 194 | IsNative="true"
|
201 | 195 | Exclude="@(ExcludeNativeLibrariesRuntimeFiles)" />
|
|
0 commit comments