mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-09-21 13:41:20 +02:00
60 lines
2.8 KiB
Diff
60 lines
2.8 KiB
Diff
From 36ef9ae23fdf5425138b1c5725405833f06919cf Mon Sep 17 00:00:00 2001
|
|
From: Antoine Martin <dev@ayakael.net
|
|
Date: Sat, 12 Feb 2022 20:15:50 +0000
|
|
Subject: [PATCH 1/1] musl-build
|
|
|
|
Various change for build on musl
|
|
|
|
---
|
|
.../dotnet-suggest.Tests.csproj | 13 +++++++++++++
|
|
.../dotnet-suggest.csproj | 2 +-
|
|
2 files changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj
|
|
index da6abedf..3d738ac9 100644
|
|
--- a/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj
|
|
+++ b/src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj
|
|
@@ -38,6 +38,15 @@
|
|
|
|
<Target Name="DotnetSuggestIntegrationTestAssets" BeforeTargets="Build" Condition="'$(Configuration)' == 'Release'">
|
|
|
|
+ <Exec IgnoreExitCode="true" Command="ldd --version 2>&1 | grep -q musl">
|
|
+ <Output TaskParameter="ExitCode" PropertyName="OSPlatformIsMuslCheck" />
|
|
+ </Exec>
|
|
+
|
|
+ <PropertyGroup>
|
|
+ <OSPlatformIsMusl Condition="$(OSPlatformIsMuslCheck) == '0'">true</OSPlatformIsMusl>
|
|
+ <OSPlatformIsMusl Condition="$(OSPlatformIsMusl) == ''">false</OSPlatformIsMusl>
|
|
+ </PropertyGroup>
|
|
+
|
|
<PropertyGroup>
|
|
<TestAssetsPath>
|
|
$([System.IO.Path]::GetFullPath('$(OutputPath)'))/TestAssets
|
|
@@ -56,6 +65,10 @@
|
|
<Rid>linux-x64</Rid>
|
|
</PropertyGroup>
|
|
|
|
+ <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true' AND '$(OSPlatformIsMusl)' == 'true'">
|
|
+ <Rid>linux-musl-x64</Rid>
|
|
+ </PropertyGroup>
|
|
+
|
|
<MSBuild BuildInParallel="False" Projects="../System.CommandLine.Suggest/dotnet-suggest.csproj" Targets="Restore" Properties="UseAppHost=true;SelfContained=false;RuntimeIdentifier=$(Rid);ForceRestoreToEvaluateSeparately=1;Configuration=Release">
|
|
</MSBuild>
|
|
|
|
diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
|
|
index fd825008..b18096e2 100644
|
|
--- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj
|
|
+++ b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
|
|
@@ -6,7 +6,7 @@
|
|
<PackAsTool>true</PackAsTool>
|
|
<PackageId>dotnet-suggest</PackageId>
|
|
<ToolCommandName>dotnet-suggest</ToolCommandName>
|
|
- <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64;linux-x64</PackAsToolShimRuntimeIdentifiers>
|
|
+ <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64;linux-x64;linux-musl-x64</PackAsToolShimRuntimeIdentifiers>
|
|
<PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
|
|
|
|
<DotnetSuggestBuildNumber>.1</DotnetSuggestBuildNumber>
|
|
--
|
|
2.31.1
|
|
|