Skip to content

Commit

Permalink
Exclude cloud providers from driver.
Browse files Browse the repository at this point in the history
Move logic to Snowflake.Data.Core to only have compile dependencies to cloud providers.
Add projects for dependencies nuget generation for each cloud provider.
  • Loading branch information
sfc-gh-jmartinezramirez committed Apr 23, 2024
1 parent 14cf8a5 commit b0470f6
Show file tree
Hide file tree
Showing 108 changed files with 216 additions and 72 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Title>Snowflake.Data.AWS.Dependencies</Title>
<PackageId>Snowflake.Data.AWS.Dependencies</PackageId>
<Description>Snowflake Connector AWS dependencies for .NET</Description>
<PackageLicenseUrl>https://github.com/snowflakedb/snowflake-connector-net/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/snowflakedb/snowflake-connector-net</PackageProjectUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageIconUrl>https://raw.githubusercontent.com/snowflakedb/snowflake-connector-net/master/Snowflake.Data/snowflake.ico</PackageIconUrl>
<Company>Snowflake Computing, Inc</Company>
<Product>Snowflake Connector for .NET</Product>
<Authors>Snowflake</Authors>
<Copyright>Copyright (c) 2012-2024 Snowflake Computing Inc. All rights reserved.</Copyright>
<Version>3.1.1</Version>
<DebugType>Full</DebugType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.S3" Version="3.7.0.4" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Title>Snowflake.Data.Azure.Dependencies</Title>
<PackageId>Snowflake.Data.Azure.Dependencies</PackageId>
<Description>Snowflake Connector Azure dependencies for .NET</Description>
<PackageLicenseUrl>https://github.com/snowflakedb/snowflake-connector-net/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/snowflakedb/snowflake-connector-net</PackageProjectUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageIconUrl>https://raw.githubusercontent.com/snowflakedb/snowflake-connector-net/master/Snowflake.Data/snowflake.ico</PackageIconUrl>
<Company>Snowflake Computing, Inc</Company>
<Product>Snowflake Connector for .NET</Product>
<Authors>Snowflake</Authors>
<Copyright>Copyright (c) 2012-2024 Snowflake Computing Inc. All rights reserved.</Copyright>
<Version>3.1.1</Version>
<DebugType>Full</DebugType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
</ItemGroup>

</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
79 changes: 79 additions & 0 deletions Snowflake.Data.Core/Snowflake.Data.Core.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net471;net472</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0</TargetFrameworks>
<Title>Snowflake.Data.Core</Title>
<PackageId>Snowflake.Data.Core</PackageId>
<Description>Snowflake Connector Core for .NET</Description>
<PackageLicenseUrl>https://github.com/snowflakedb/snowflake-connector-net/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/snowflakedb/snowflake-connector-net</PackageProjectUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageIconUrl>https://raw.githubusercontent.com/snowflakedb/snowflake-connector-net/master/Snowflake.Data/snowflake.ico</PackageIconUrl>
<Description>Snowflake Connector Core for .NET</Description>
<Company>Snowflake Computing, Inc</Company>
<Product>Snowflake Connector for .NET</Product>
<Authors>howryu, tchen</Authors>
<Copyright>Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.</Copyright>
<Version>3.1.1</Version>
<DebugType>Full</DebugType>
<LangVersion>7.3</LangVersion>
<RootNamespace>Snowflake.Data</RootNamespace>
</PropertyGroup>

<ItemGroup>

<PackageReference Include="AWSSDK.S3" Version="3.7.0.4" >
<ExcludeAssets>Runtime,Build,Native,Analyzers,BuildTransitive</ExcludeAssets>
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
<PackageReference Include="Google.Cloud.Storage.V1" Version="4.6.0">
<ExcludeAssets>Runtime,Build,Native,Analyzers,BuildTransitive</ExcludeAssets>
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" >
<ExcludeAssets>Runtime,Build,Native,Analyzers,BuildTransitive</ExcludeAssets>
<IncludeAssets>compile</IncludeAssets>
</PackageReference>
<PackageReference Include="Apache.Arrow" Version="14.0.2" />
<PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="log4net" Version="2.0.12" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.2.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' != 'Release'">
<InternalsVisibleTo Include="Snowflake.Data.Tests" />
<!--needed by Moq to be able to mock internal interfaces-->
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
</ItemGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>full</DebugType>
<DebugSymbols>True</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>full</DebugType>
<DebugSymbols>True</DebugSymbols>
</PropertyGroup>

<PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<AssemblyVersion>$(Version)</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Title>Snowflake.Data.GCP.Dependencies</Title>
<PackageId>Snowflake.Data.GCP.Dependencies</PackageId>
<Description>Snowflake Connector GCP dependencies for .NET</Description>
<PackageLicenseUrl>https://github.com/snowflakedb/snowflake-connector-net/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/snowflakedb/snowflake-connector-net</PackageProjectUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageIconUrl>https://raw.githubusercontent.com/snowflakedb/snowflake-connector-net/master/Snowflake.Data/snowflake.ico</PackageIconUrl>
<Company>Snowflake Computing, Inc</Company>
<Product>Snowflake Connector for .NET</Product>
<Authors>Snowflake</Authors>
<Copyright>Copyright (c) 2012-2024 Snowflake Computing Inc. All rights reserved.</Copyright>
<Version>3.1.1</Version>
<DebugType>Full</DebugType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Google.Cloud.Storage.V1" Version="4.6.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Snowflake.Data.Tests/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ Copyright (c) 2012-2017 Snowflake Computing Inc. All rights reserved.
<system.data>
<DbProviderFactories>
<add name="Snowflake" invariant="Snowflake.Data"
type="Snowflake.Data.Client.SnowflakeDbFactory, Snowflake.Data, Culture=neutral, PublicKeyToken=null"
type="Snowflake.Data.Client.SnowflakeDbFactory, Snowflake.Data.Core, Culture=neutral, PublicKeyToken=null"
description="Snowflake Provider" />
</DbProviderFactories>
</system.data>

<!--
<!--
=========== Enable Network debug log ===============
<system.diagnostics>
<sources>
Expand Down
5 changes: 4 additions & 1 deletion Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
<PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<ProjectReference Include="..\Snowflake.Data\Snowflake.Data.csproj" />
<ProjectReference Include="..\Snowflake.Data.AWS.Dependencies\Snowflake.Data.AWS.Dependencies.csproj" />
<ProjectReference Include="..\Snowflake.Data.Azure.Dependencies\Snowflake.Data.Azure.Dependencies.csproj" />
<ProjectReference Include="..\Snowflake.Data.GCP.Dependencies\Snowflake.Data.GCP.Dependencies.csproj" />
<ProjectReference Include="..\Snowflake.Data.Core\Snowflake.Data.Core.csproj" />
</ItemGroup>
<Target Name="CopyCustomContent" AfterTargets="AfterBuild">
<Copy SourceFiles="parameters.json" DestinationFolder="$(OutDir)" />
Expand Down
99 changes: 31 additions & 68 deletions Snowflake.Data/Snowflake.Data.csproj
Original file line number Diff line number Diff line change
@@ -1,68 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net471;net472</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0</TargetFrameworks>
<Title>Snowflake.Data</Title>
<PackageId>Snowflake.Data</PackageId>
<PackageLicenseUrl>https://github.com/snowflakedb/snowflake-connector-net/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/snowflakedb/snowflake-connector-net</PackageProjectUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageIconUrl>https://raw.githubusercontent.com/snowflakedb/snowflake-connector-net/master/Snowflake.Data/snowflake.ico</PackageIconUrl>
<Description>Snowflake Connector for .NET</Description>
<Company>Snowflake Computing, Inc</Company>
<Product>Snowflake Connector for .NET</Product>
<Authors>howryu, tchen</Authors>
<Copyright>Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.</Copyright>
<Version>3.1.0</Version>
<DebugType>Full</DebugType>
<LangVersion>7.3</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Apache.Arrow" Version="14.0.2" />
<PackageReference Include="AWSSDK.S3" Version="3.7.0.4" />
<PackageReference Include="Google.Cloud.Storage.V1" Version="4.6.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
<PackageReference Include="Azure.Storage.Common" Version="12.12.0" />
<PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="log4net" Version="2.0.12" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.2.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' != 'Release'">
<InternalsVisibleTo Include="Snowflake.Data.Tests" />
<!--needed by Moq to be able to mock internal interfaces-->
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
</ItemGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>full</DebugType>
<DebugSymbols>True</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>full</DebugType>
<DebugSymbols>True</DebugSymbols>
</PropertyGroup>

<PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<AssemblyVersion>$(Version)</AssemblyVersion>
</PropertyGroup>

<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net471;net472</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0</TargetFrameworks>
<Title>Snowflake.Data</Title>
<PackageId>Snowflake.Data</PackageId>
<Description>Snowflake Connector for .NET</Description>
<PackageLicenseUrl>https://github.com/snowflakedb/snowflake-connector-net/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/snowflakedb/snowflake-connector-net</PackageProjectUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageIconUrl>https://raw.githubusercontent.com/snowflakedb/snowflake-connector-net/master/Snowflake.Data/snowflake.ico</PackageIconUrl>
<Description>Snowflake Connector for .NET</Description>
<Company>Snowflake Computing, Inc</Company>
<Product>Snowflake Connector for .NET</Product>
<Authors>howryu, tchen</Authors>
<Copyright>Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.</Copyright>
<Version>3.1.1</Version>
<DebugType>Full</DebugType>
<LangVersion>7.3</LangVersion>
<RootNamespace>Snowflake.Data</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Snowflake.Data.AWS.Dependencies\Snowflake.Data.AWS.Dependencies.csproj" />
<ProjectReference Include="..\Snowflake.Data.Azure.Dependencies\Snowflake.Data.Azure.Dependencies.csproj" />
<ProjectReference Include="..\Snowflake.Data.Core\Snowflake.Data.Core.csproj" />
<ProjectReference Include="..\Snowflake.Data.GCP.Dependencies\Snowflake.Data.GCP.Dependencies.csproj" />
</ItemGroup>

</Project>
26 changes: 25 additions & 1 deletion snowflake-connector-net.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.168
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Snowflake.Data", "Snowflake.Data\Snowflake.Data.csproj", "{3E6328DD-E284-4F23-B55A-472BB7EA2C25}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Snowflake.Data.Core", "Snowflake.Data.Core\Snowflake.Data.Core.csproj", "{3E6328DD-E284-4F23-B55A-472BB7EA2C25}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Snowflake.Data.Tests", "Snowflake.Data.Tests\Snowflake.Data.Tests.csproj", "{97E793E8-62A4-4FF2-9406-F5277269EEC2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snowflake.Data.AWS.Dependencies", "Snowflake.Data.AWS.Dependencies\Snowflake.Data.AWS.Dependencies.csproj", "{0D406F90-2763-400D-A442-0D04ADEAFA81}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snowflake.Data.Azure.Dependencies", "Snowflake.Data.Azure.Dependencies\Snowflake.Data.Azure.Dependencies.csproj", "{731CF7F1-62D2-4602-A2F1-4104CEB57E9C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snowflake.Data.GCP.Dependencies", "Snowflake.Data.GCP.Dependencies\Snowflake.Data.GCP.Dependencies.csproj", "{82B14CB0-7071-42C4-8921-D885BD3C923F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snowflake.Data", "Snowflake.Data\Snowflake.Data.csproj", "{E226DF7B-916D-45F6-9984-4C22E0B8A60C}"
EndProject
Global
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
Expand All @@ -24,6 +32,22 @@ Global
{97E793E8-62A4-4FF2-9406-F5277269EEC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{97E793E8-62A4-4FF2-9406-F5277269EEC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{97E793E8-62A4-4FF2-9406-F5277269EEC2}.Release|Any CPU.Build.0 = Release|Any CPU
{0D406F90-2763-400D-A442-0D04ADEAFA81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0D406F90-2763-400D-A442-0D04ADEAFA81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0D406F90-2763-400D-A442-0D04ADEAFA81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0D406F90-2763-400D-A442-0D04ADEAFA81}.Release|Any CPU.Build.0 = Release|Any CPU
{731CF7F1-62D2-4602-A2F1-4104CEB57E9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{731CF7F1-62D2-4602-A2F1-4104CEB57E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{731CF7F1-62D2-4602-A2F1-4104CEB57E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{731CF7F1-62D2-4602-A2F1-4104CEB57E9C}.Release|Any CPU.Build.0 = Release|Any CPU
{82B14CB0-7071-42C4-8921-D885BD3C923F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{82B14CB0-7071-42C4-8921-D885BD3C923F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82B14CB0-7071-42C4-8921-D885BD3C923F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82B14CB0-7071-42C4-8921-D885BD3C923F}.Release|Any CPU.Build.0 = Release|Any CPU
{E226DF7B-916D-45F6-9984-4C22E0B8A60C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E226DF7B-916D-45F6-9984-4C22E0B8A60C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E226DF7B-916D-45F6-9984-4C22E0B8A60C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E226DF7B-916D-45F6-9984-4C22E0B8A60C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit b0470f6

Please sign in to comment.