diff options
Diffstat (limited to 'src/.nuget')
| -rw-r--r-- | src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props | 4 | ||||
| -rw-r--r-- | src/.nuget/dir.props | 22 |
2 files changed, 22 insertions, 4 deletions
diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props index 5f244a911b..d62f4d645c 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props @@ -6,7 +6,9 @@ <_PlatformDoesNotSupportCreatedump Condition="'$(Platform)' == 'x86'">true</_PlatformDoesNotSupportCreatedump> <_PlatformDoesNotSupportCreatedump Condition="'$(_runtimeOSFamily)' == 'tizen'">true</_PlatformDoesNotSupportCreatedump> <_PlatformDoesNotSupportEventTrace Condition="'$(_runtimeOSFamily)' == 'tizen'">true</_PlatformDoesNotSupportEventTrace> + <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'arm64'">true</_PlatformDoesNotSupportEventTrace> <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'x86'">true</_PlatformDoesNotSupportEventTrace> + <_PlatformDoesNotSupportSosPlugin Condition="'$(_runtimeOSFamily)' == 'android'">true</_PlatformDoesNotSupportSosPlugin> </PropertyGroup> <ItemGroup> <NativeBinary Include="$(BinDir)libcoreclr.so" /> @@ -15,7 +17,7 @@ <NativeBinary Include="$(BinDir)libmscordaccore.so" /> <NativeBinary Include="$(BinDir)libmscordbi.so" /> <NativeBinary Include="$(BinDir)libsos.so" /> - <NativeBinary Include="$(BinDir)libsosplugin.so" /> + <NativeBinary Condition="'$(_PlatformDoesNotSupportSosPlugin)' != 'true'" Include="$(BinDir)libsosplugin.so" /> <NativeBinary Include="$(BinDir)System.Globalization.Native.so" /> <NativeBinary Include="$(BinDir)sosdocsunix.txt" /> <NativeBinary Include="$(BinDir)System.Private.CoreLib.dll" /> diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index 2ff88d9bcf..52e94365dc 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -23,7 +23,7 @@ <RuntimeOS Condition="'$(RuntimeOS)' == ''">$(OSRid)</RuntimeOS> - <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">Windows_NT;OSX;Linux</SupportedPackageOSGroups> + <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">Windows_NT;OSX;Android;Linux</SupportedPackageOSGroups> <SupportedPackageOSGroups>;$(SupportedPackageOSGroups);</SupportedPackageOSGroups> <!-- Identify OS family based upon the RuntimeOS, which could be distro specific (e.g. osx.10.12) or @@ -38,6 +38,7 @@ <!-- derive an OS Group based on the OS Family --> <PropertyGroup> <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'osx'">OSX</_derivedPackageTargetOSGroup> + <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'android'">Android</_derivedPackageTargetOSGroup> <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'win'">Windows_NT</_derivedPackageTargetOSGroup> <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(__BuildOS)' != ''">$(__BuildOS)</_derivedPackageTargetOSGroup> <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == ''">Linux</_derivedPackageTargetOSGroup> @@ -48,9 +49,10 @@ <!-- _packageTargetOSGroup is used to control the runtime package imports, don't import runtime package targets for an unsupported OS Group --> <PropertyGroup Condition="'$(PackageTargetRuntime)' != '' and '$(_isSupportedOSGroup)' == 'true'"> + <!-- Android will use Linux package definitions --> <_packageTargetOSGroup>$(_derivedPackageTargetOSGroup)</_packageTargetOSGroup> + <_packageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == 'Android'">Linux</_packageTargetOSGroup> </PropertyGroup> - <PropertyGroup> <SkipPackageFileCheck>true</SkipPackageFileCheck> <OutputPath>$(PackageOutputPath)</OutputPath> @@ -81,6 +83,13 @@ <PackageRID Condition="'$(PortableBuild)' == 'true'">osx-$(ArchGroup)</PackageRID> </PropertyGroup> </When> + <When Condition="'$(_runtimeOSFamily)' == 'android'"> + <PropertyGroup> + <PackageRID>android.21-$(ArchGroup)</PackageRID> + <!-- Set the platform part of the RID if we are doing a portable build --> + <PackageRID Condition="'$(PortableBuild)' == '1'">android-$(ArchGroup)</PackageRID> + </PropertyGroup> + </When> <When Condition="'$(_runtimeOSFamily)' == 'rhel'"> <PropertyGroup> <PackageRID>rhel.7-$(ArchGroup)</PackageRID> @@ -106,6 +115,13 @@ <SymbolFileExtension>.dwarf</SymbolFileExtension> </PropertyGroup> </When> + <When Condition="'$(_runtimeOSFamily)' == 'android'"> + <PropertyGroup> + <LibraryFileExtension>.so</LibraryFileExtension> + <!--symbols included in .so, like Linux, but can be generated externally and if so, uses .debug ext--> + <SymbolFileExtension>.debug</SymbolFileExtension> + </PropertyGroup> + </When> <Otherwise> <PropertyGroup> <LibraryFileExtension>.so</LibraryFileExtension> @@ -165,4 +181,4 @@ <!-- Include project references for a lineup package to generate the runtime.json file --> <ProjectReference Include="@(_buildRidProjects)" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> |