Skip to content

GH-45656: [C#] Fix failing MacOS builds #45734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CurtHagenlocher merged 1 commit into from
Mar 11, 2025
Merged

GH-45656: [C#] Fix failing MacOS builds #45734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/workflows/csharp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install Source Link
shell: bash
run: dotnet tool install --global sourcelink
- name: Build
shell: bash
run: ci/scripts/csharp_build.sh $(pwd)
Expand All @@ -93,8 +90,6 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install Source Link
run: dotnet tool install --global sourcelink
- name: Build
shell: bash
run: ci/scripts/csharp_build.sh $(pwd)
Expand Down Expand Up @@ -124,9 +119,6 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install Source Link
shell: bash
run: dotnet tool install --global sourcelink
- name: Build
shell: bash
run: ci/scripts/csharp_build.sh $(pwd)
Expand Down
3 changes: 0 additions & 3 deletions ci/scripts/csharp_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,4 @@ export PYTHONNET_PYDLL=$(${PYTHON} -m find_libpython)

pushd ${source_dir}
dotnet test
for pdb in artifacts/Apache.Arrow/*/*/Apache.Arrow.pdb; do
sourcelink test ${pdb}
done
popd
28 changes: 26 additions & 2 deletions csharp/examples/Examples.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2042
# Visual Studio Version 17
VisualStudioVersion = 17.12.35707.178 d17.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentBuilderExample", "FluentBuilderExample\FluentBuilderExample.csproj", "{ECE22119-D91D-44F7-9575-85B98F946289}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apache.Arrow", "..\src\Apache.Arrow\Apache.Arrow.csproj", "{1FE1DE95-FF6E-4895-82E7-909713C53524}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlightAspServerExample", "FlightAspServerExample\FlightAspServerExample.csproj", "{16FF9B95-1E65-4285-9A78-463A71823D3C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlightClientExample", "FlightClientExample\FlightClientExample.csproj", "{8D19CF7A-3DAB-41D0-94B1-20892C4EACB8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Arrow.Flight", "..\src\Apache.Arrow.Flight\Apache.Arrow.Flight.csproj", "{9D5029EC-CFF6-4A0C-A03D-CC534A54C6BB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Arrow.Flight.AspNetCore", "..\src\Apache.Arrow.Flight.AspNetCore\Apache.Arrow.Flight.AspNetCore.csproj", "{6F2FA3F3-1B33-4742-99C2-B728CBD27861}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -21,6 +29,22 @@ Global
{1FE1DE95-FF6E-4895-82E7-909713C53524}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1FE1DE95-FF6E-4895-82E7-909713C53524}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1FE1DE95-FF6E-4895-82E7-909713C53524}.Release|Any CPU.Build.0 = Release|Any CPU
{16FF9B95-1E65-4285-9A78-463A71823D3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{16FF9B95-1E65-4285-9A78-463A71823D3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{16FF9B95-1E65-4285-9A78-463A71823D3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{16FF9B95-1E65-4285-9A78-463A71823D3C}.Release|Any CPU.Build.0 = Release|Any CPU
{8D19CF7A-3DAB-41D0-94B1-20892C4EACB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D19CF7A-3DAB-41D0-94B1-20892C4EACB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D19CF7A-3DAB-41D0-94B1-20892C4EACB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D19CF7A-3DAB-41D0-94B1-20892C4EACB8}.Release|Any CPU.Build.0 = Release|Any CPU
{9D5029EC-CFF6-4A0C-A03D-CC534A54C6BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D5029EC-CFF6-4A0C-A03D-CC534A54C6BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D5029EC-CFF6-4A0C-A03D-CC534A54C6BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D5029EC-CFF6-4A0C-A03D-CC534A54C6BB}.Release|Any CPU.Build.0 = Release|Any CPU
{6F2FA3F3-1B33-4742-99C2-B728CBD27861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F2FA3F3-1B33-4742-99C2-B728CBD27861}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F2FA3F3-1B33-4742-99C2-B728CBD27861}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F2FA3F3-1B33-4742-99C2-B728CBD27861}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
17 changes: 0 additions & 17 deletions dev/release/verify-release-candidate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,16 +364,6 @@ install_csharp() {
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

CSHARP_ALREADY_INSTALLED=1
}

Expand Down Expand Up @@ -749,13 +739,6 @@ test_csharp() {
mv ../.git dummy.git
fi

if [ "${SOURCE_KIND}" = "local" ]; then
echo "Skipping sourcelink verification on local build"
else
dotnet tool run sourcelink test artifacts/Apache.Arrow/Release/netstandard2.0/Apache.Arrow.pdb
dotnet tool run sourcelink test artifacts/Apache.Arrow/Release/net6.0/Apache.Arrow.pdb
fi

popd
}

Expand Down
Loading