Skip to content

Commit 045f266

Browse files
Fix MacOS builds
Fix MacOS builds by moving to newer SourceLink
1 parent 09a6caf commit 045f266

File tree

4 files changed

+4
-14
lines changed

4 files changed

+4
-14
lines changed

.github/workflows/csharp.yml

-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ jobs:
6262
with:
6363
fetch-depth: 0
6464
submodules: recursive
65-
- name: Install Source Link
66-
shell: bash
67-
run: dotnet tool install --global sourcelink
6865
- name: Build
6966
shell: bash
7067
run: ci/scripts/csharp_build.sh $(pwd)

ci/scripts/csharp_test.sh

-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,4 @@ source_dir=${1}/csharp/test/Apache.Arrow.Adbc.Tests
2323

2424
pushd ${source_dir}
2525
dotnet test
26-
# TODO: consider sourcelink
2726
popd

csharp/Directory.Build.props

+4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
<IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
4545
</PropertyGroup>
4646

47+
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0'))">
48+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
49+
</ItemGroup>
50+
4751
<!-- NuGet properties -->
4852
<PropertyGroup>
4953
<Authors>The Apache Software Foundation</Authors>

dev/release/verify-release-candidate.sh

-10
Original file line numberDiff line numberDiff line change
@@ -279,16 +279,6 @@ install_dotnet() {
279279
show_info "Installed C# at $(which csharp) (.NET $(dotnet --version))"
280280
fi
281281

282-
# Ensure to have sourcelink installed
283-
if ! dotnet tool list | grep sourcelink > /dev/null 2>&1; then
284-
dotnet new tool-manifest
285-
dotnet tool install --local sourcelink
286-
PATH=${csharp_bin}:${PATH}
287-
if ! dotnet tool run sourcelink --help > /dev/null 2>&1; then
288-
export DOTNET_ROOT=${csharp_bin}
289-
fi
290-
fi
291-
292282
DOTNET_ALREADY_INSTALLED=1
293283
}
294284

0 commit comments

Comments
 (0)