Skip to content

Commit b2473ab

Browse files
committed
Revert "wip: fix src/Sentry/Platforms/Native/Sentry.Native.targets"
This reverts commit 9971b68.
1 parent caba9c1 commit b2473ab

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/Sentry/Platforms/Native/Sentry.Native.targets

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
<SentryNativeOutputDirectory-linux-musl-x64>$(SentryNativeOutputDirectory)$(NativeLibRelativePath-linux-musl-x64)\</SentryNativeOutputDirectory-linux-musl-x64>
1616
<NativeLibRelativePath-osx>osx</NativeLibRelativePath-osx>
1717
<SentryNativeOutputDirectory-osx>$(SentryNativeOutputDirectory)$(NativeLibRelativePath-osx)\</SentryNativeOutputDirectory-osx>
18-
<IsLinuxMuslX64 Condition="$([MSBuild]::IsOsPlatform('Linux')) and Exists('/lib/ld-musl-x86_64.so.1')">true</IsLinuxMuslX64>
19-
<IsLinuxX64 Condition="$([MSBuild]::IsOsPlatform('Linux')) and '$(IsLinuxMuslX64)' != 'true'">true</IsLinuxX64>
2018
<SentryNativeBuildOutputs Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(SentryNativeOutputDirectory-win-x64)$(SentryNativeLibraryName).lib</SentryNativeBuildOutputs>
21-
<SentryNativeBuildOutputs Condition="'$(IsLinuxX64)' == 'true'">$(SentryNativeOutputDirectory-linux-x64)lib$(SentryNativeLibraryName).a</SentryNativeBuildOutputs>
22-
<SentryNativeBuildOutputs Condition="'$(IsLinuxMuslX64)' == 'true'">$(SentryNativeOutputDirectory-linux-musl-x64)lib$(SentryNativeLibraryName).a</SentryNativeBuildOutputs>
19+
<SentryNativeBuildOutputs Condition="'$(RuntimeIdentifier)' == 'linux-x64'">$(SentryNativeOutputDirectory-linux-x64)lib$(SentryNativeLibraryName).a</SentryNativeBuildOutputs>
20+
<SentryNativeBuildOutputs Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64'">$(SentryNativeOutputDirectory-linux-musl-x64)lib$(SentryNativeLibraryName).a</SentryNativeBuildOutputs>
2321
<SentryNativeBuildOutputs Condition="$([MSBuild]::IsOsPlatform('OSX'))">$(SentryNativeOutputDirectory-osx)lib$(SentryNativeLibraryName).a</SentryNativeBuildOutputs>
2422
</PropertyGroup>
2523

@@ -37,14 +35,14 @@
3735
</None>
3836
</ItemGroup>
3937

40-
<ItemGroup Condition="'$(CI_PUBLISHING_BUILD)' == 'true' or '$(IsLinuxX64)' == 'true'">
38+
<ItemGroup Condition="'$(CI_PUBLISHING_BUILD)' == 'true' or '$(RuntimeIdentifier)' == 'linux-x64'">
4139
<None Include="$(SentryNativeOutputDirectory-linux-x64)lib$(SentryNativeLibraryName).a">
4240
<Pack>true</Pack>
4341
<PackagePath>\sentry-native\$(NativeLibRelativePath-linux-x64)</PackagePath>
4442
</None>
4543
</ItemGroup>
4644

47-
<ItemGroup Condition="'$(CI_PUBLISHING_BUILD)' == 'true' or '$(IsLinuxMuslX64)' == 'true'">
45+
<ItemGroup Condition="'$(CI_PUBLISHING_BUILD)' == 'true' or '$(RuntimeIdentifier)' == 'linux-musl-x64'">
4846
<None Include="$(SentryNativeOutputDirectory-linux-musl-x64)lib$(SentryNativeLibraryName).a">
4947
<Pack>true</Pack>
5048
<PackagePath>\sentry-native\$(NativeLibRelativePath-linux-musl-x64)</PackagePath>

0 commit comments

Comments
 (0)