|
2 | 2 |
|
3 | 3 | <PropertyGroup>
|
4 | 4 | <GeneratePackage>true</GeneratePackage>
|
5 |
| - <IncludeSymbolsInPackage>true</IncludeSymbolsInPackage> |
6 | 5 | <PackageDescription>Provides a native AOT compiler and runtime for .NET</PackageDescription>
|
7 |
| - </PropertyGroup> |
8 | 6 |
|
9 |
| - <PropertyGroup> |
10 |
| - <!-- For now, send symbols package into a dummy directory to avoid conflicts with dotnet/runtime and |
11 |
| - to avoid issues with objwriter not having the rigth ELF version resource --> |
12 |
| - <SymbolPackageOutputPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsPackagesDir)', 'Ignored'))</SymbolPackageOutputPath> |
| 7 | + <BuildingIlcHostPackage Condition="'$(TargetsWasm)' != 'true'">true</BuildingIlcHostPackage> |
13 | 8 | </PropertyGroup>
|
14 | 9 |
|
15 | 10 | <Target Name="GetIlcCompilerFiles"
|
16 | 11 | DependsOnTargets="ResolveLibrariesFromLocalBuild"
|
17 | 12 | BeforeTargets="GetPackageFiles">
|
18 | 13 |
|
19 |
| - <ItemGroup Condition="'$(PackageTargetRuntime)' != ''"> |
20 |
| - <File Include="@(LibrariesRuntimeFiles)"> |
21 |
| - <TargetPath>framework/%(LibrariesRuntimeFiles.NativeSubDirectory)</TargetPath> |
22 |
| - </File> |
23 |
| - <File Include="$(CoreCLRILCompilerDir)*"> |
24 |
| - <TargetPath>tools</TargetPath> |
25 |
| - </File> |
26 |
| - <File Include="$(CoreCLRAotSdkDir)*"> |
27 |
| - <TargetPath>sdk</TargetPath> |
28 |
| - </File> |
| 14 | + <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> |
| 15 | + <File Include="$(CoreCLRBuildIntegrationDir)*" TargetPath="build" /> |
| 16 | + <File Include="$(CoreCLRILCompilerDir)netstandard\*" TargetPath="tools/netstandard" /> |
| 17 | + |
| 18 | + <!-- TODO-LLVM-Upstream: https://github.com/dotnet/runtimelab/issues/2576 --> |
| 19 | + <File Include="$(ArtifactsBinDir)Microsoft.Interop.SourceGeneration\$(Configuration)\netstandard2.0\*" TargetPath="analyzers/dotnet/cs" /> |
| 20 | + <File Include="$(ArtifactsBinDir)JSImportGenerator\$(Configuration)\netstandard2.0\*" TargetPath="analyzers/dotnet/cs" /> |
| 21 | + </ItemGroup> |
| 22 | + |
| 23 | + <ItemGroup Condition="'$(PackageTargetRuntime)' != '' and '$(BuildingIlcHostPackage)' == 'true'"> |
| 24 | + <File Include="$(CoreCLRILCompilerDir)*" TargetPath="tools" /> |
| 25 | + </ItemGroup> |
| 26 | + |
| 27 | + <ItemGroup Condition="'$(PackageTargetRuntime)' != '' and '$(BuildingIlcHostPackage)' != 'true'"> |
| 28 | + <File Include="@(LibrariesRuntimeFiles)" TargetPath="framework/%(LibrariesRuntimeFiles.NativeSubDirectory)" /> |
| 29 | + <File Include="$(CoreCLRAotSdkDir)*" TargetPath="sdk" /> |
| 30 | + <File Include="$(MibcOptimizationDataDir)/$(TargetOS)/$(TargetArchitecture)/**/*.mibc" TargetPath="mibc" /> |
| 31 | + |
29 | 32 | <DotnetJsCoreCLRAotSdkExtension Include="ts;js;map;json" />
|
30 | 33 | <File Include="$(CoreCLRAotSdkDir)dotnetjs/*.%(DotnetJsCoreCLRAotSdkExtension.Identity)" TargetPath="sdk/dotnetjs" />
|
31 | 34 | <File Include="$(CoreCLRAotSdkDir)dotnetjs/src/*.%(DotnetJsCoreCLRAotSdkExtension.Identity)" TargetPath="sdk/dotnetjs/src" />
|
32 | 35 | <File Include="$(CoreCLRAotSdkDir)dotnetjs/src/es6/*.%(DotnetJsCoreCLRAotSdkExtension.Identity)" TargetPath="sdk/dotnetjs/src/es6" />
|
33 |
| - <File Include="$(MibcOptimizationDataDir)/$(TargetOS)/$(TargetArchitecture)/**/*.mibc"> |
34 |
| - <TargetPath>mibc</TargetPath> |
35 |
| - </File> |
36 | 36 | </ItemGroup>
|
37 | 37 |
|
| 38 | + <!-- exclude native symbols from ilc package (they are included in symbols package) --> |
38 | 39 | <ItemGroup>
|
39 |
| - <File Include="$(CoreCLRBuildIntegrationDir)*"> |
40 |
| - <TargetPath>build</TargetPath> |
41 |
| - </File> |
42 |
| - <File Include="$(CoreCLRILCompilerDir)netstandard\*"> |
43 |
| - <TargetPath>tools/netstandard</TargetPath> |
44 |
| - </File> |
45 |
| - </ItemGroup> |
| 40 | + <!-- on windows, remove the pdbs only from tools directory (both managed and native) --> |
| 41 | + <LibPackageExcludes Include="tools\%2A%2A\%2A.pdb"/> |
46 | 42 |
|
47 |
| - <!-- TODO-LLVM-Upstream: https://github.com/dotnet/runtimelab/issues/2576 --> |
48 |
| - <ItemGroup Condition="'$(PackageTargetRuntime)' == ''"> |
49 |
| - <File Include="$(ArtifactsBinDir)Microsoft.Interop.SourceGeneration\$(Configuration)\netstandard2.0\*"> |
50 |
| - <TargetPath>analyzers/dotnet/cs</TargetPath> |
51 |
| - </File> |
52 |
| - <File Include="$(ArtifactsBinDir)JSImportGenerator\$(Configuration)\netstandard2.0\*"> |
53 |
| - <TargetPath>analyzers/dotnet/cs</TargetPath> |
54 |
| - </File> |
| 43 | + <LibPackageExcludes Include="%2A%2A\%2A.dbg"/> |
| 44 | + <LibPackageExcludes Include="%2A%2A\%2A.debug"/> |
| 45 | + <LibPackageExcludes Include="%2A%2A\%2A.dSYM"/> |
| 46 | + <LibPackageExcludes Include="%2A%2A\%2A.dwarf"/> |
55 | 47 | </ItemGroup>
|
56 | 48 | </Target>
|
57 | 49 |
|
|
0 commit comments