This is an automated email from the ASF dual-hosted git repository.
curth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 0ef02f99f fix(ci): fix MacOS builds for C# (#2606)
0ef02f99f is described below
commit 0ef02f99fc1f3e80934d7ba6746f40511d6bf608
Author: Curt Hagenlocher <[email protected]>
AuthorDate: Tue Mar 11 05:32:21 2025 -0700
fix(ci): fix MacOS builds for C# (#2606)
Fix MacOS builds for C# by moving to newer SourceLink
Closes #2568.
---
.github/workflows/csharp.yml | 3 ---
ci/scripts/csharp_test.sh | 1 -
csharp/Directory.Build.props | 4 ++++
dev/release/verify-release-candidate.sh | 10 ----------
4 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
index b4a5fc54b..57a4d805b 100644
--- a/.github/workflows/csharp.yml
+++ b/.github/workflows/csharp.yml
@@ -62,9 +62,6 @@ jobs:
with:
fetch-depth: 0
submodules: recursive
- - name: Install Source Link
- shell: bash
- run: dotnet tool install --global sourcelink
- name: Build
shell: bash
run: ci/scripts/csharp_build.sh $(pwd)
diff --git a/ci/scripts/csharp_test.sh b/ci/scripts/csharp_test.sh
index 244ea3ae5..4f79069be 100755
--- a/ci/scripts/csharp_test.sh
+++ b/ci/scripts/csharp_test.sh
@@ -23,5 +23,4 @@ source_dir=${1}/csharp/test/Apache.Arrow.Adbc.Tests
pushd ${source_dir}
dotnet test
-# TODO: consider sourcelink
popd
diff --git a/csharp/Directory.Build.props b/csharp/Directory.Build.props
index 2e22e3895..93c675703 100644
--- a/csharp/Directory.Build.props
+++ b/csharp/Directory.Build.props
@@ -44,6 +44,10 @@
<IsWindows
Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'
== 'true'">true</IsWindows>
</PropertyGroup>
+ <ItemGroup
Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework),
'net8.0'))">
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0"
PrivateAssets="All"/>
+ </ItemGroup>
+
<!-- NuGet properties -->
<PropertyGroup>
<Authors>The Apache Software Foundation</Authors>
diff --git a/dev/release/verify-release-candidate.sh
b/dev/release/verify-release-candidate.sh
index 060471b01..abb1a4f50 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -279,16 +279,6 @@ install_dotnet() {
show_info "Installed C# at $(which csharp) (.NET $(dotnet --version))"
fi
- # Ensure to have sourcelink installed
- if ! dotnet tool list | grep sourcelink > /dev/null 2>&1; then
- dotnet new tool-manifest
- dotnet tool install --local sourcelink
- PATH=${csharp_bin}:${PATH}
- if ! dotnet tool run sourcelink --help > /dev/null 2>&1; then
- export DOTNET_ROOT=${csharp_bin}
- fi
- fi
-
DOTNET_ALREADY_INSTALLED=1
}