-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Consolidate RID and native file naming in MSBuild scripts (#43804)
* Consolidate RID and native file naming in MSBuild scripts * Use short variable names for native files naming convention, that are used by `framework.sharedfx.targets` in arcade, and cleanup redefinitions from crossgen2 and installer. e.g. `ExeSuffix` instead of `ApplicationFileExtension`, `LibSuffix` instead of `LibraryFileExtension` and so on. * Calculate `TargetArchitecture`, `NonPortableRuntimeOS` (for `PortableBuild`) and `PackageRID` values once for the entire livebuild, inside `eng/Configurations.props`. This implementation is a union of three varied implementations that are being deleted. * Import `names.props` once in `eng/Configurations.props` based on calculated `PackageRID` and cleanup imports of this file from various places. * Combine OS targets definition in MSBuild scripts. * Delete legacy tooling properties * Delete legacy tooling properties
- Loading branch information
Showing
38 changed files
with
213 additions
and
701 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,54 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <StaticLibPrefix>lib</StaticLibPrefix> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Add path globs specific to native binaries to exclude unnecessary files from packages. --> | ||
| <Choose> | ||
| <When Condition=" '$(_runtimeOSFamily)' == 'win' OR $(RuntimeIdentifier.StartsWith('win')) "> | ||
| <When Condition="$(PackageRID.StartsWith('win'))"> | ||
| <PropertyGroup> | ||
| <ApplicationFileExtension>.exe</ApplicationFileExtension> | ||
| <LibraryFilePrefix></LibraryFilePrefix> | ||
| <LibraryFileExtension>.dll</LibraryFileExtension> | ||
| <StaticLibraryFileExtension>.lib</StaticLibraryFileExtension> | ||
| <SymbolFileExtension>.pdb</SymbolFileExtension> | ||
| <ExeSuffix>.exe</ExeSuffix> | ||
| <LibSuffix>.dll</LibSuffix> | ||
| <StaticLibSuffix>.lib</StaticLibSuffix> | ||
| <SymbolsSuffix>.pdb</SymbolsSuffix> | ||
| </PropertyGroup> | ||
| </When> | ||
| <When Condition=" '$(_runtimeOSFamily)' == 'osx' or $(RuntimeIdentifier.StartsWith('osx')) or '$(_runtimeOSFamily)' == 'ios' or $(RuntimeIdentifier.StartsWith('ios'))"> | ||
| <When Condition="$(PackageRID.StartsWith('osx'))"> | ||
| <PropertyGroup> | ||
| <LibraryFilePrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibraryFilePrefix> | ||
| <LibraryFileExtension>.dylib</LibraryFileExtension> | ||
| <StaticLibraryFileExtension>.a</StaticLibraryFileExtension> | ||
| <SymbolFileExtension>.dwarf</SymbolFileExtension> | ||
| <LibPrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibPrefix> | ||
| <LibSuffix>.dylib</LibSuffix> | ||
| <StaticLibSuffix>.a</StaticLibSuffix> | ||
| <SymbolsSuffix>.dwarf</SymbolsSuffix> | ||
| </PropertyGroup> | ||
| </When> | ||
| <When Condition=" '$(_runtimeOSFamily)' == 'android' "> | ||
| <When Condition="$(PackageRID.StartsWith('android'))"> | ||
| <PropertyGroup> | ||
| <LibraryFilePrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibraryFilePrefix> | ||
| <LibraryFileExtension>.so</LibraryFileExtension> | ||
| <StaticLibraryFileExtension>.a</StaticLibraryFileExtension> | ||
| <LibPrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibPrefix> | ||
| <LibSuffix>.so</LibSuffix> | ||
| <StaticLibSuffix>.a</StaticLibSuffix> | ||
| <!--symbols included in .so, like Linux, but can be generated externally and if so, uses .debug ext--> | ||
| <SymbolFileExtension>.debug</SymbolFileExtension> | ||
| <SymbolsSuffix>.debug</SymbolsSuffix> | ||
| </PropertyGroup> | ||
| </When> | ||
| <Otherwise> | ||
| <PropertyGroup> | ||
| <LibraryFilePrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibraryFilePrefix> | ||
| <LibraryFileExtension>.so</LibraryFileExtension> | ||
| <StaticLibraryFileExtension>.a</StaticLibraryFileExtension> | ||
| <SymbolFileExtension>.dbg</SymbolFileExtension> | ||
| <LibPrefix Condition=" '$(SkipLibraryPrefixFromUnix)' == '' ">lib</LibPrefix> | ||
| <LibSuffix>.so</LibSuffix> | ||
| <StaticLibSuffix>.a</StaticLibSuffix> | ||
| <SymbolsSuffix>.dbg</SymbolsSuffix> | ||
| </PropertyGroup> | ||
| </Otherwise> | ||
| </Choose> | ||
|
|
||
| <ItemGroup> | ||
| <AdditionalLibPackageExcludes Condition="'$(SymbolFileExtension)' != ''" Include="%2A%2A\%2A$(SymbolFileExtension)" /> | ||
| <AdditionalSymbolPackageExcludes Condition="'$(LibraryFileExtension)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibraryFileExtension)" /> | ||
| <AdditionalLibPackageExcludes Condition="'$(SymbolsSuffix)' != ''" Include="%2A%2A\%2A$(SymbolsSuffix)" /> | ||
| <AdditionalSymbolPackageExcludes Condition="'$(LibSuffix)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibSuffix)" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- arcade is using long name for this property; 'SymbolFileExtension'. | ||
| remove this property group when arcade is updated with short name (SymbolsSuffix). --> | ||
| <PropertyGroup> | ||
| <SymbolFileExtension>$(SymbolsSuffix)</SymbolFileExtension> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.