CurtHagenlocher commented on code in PR #1730:
URL: https://github.com/apache/arrow-adbc/pull/1730#discussion_r1575330638
##########
csharp/src/Drivers/Interop/Snowflake/Apache.Arrow.Adbc.Drivers.Interop.Snowflake.csproj:
##########
@@ -3,36 +3,60 @@
<TargetFrameworks>netstandard2.0;net472;net6.0</TargetFrameworks>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>
+
<!-- use Build-SnowflakeDriver.ps1 to build the dll -->
- <Target Name="PreBuild" BeforeTargets="PreBuildEvent"
Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+ <Target Name="PreBuild_Win" BeforeTargets="PreBuildEvent"
Condition="$([MSBuild]::IsOSPlatform('Windows'))">
<Exec Command="powershell -ExecutionPolicy Unrestricted -File
$(ProjectDir)Build-SnowflakeDriver.ps1" />
</Target>
- <!-- libadbc_driver_snowflake.dll is listed for each framework because
$(TargetFramework) doesn't work here -->
+ <!-- use copySnowflakeDriver.sh to move all the platform binaries when used
in the pipeline -->
+ <Target Name="PreBuild_Linux" BeforeTargets="PreBuildEvent"
Condition="$([MSBuild]::IsOSPlatform('Linux'))">
+ <Exec Command="bash $(ProjectDir)copySnowflakeDriver.sh" />
+ </Target>
+
<ItemGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
- <Content Include="libadbc_driver_snowflake.dll">
+ <Content Include="readme.md">
<Pack>true</Pack>
- <PackagePath>lib\netstandard2.0</PackagePath>
+ <PackagePath>/</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="libadbc_driver_snowflake.dll">
<Pack>true</Pack>
- <PackagePath>lib\net472</PackagePath>
+ <PackagePath>runtime/win-x64/native</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="libadbc_driver_snowflake.dll">
+ </ItemGroup>
+
+ <!-- What runs in the pipeline. Assumes the Go builds have happened. -->
+ <ItemGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
+ <Content Include="readme.md">
<Pack>true</Pack>
- <PackagePath>lib\net6.0</PackagePath>
+ <PackagePath>/</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- </ItemGroup>
- <ItemGroup>
- <Content Include="readme.md">
+
+ <!-- Windows/DLLs -->
+ <Content Include="libadbc_driver_snowflake.dll"
Condition="Exists('libadbc_driver_snowflake.dll')">
+ <Pack>true</Pack>
+ <PackagePath>runtimes/win-x64/native</PackagePath>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+
+ <!-- Linux/so -->
+ <Content Include="libadbc_driver_snowflake.so"
Condition="Exists('libadbc_driver_snowflake.so')">
<Pack>true</Pack>
- <PackagePath>\</PackagePath>
+ <PackagePath>runtimes/linux-x64/native</PackagePath>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+
+ <!-- Mac/dylib -->
+ <Content Include="libadbc_driver_snowflake.dylib"
Condition="Exists('libadbc_driver_snowflake.dylib')">
+ <Pack>true</Pack>
+ <PackagePath>runtimems/osx-64/runtimes</PackagePath>
Review Comment:
`osx-64` should be `osx-x64`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
