You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by li...@apache.org on 2023/06/20 19:48:00 UTC

[arrow-adbc] branch main updated: fix(csharp): submodule not pulling correctly (#824)

This is an automated email from the ASF dual-hosted git repository.

lidavidm 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 2f8a6a6e fix(csharp): submodule not pulling correctly (#824)
2f8a6a6e is described below

commit 2f8a6a6e77b4520a7fd1089edb8a5c32fed15cfd
Author: davidhcoe <da...@microsoft.com>
AuthorDate: Tue Jun 20 15:47:55 2023 -0400

    fix(csharp): submodule not pulling correctly (#824)
    
    - submodule was not setup correctly
    - pattern matching for csproj and sln files
---
 csharp/.gitmodules => .gitmodules | 7 +++----
 dev/release/rat_exclude_files.txt | 7 ++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/csharp/.gitmodules b/.gitmodules
similarity index 88%
rename from csharp/.gitmodules
rename to .gitmodules
index 3d9ea4ba..e6b49697 100644
--- a/csharp/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-[submodule "arrow"]
-	path = arrow
-	url = https://github.com/apache/arrow
-	branch = main
+[submodule "csharp/src/arrow"]
+	path = csharp/src/arrow
+	url = https://github.com/apache/arrow.git
diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
index 5dce6858..d9713c90 100644
--- a/dev/release/rat_exclude_files.txt
+++ b/dev/release/rat_exclude_files.txt
@@ -7,11 +7,8 @@ ci/conda/.ci_support/*
 ci/conda/.gitattributes
 ci/linux-packages/changelog
 ci/linux-packages/*.install
-csharp/Apache.Arrow.Adbc.sln
-csharp/src/Apache.Arrow.Adbc.FlightSql/Apache.Arrow.Adbc.FlightSql.csproj
-csharp/src/Apache.Arrow.Adbc/Apache.Arrow.Adbc.csproj
-csharp/test/Apache.Arrow.Adbc.FlightSql.Tests/Apache.Arrow.Adbc.FlightSql.Tests.csproj
-csharp/test/Apache.Arrow.Adbc.Tests/Apache.Arrow.Adbc.Tests.csproj
+csharp/*.sln
+csharp/*.csproj
 dev/release/rat_exclude_files.txt
 docs/source/format/*.drawio
 docs/source/format/*.svg