Skip to content

Commit 19a67c7

Browse files
GH-45656: [C#] Fix failing MacOS builds (#45734)
### Rationale for this change Fix MacOS builds by removing command-line sourcelink tool. This appears to be deprecated and the certificate is expired. ### Are there any user-facing changes? No. * GitHub Issue: #45656 Authored-by: Curt Hagenlocher <[email protected]> Signed-off-by: Curt Hagenlocher <[email protected]>
1 parent b3d218c commit 19a67c7

File tree

4 files changed

+26
-30
lines changed

4 files changed

+26
-30
lines changed

.github/workflows/csharp.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ jobs:
6565
uses: actions/checkout@v4
6666
with:
6767
fetch-depth: 0
68-
- name: Install Source Link
69-
shell: bash
70-
run: dotnet tool install --global sourcelink
7168
- name: Build
7269
shell: bash
7370
run: ci/scripts/csharp_build.sh $(pwd)
@@ -93,8 +90,6 @@ jobs:
9390
uses: actions/checkout@v4
9491
with:
9592
fetch-depth: 0
96-
- name: Install Source Link
97-
run: dotnet tool install --global sourcelink
9893
- name: Build
9994
shell: bash
10095
run: ci/scripts/csharp_build.sh $(pwd)
@@ -124,9 +119,6 @@ jobs:
124119
uses: actions/checkout@v4
125120
with:
126121
fetch-depth: 0
127-
- name: Install Source Link
128-
shell: bash
129-
run: dotnet tool install --global sourcelink
130122
- name: Build
131123
shell: bash
132124
run: ci/scripts/csharp_build.sh $(pwd)

ci/scripts/csharp_test.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,4 @@ export PYTHONNET_PYDLL=$(${PYTHON} -m find_libpython)
3434

3535
pushd ${source_dir}
3636
dotnet test
37-
for pdb in artifacts/Apache.Arrow/*/*/Apache.Arrow.pdb; do
38-
sourcelink test ${pdb}
39-
done
4037
popd

csharp/examples/Examples.sln

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27703.2042
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.12.35707.178 d17.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentBuilderExample", "FluentBuilderExample\FluentBuilderExample.csproj", "{ECE22119-D91D-44F7-9575-85B98F946289}"
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apache.Arrow", "..\src\Apache.Arrow\Apache.Arrow.csproj", "{1FE1DE95-FF6E-4895-82E7-909713C53524}"
99
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlightAspServerExample", "FlightAspServerExample\FlightAspServerExample.csproj", "{16FF9B95-1E65-4285-9A78-463A71823D3C}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlightClientExample", "FlightClientExample\FlightClientExample.csproj", "{8D19CF7A-3DAB-41D0-94B1-20892C4EACB8}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Arrow.Flight", "..\src\Apache.Arrow.Flight\Apache.Arrow.Flight.csproj", "{9D5029EC-CFF6-4A0C-A03D-CC534A54C6BB}"
15+
EndProject
16+
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}"
17+
EndProject
1018
Global
1119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1220
Debug|Any CPU = Debug|Any CPU
@@ -21,6 +29,22 @@ Global
2129
{1FE1DE95-FF6E-4895-82E7-909713C53524}.Debug|Any CPU.Build.0 = Debug|Any CPU
2230
{1FE1DE95-FF6E-4895-82E7-909713C53524}.Release|Any CPU.ActiveCfg = Release|Any CPU
2331
{1FE1DE95-FF6E-4895-82E7-909713C53524}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{16FF9B95-1E65-4285-9A78-463A71823D3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{16FF9B95-1E65-4285-9A78-463A71823D3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{16FF9B95-1E65-4285-9A78-463A71823D3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{16FF9B95-1E65-4285-9A78-463A71823D3C}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{8D19CF7A-3DAB-41D0-94B1-20892C4EACB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{8D19CF7A-3DAB-41D0-94B1-20892C4EACB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{8D19CF7A-3DAB-41D0-94B1-20892C4EACB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{8D19CF7A-3DAB-41D0-94B1-20892C4EACB8}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{9D5029EC-CFF6-4A0C-A03D-CC534A54C6BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{9D5029EC-CFF6-4A0C-A03D-CC534A54C6BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{9D5029EC-CFF6-4A0C-A03D-CC534A54C6BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{9D5029EC-CFF6-4A0C-A03D-CC534A54C6BB}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{6F2FA3F3-1B33-4742-99C2-B728CBD27861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{6F2FA3F3-1B33-4742-99C2-B728CBD27861}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{6F2FA3F3-1B33-4742-99C2-B728CBD27861}.Release|Any CPU.ActiveCfg = Release|Any CPU
47+
{6F2FA3F3-1B33-4742-99C2-B728CBD27861}.Release|Any CPU.Build.0 = Release|Any CPU
2448
EndGlobalSection
2549
GlobalSection(SolutionProperties) = preSolution
2650
HideSolutionNode = FALSE

dev/release/verify-release-candidate.sh

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -364,16 +364,6 @@ install_csharp() {
364364
show_info "Installed C# at $(which csharp) (.NET $(dotnet --version))"
365365
fi
366366

367-
# Ensure to have sourcelink installed
368-
if ! dotnet tool list | grep sourcelink > /dev/null 2>&1; then
369-
dotnet new tool-manifest
370-
dotnet tool install --local sourcelink
371-
PATH=${csharp_bin}:${PATH}
372-
if ! dotnet tool run sourcelink --help > /dev/null 2>&1; then
373-
export DOTNET_ROOT=${csharp_bin}
374-
fi
375-
fi
376-
377367
CSHARP_ALREADY_INSTALLED=1
378368
}
379369

@@ -749,13 +739,6 @@ test_csharp() {
749739
mv ../.git dummy.git
750740
fi
751741

752-
if [ "${SOURCE_KIND}" = "local" ]; then
753-
echo "Skipping sourcelink verification on local build"
754-
else
755-
dotnet tool run sourcelink test artifacts/Apache.Arrow/Release/netstandard2.0/Apache.Arrow.pdb
756-
dotnet tool run sourcelink test artifacts/Apache.Arrow/Release/net6.0/Apache.Arrow.pdb
757-
fi
758-
759742
popd
760743
}
761744

0 commit comments

Comments
 (0)