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 ff600650 chore(csharp): Change the Arrow reference from a submodule to
a package (#1478)
ff600650 is described below
commit ff6006502f12a62c318c58b61e1f0d8b230f88f3
Author: Curt Hagenlocher <[email protected]>
AuthorDate: Sun Jan 21 14:14:51 2024 -0800
chore(csharp): Change the Arrow reference from a submodule to a package
(#1478)
Now that Arrow 15.0.0 has been released, we can consume it via a package
instead of source.
Closes #1477
---
.gitmodules | 20 --------------------
csharp/Apache.Arrow.Adbc.sln | 16 ----------------
.../src/Apache.Arrow.Adbc/Apache.Arrow.Adbc.csproj | 2 +-
.../Apache.Arrow.Adbc.Drivers.FlightSql.csproj | 2 +-
csharp/src/arrow | 1 -
5 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e6b49697..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-[submodule "csharp/src/arrow"]
- path = csharp/src/arrow
- url = https://github.com/apache/arrow.git
diff --git a/csharp/Apache.Arrow.Adbc.sln b/csharp/Apache.Arrow.Adbc.sln
index 75719a27..82b55b63 100644
--- a/csharp/Apache.Arrow.Adbc.sln
+++ b/csharp/Apache.Arrow.Adbc.sln
@@ -4,10 +4,6 @@ VisualStudioVersion = 17.4.33403.182
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apache.Arrow.Adbc",
"src\Apache.Arrow.Adbc\Apache.Arrow.Adbc.csproj",
"{232F2EC7-5FD3-4E0B-89FF-317A15CF698F}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Arrow", "Arrow",
"{9ADA26E0-F328-4466-908A-2FA506DBDF7D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apache.Arrow",
"src\arrow\csharp\src\Apache.Arrow\Apache.Arrow.csproj",
"{851FBF0D-21A8-4C04-A040-24B6AAE31D2C}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apache.Arrow.Adbc.Tests",
"test\Apache.Arrow.Adbc.Tests\Apache.Arrow.Adbc.Tests.csproj",
"{00C143BA-F1CF-4117-9DE6-E73DC4D208F8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests",
"{5BD04C26-CE52-4893-8C1A-479705195CEF}"
@@ -32,8 +28,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") =
"Apache.Arrow.Adbc.Drivers.I
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") =
"Apache.Arrow.Adbc.Tests.Drivers.Interop.Snowflake",
"test\Drivers\Interop\Snowflake\Apache.Arrow.Adbc.Tests.Drivers.Interop.Snowflake.csproj",
"{8BE1EECC-3ACF-41B2-AF7D-1A67196FF6C7}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apache.Arrow.Flight",
"src\arrow\csharp\src\Apache.Arrow.Flight\Apache.Arrow.Flight.csproj",
"{0F41F702-A691-4E51-96A9-DF9813E47D8F}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -44,10 +38,6 @@ Global
{232F2EC7-5FD3-4E0B-89FF-317A15CF698F}.Debug|Any CPU.Build.0 =
Debug|Any CPU
{232F2EC7-5FD3-4E0B-89FF-317A15CF698F}.Release|Any
CPU.ActiveCfg = Release|Any CPU
{232F2EC7-5FD3-4E0B-89FF-317A15CF698F}.Release|Any CPU.Build.0
= Release|Any CPU
- {851FBF0D-21A8-4C04-A040-24B6AAE31D2C}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
- {851FBF0D-21A8-4C04-A040-24B6AAE31D2C}.Debug|Any CPU.Build.0 =
Debug|Any CPU
- {851FBF0D-21A8-4C04-A040-24B6AAE31D2C}.Release|Any
CPU.ActiveCfg = Release|Any CPU
- {851FBF0D-21A8-4C04-A040-24B6AAE31D2C}.Release|Any CPU.Build.0
= Release|Any CPU
{00C143BA-F1CF-4117-9DE6-E73DC4D208F8}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
{00C143BA-F1CF-4117-9DE6-E73DC4D208F8}.Debug|Any CPU.Build.0 =
Debug|Any CPU
{00C143BA-F1CF-4117-9DE6-E73DC4D208F8}.Release|Any
CPU.ActiveCfg = Release|Any CPU
@@ -80,16 +70,11 @@ Global
{8BE1EECC-3ACF-41B2-AF7D-1A67196FF6C7}.Debug|Any CPU.Build.0 =
Debug|Any CPU
{8BE1EECC-3ACF-41B2-AF7D-1A67196FF6C7}.Release|Any
CPU.ActiveCfg = Release|Any CPU
{8BE1EECC-3ACF-41B2-AF7D-1A67196FF6C7}.Release|Any CPU.Build.0
= Release|Any CPU
- {0F41F702-A691-4E51-96A9-DF9813E47D8F}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
- {0F41F702-A691-4E51-96A9-DF9813E47D8F}.Debug|Any CPU.Build.0 =
Debug|Any CPU
- {0F41F702-A691-4E51-96A9-DF9813E47D8F}.Release|Any
CPU.ActiveCfg = Release|Any CPU
- {0F41F702-A691-4E51-96A9-DF9813E47D8F}.Release|Any CPU.Build.0
= Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {851FBF0D-21A8-4C04-A040-24B6AAE31D2C} =
{9ADA26E0-F328-4466-908A-2FA506DBDF7D}
{00C143BA-F1CF-4117-9DE6-E73DC4D208F8} =
{5BD04C26-CE52-4893-8C1A-479705195CEF}
{19AA450A-2F87-49BD-9122-8AD07D4C6DCE} =
{FEB257A0-4FD3-495E-9A47-9E1649755445}
{C7290227-E925-47E7-8B6B-A8B171645D58} =
{5BD04C26-CE52-4893-8C1A-479705195CEF}
@@ -99,7 +84,6 @@ Global
{EA43BB7C-BC00-4701-BDF4-367880C2495C} =
{C7290227-E925-47E7-8B6B-A8B171645D58}
{30024B6F-7BC1-4574-BE5A-924FBD6EAF83} =
{FEB257A0-4FD3-495E-9A47-9E1649755445}
{8BE1EECC-3ACF-41B2-AF7D-1A67196FF6C7} =
{C7290227-E925-47E7-8B6B-A8B171645D58}
- {0F41F702-A691-4E51-96A9-DF9813E47D8F} =
{9ADA26E0-F328-4466-908A-2FA506DBDF7D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4795CF16-0FDB-4BE0-9768-5CF31564DC03}
diff --git a/csharp/src/Apache.Arrow.Adbc/Apache.Arrow.Adbc.csproj
b/csharp/src/Apache.Arrow.Adbc/Apache.Arrow.Adbc.csproj
index 358eca01..675bf951 100644
--- a/csharp/src/Apache.Arrow.Adbc/Apache.Arrow.Adbc.csproj
+++ b/csharp/src/Apache.Arrow.Adbc/Apache.Arrow.Adbc.csproj
@@ -6,7 +6,7 @@
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>
<ItemGroup>
- <ProjectReference
Include="..\arrow\csharp\src\Apache.Arrow\Apache.Arrow.csproj" />
+ <PackageReference Include="Apache.Arrow" Version="15.0.0" />
</ItemGroup>
<ItemGroup
Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework),
'net5.0'))">
<Compile Remove="C\NativeLibrary.cs" />
diff --git
a/csharp/src/Drivers/FlightSql/Apache.Arrow.Adbc.Drivers.FlightSql.csproj
b/csharp/src/Drivers/FlightSql/Apache.Arrow.Adbc.Drivers.FlightSql.csproj
index 61a38ffb..18b59aea 100644
--- a/csharp/src/Drivers/FlightSql/Apache.Arrow.Adbc.Drivers.FlightSql.csproj
+++ b/csharp/src/Drivers/FlightSql/Apache.Arrow.Adbc.Drivers.FlightSql.csproj
@@ -4,9 +4,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0"
Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'" />
+ <PackageReference Include="Apache.Arrow.Flight" Version="15.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference
Include="..\..\Apache.Arrow.Adbc\Apache.Arrow.Adbc.csproj" />
- <ProjectReference
Include="..\..\arrow\csharp\src\Apache.Arrow.Flight\Apache.Arrow.Flight.csproj"
/>
</ItemGroup>
</Project>
diff --git a/csharp/src/arrow b/csharp/src/arrow
deleted file mode 160000
index c5a1eb01..00000000
--- a/csharp/src/arrow
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c5a1eb01631f770dd7b3a6ecf309022d34af4c1c
