From 7bbfe38fb9c30d4cb0da0ba94c0459522f277a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Thu, 22 Jan 2026 15:39:41 +0100
Subject: [PATCH] chore: import SpannerLib in ado as submodule

---
 spannerlib/wrappers/spannerlib-dotnet/.gitignore       |  1 +
 .../wrappers/spannerlib-dotnet/build-grpc-server.sh    |  6 +++---
 spannerlib/wrappers/spannerlib-dotnet/build.sh         |  2 ++
 .../spannerlib-dotnet-grpc-impl.csproj                 |  2 +-
 .../spannerlib-dotnet-grpc-server.csproj               | 10 +++++-----
 .../spannerlib-dotnet-grpc-tests.csproj                |  1 +
 .../spannerlib-dotnet-tests.csproj                     |  1 +
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/spannerlib/wrappers/spannerlib-dotnet/.gitignore b/spannerlib/wrappers/spannerlib-dotnet/.gitignore
index 0f52e2c5b..1732425d6 100644
--- a/spannerlib/wrappers/spannerlib-dotnet/.gitignore
+++ b/spannerlib/wrappers/spannerlib-dotnet/.gitignore
@@ -3,3 +3,4 @@ obj
 bin
 *DotSettings.user
 binaries
+runtimes
diff --git a/spannerlib/wrappers/spannerlib-dotnet/build-grpc-server.sh b/spannerlib/wrappers/spannerlib-dotnet/build-grpc-server.sh
index b4aedb360..757478fc6 100755
--- a/spannerlib/wrappers/spannerlib-dotnet/build-grpc-server.sh
+++ b/spannerlib/wrappers/spannerlib-dotnet/build-grpc-server.sh
@@ -9,15 +9,15 @@ copy_binary() {
   local platform=$1 # e.g., osx-arm64
   local ext=${2:-}
   local src_dir="../../grpc-server/binaries/${platform}"
-  local dest_dir="spannerlib-dotnet-grpc-server/binaries/${platform}"
+  local dest_dir="spannerlib-dotnet-grpc-server/runtimes/${platform}/native"
   local filename="spannerlib_grpc_server${ext}"
 
   mkdir -p "${dest_dir}"
   cp "${src_dir}/${filename}" "${dest_dir}/${filename}"
 }
 
-mkdir -p spannerlib-dotnet-grpc-server/binaries/any
-rm spannerlib-dotnet-grpc-server/binaries/any/spannerlib_grpc_server 2> /dev/null
+mkdir -p spannerlib-dotnet-grpc-server/runtimes/any/native
+rm spannerlib-dotnet-grpc-server/runtimes/any/native/spannerlib_grpc_server 2> /dev/null
 
 copy_binary "osx-arm64"
 copy_binary "linux-x64"
diff --git a/spannerlib/wrappers/spannerlib-dotnet/build.sh b/spannerlib/wrappers/spannerlib-dotnet/build.sh
index 2e71a82d2..029588795 100755
--- a/spannerlib/wrappers/spannerlib-dotnet/build.sh
+++ b/spannerlib/wrappers/spannerlib-dotnet/build.sh
@@ -39,6 +39,8 @@ echo "Skip windows: $SKIP_WINDOWS"
 # Remove existing builds
 rm -r ./spannerlib-dotnet-native/libraries 2> /dev/null
 rm -r ./spannerlib-dotnet-grpc-server/binaries 2> /dev/null
+rm -r ./spannerlib-dotnet-native/runtimes 2> /dev/null
+rm -r ./spannerlib-dotnet-grpc-server/runtimes 2> /dev/null
 rm -r ./*/bin 2> /dev/null
 rm -r ./*/obj 2> /dev/null
 # Remove all local nuget packages to force the use of the new ones that will be built in this script.
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-impl/spannerlib-dotnet-grpc-impl.csproj b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-impl/spannerlib-dotnet-grpc-impl.csproj
index 11f323522..6bf450fa0 100644
--- a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-impl/spannerlib-dotnet-grpc-impl.csproj
+++ b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-impl/spannerlib-dotnet-grpc-impl.csproj
@@ -12,10 +12,10 @@
 
   <ItemGroup>
     <PackageReference Include="ConfigureAwaitChecker.Analyzer" PrivateAssets="All" Version="5.0.0.1" />
-    <PackageReference Include="Alpha.Google.Cloud.SpannerLib.GrpcServer" Version="1.0.0-alpha.20260119112406" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\spannerlib-dotnet-grpc-server\spannerlib-dotnet-grpc-server.csproj" PrivateAssets="All" />
     <ProjectReference Include="..\spannerlib-dotnet-grpc-v1\spannerlib-dotnet-grpc-v1.csproj" />
     <ProjectReference Include="..\spannerlib-dotnet\spannerlib-dotnet.csproj" />
   </ItemGroup>
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-server/spannerlib-dotnet-grpc-server.csproj b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-server/spannerlib-dotnet-grpc-server.csproj
index 32cdb91b0..c15c1f2c7 100644
--- a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-server/spannerlib-dotnet-grpc-server.csproj
+++ b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-server/spannerlib-dotnet-grpc-server.csproj
@@ -16,10 +16,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="binaries/any/*" Pack="true" PackagePath="runtimes/any/native/" />
-    <None Include="binaries/linux-x64/*" Pack="true" PackagePath="runtimes/linux-x64/native/" />
-    <None Include="binaries/linux-arm64/*" Pack="true" PackagePath="runtimes/linux-arm64/native/" />
-    <None Include="binaries/osx-arm64/*" Pack="true" PackagePath="runtimes/osx-arm64/native/" />
-    <None Include="binaries/win-x64/*" Pack="true" PackagePath="runtimes/win-x64/native/" />
+    <None Include="runtimes/any/native/*" Pack="true" PackagePath="runtimes/any/native/" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="runtimes/linux-x64/native/*" Pack="true" PackagePath="runtimes/linux-x64/native/" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="runtimes/linux-arm64/native/*" Pack="true" PackagePath="runtimes/linux-arm64/native/" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="runtimes/osx-arm64/native/*" Pack="true" PackagePath="runtimes/osx-arm64/native/" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="runtimes/win-x64/native/*" Pack="true" PackagePath="runtimes/win-x64/native/" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 </Project>
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-tests/spannerlib-dotnet-grpc-tests.csproj b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-tests/spannerlib-dotnet-grpc-tests.csproj
index dd920a169..6a18964b5 100644
--- a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-tests/spannerlib-dotnet-grpc-tests.csproj
+++ b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-tests/spannerlib-dotnet-grpc-tests.csproj
@@ -24,6 +24,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\spannerlib-dotnet-grpc-impl\spannerlib-dotnet-grpc-impl.csproj" />
+    <ProjectReference Include="..\spannerlib-dotnet-grpc-server\spannerlib-dotnet-grpc-server.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-tests/spannerlib-dotnet-tests.csproj b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-tests/spannerlib-dotnet-tests.csproj
index c7db7956d..af0ac403a 100644
--- a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-tests/spannerlib-dotnet-tests.csproj
+++ b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-tests/spannerlib-dotnet-tests.csproj
@@ -25,6 +25,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\spannerlib-dotnet-grpc-impl\spannerlib-dotnet-grpc-impl.csproj" />
+    <ProjectReference Include="..\spannerlib-dotnet-grpc-server\spannerlib-dotnet-grpc-server.csproj" />
     <ProjectReference Include="..\spannerlib-dotnet-mockserver\spannerlib-dotnet-mockserver.csproj" />
     <ProjectReference Include="..\spannerlib-dotnet-native-impl\spannerlib-dotnet-native-impl.csproj" />
   </ItemGroup>