From 95f1e230bb41beb455937c76cbfa6b69fc327781 Mon Sep 17 00:00:00 2001
From: Juan Martinez Ramirez <juan.martinezramirez@snowflake.com>
Date: Tue, 9 Apr 2024 15:41:23 -0600
Subject: [PATCH 1/7] POC to generate conditional build for exclude cloud
 providers.

---
 Snowflake.Data/Snowflake.Data.csproj | 46 +++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/Snowflake.Data/Snowflake.Data.csproj b/Snowflake.Data/Snowflake.Data.csproj
index 0621c5fb0..0a37fc2d9 100644
--- a/Snowflake.Data/Snowflake.Data.csproj
+++ b/Snowflake.Data/Snowflake.Data.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;net471;net472</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0</TargetFrameworks>
-    <Title>Snowflake.Data</Title>
-    <PackageId>Snowflake.Data</PackageId>
+    <ExcludeProviderDependencies Condition="'$(ExcludeProviderDependencies)'==''">false</ExcludeProviderDependencies>
     <PackageLicenseUrl>https://github.com/snowflakedb/snowflake-connector-net/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/snowflakedb/snowflake-connector-net</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -17,13 +16,50 @@
     <DebugType>Full</DebugType>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Apache.Arrow" Version="14.0.2" />
+
+  <PropertyGroup Condition="'$(ExcludeProviderDependencies)'=='false'">
+    <Title>Snowflake.Data</Title>
+    <PackageId>Snowflake.Data</PackageId>
+    <Description>Snowflake Connector for .NET</Description>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(ExcludeProviderDependencies)'=='true'">
+    <Title>Snowflake.Data.Core</Title>
+    <PackageId>Snowflake.Data.Core</PackageId>
+    <Description>Snowflake Connector for .NET</Description>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(ExcludeProviderDependencies)'=='true'">
+
+    <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="Azure.Storage.Common" Version="12.12.0" >
+      <ExcludeAssets>Runtime,Build,Native,Analyzers,BuildTransitive</ExcludeAssets>
+      <IncludeAssets>compile</IncludeAssets>
+    </PackageReference>
+
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(ExcludeProviderDependencies)'=='false'">
+
     <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" />
+
+  </ItemGroup>
+  
+  <ItemGroup>
+    <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" />

From bf7a7220c2e04313a344bb9f8f08c22fc99b846a Mon Sep 17 00:00:00 2001
From: Juan Martinez Ramirez <juan.martinezramirez@snowflake.com>
Date: Fri, 12 Apr 2024 18:16:34 -0600
Subject: [PATCH 2/7] Nuspec for AWS dependencies

This requires using Nuget.exe to be generated using the next command:
nuget.exe pack snowflake.data.aws.nuspec -Exclude **
---
 Snowflake.Data/snowflake.data.aws.nuspec | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100755 Snowflake.Data/snowflake.data.aws.nuspec

diff --git a/Snowflake.Data/snowflake.data.aws.nuspec b/Snowflake.Data/snowflake.data.aws.nuspec
new file mode 100755
index 000000000..03ffff8b1
--- /dev/null
+++ b/Snowflake.Data/snowflake.data.aws.nuspec
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>Snowflake.Data.AWS</id>
+    <version>3.1.0</version>
+    <title>Snowflake.Data.AWS</title>
+    <authors>howryu, tchen</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <licenseUrl>https://github.com/snowflakedb/snowflake-connector-net/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/snowflakedb/snowflake-connector-net</projectUrl>
+    <iconUrl>https://raw.githubusercontent.com/snowflakedb/snowflake-connector-net/master/Snowflake.Data/snowflake.ico</iconUrl>
+    <description>Snowflake Connector for .NET</description>
+    <copyright>Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.</copyright>
+    <dependencies>
+      <group targetFramework="net6.0">
+        <dependency id="AWSSDK.S3" version="3.7.0.4" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>
+  </metadata>
+</package>
\ No newline at end of file

From acb67ce3da5c17ef6e900739652c98e36e8174da Mon Sep 17 00:00:00 2001
From: Juan Martinez Ramirez <juan.martinezramirez@snowflake.com>
Date: Wed, 17 Apr 2024 10:03:42 -0600
Subject: [PATCH 3/7] Moved nuspec to providers folder

---
 .../Snowflake.Data.AWS.Dependencies.nuspec}            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename Snowflake.Data/{snowflake.data.aws.nuspec => providers/Snowflake.Data.AWS.Dependencies.nuspec} (75%)
 mode change 100755 => 100644

diff --git a/Snowflake.Data/snowflake.data.aws.nuspec b/Snowflake.Data/providers/Snowflake.Data.AWS.Dependencies.nuspec
old mode 100755
new mode 100644
similarity index 75%
rename from Snowflake.Data/snowflake.data.aws.nuspec
rename to Snowflake.Data/providers/Snowflake.Data.AWS.Dependencies.nuspec
index 03ffff8b1..d078d42e1
--- a/Snowflake.Data/snowflake.data.aws.nuspec
+++ b/Snowflake.Data/providers/Snowflake.Data.AWS.Dependencies.nuspec
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
-    <id>Snowflake.Data.AWS</id>
+    <id>Snowflake.Data.AWS.Dependencies</id>
     <version>3.1.0</version>
-    <title>Snowflake.Data.AWS</title>
-    <authors>howryu, tchen</authors>
+    <title>Snowflake.Data.AWS.Dependencies</title>
+    <authors>Snowflake</authors>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <licenseUrl>https://github.com/snowflakedb/snowflake-connector-net/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://github.com/snowflakedb/snowflake-connector-net</projectUrl>
     <iconUrl>https://raw.githubusercontent.com/snowflakedb/snowflake-connector-net/master/Snowflake.Data/snowflake.ico</iconUrl>
-    <description>Snowflake Connector for .NET</description>
+    <description>Snowflake Connector AWS dependencies for .NET</description>
     <copyright>Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.</copyright>
     <dependencies>
-      <group targetFramework="net6.0">
+      <group targetFramework="netstandard2.0">
         <dependency id="AWSSDK.S3" version="3.7.0.4" exclude="Build,Analyzers" />
       </group>
     </dependencies>

From 321ddeaef68bcf1d5b5b49ef76a9c271889d8b5c Mon Sep 17 00:00:00 2001
From: Juan Martinez Ramirez <juan.martinezramirez@snowflake.com>
Date: Wed, 17 Apr 2024 10:04:54 -0600
Subject: [PATCH 4/7] Removed conditional build

---
 Snowflake.Data/Snowflake.Data.csproj | 32 +++++-----------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/Snowflake.Data/Snowflake.Data.csproj b/Snowflake.Data/Snowflake.Data.csproj
index 0a37fc2d9..e04f8d0cf 100644
--- a/Snowflake.Data/Snowflake.Data.csproj
+++ b/Snowflake.Data/Snowflake.Data.csproj
@@ -2,7 +2,9 @@
   <PropertyGroup>
     <TargetFrameworks>net6.0;net471;net472</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0</TargetFrameworks>
-    <ExcludeProviderDependencies Condition="'$(ExcludeProviderDependencies)'==''">false</ExcludeProviderDependencies>
+    <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>
@@ -16,19 +18,8 @@
     <DebugType>Full</DebugType>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(ExcludeProviderDependencies)'=='false'">
-    <Title>Snowflake.Data</Title>
-    <PackageId>Snowflake.Data</PackageId>
-    <Description>Snowflake Connector for .NET</Description>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(ExcludeProviderDependencies)'=='true'">
-    <Title>Snowflake.Data.Core</Title>
-    <PackageId>Snowflake.Data.Core</PackageId>
-    <Description>Snowflake Connector for .NET</Description>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(ExcludeProviderDependencies)'=='true'">
+  
+  <ItemGroup>
 
     <PackageReference Include="AWSSDK.S3" Version="3.7.0.4" >
       <ExcludeAssets>Runtime,Build,Native,Analyzers,BuildTransitive</ExcludeAssets>
@@ -46,19 +37,6 @@
       <ExcludeAssets>Runtime,Build,Native,Analyzers,BuildTransitive</ExcludeAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>
-
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(ExcludeProviderDependencies)'=='false'">
-
-    <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" />
-
-  </ItemGroup>
-  
-  <ItemGroup>
     <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" />

From b27d8490dd8338cf49c4d37a24da7dbd1ab4af35 Mon Sep 17 00:00:00 2001
From: Juan Martinez Ramirez <juan.martinezramirez@snowflake.com>
Date: Wed, 17 Apr 2024 10:07:26 -0600
Subject: [PATCH 5/7] Using a empty csproj to generate nuget dependencies
 package. Removed dependency of nuget cli

This package could be generated using the following command

dotnet pack Snowflake.Data.AWS.Dependencies.csproj
---
 .../Snowflake.Data.AWS.Dependencies.csproj    | 25 +++++++++++++++++++
 .../Snowflake.Data.AWS.Dependencies.nuspec    | 20 ---------------
 snowflake-connector-net.sln                   |  6 +++++
 3 files changed, 31 insertions(+), 20 deletions(-)
 create mode 100644 Snowflake.Data.AWS.Dependencies/Snowflake.Data.AWS.Dependencies.csproj
 delete mode 100644 Snowflake.Data/providers/Snowflake.Data.AWS.Dependencies.nuspec

diff --git a/Snowflake.Data.AWS.Dependencies/Snowflake.Data.AWS.Dependencies.csproj b/Snowflake.Data.AWS.Dependencies/Snowflake.Data.AWS.Dependencies.csproj
new file mode 100644
index 000000000..3cc12fa83
--- /dev/null
+++ b/Snowflake.Data.AWS.Dependencies/Snowflake.Data.AWS.Dependencies.csproj
@@ -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-2023 Snowflake Computing Inc. All rights reserved.</Copyright>
+        <Version>3.1.0</Version>
+        <DebugType>Full</DebugType>
+        <LangVersion>7.3</LangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="AWSSDK.S3" Version="3.7.0.4" />
+    </ItemGroup>
+
+</Project>
diff --git a/Snowflake.Data/providers/Snowflake.Data.AWS.Dependencies.nuspec b/Snowflake.Data/providers/Snowflake.Data.AWS.Dependencies.nuspec
deleted file mode 100644
index d078d42e1..000000000
--- a/Snowflake.Data/providers/Snowflake.Data.AWS.Dependencies.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata>
-    <id>Snowflake.Data.AWS.Dependencies</id>
-    <version>3.1.0</version>
-    <title>Snowflake.Data.AWS.Dependencies</title>
-    <authors>Snowflake</authors>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>https://github.com/snowflakedb/snowflake-connector-net/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/snowflakedb/snowflake-connector-net</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/snowflakedb/snowflake-connector-net/master/Snowflake.Data/snowflake.ico</iconUrl>
-    <description>Snowflake Connector AWS dependencies for .NET</description>
-    <copyright>Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.</copyright>
-    <dependencies>
-      <group targetFramework="netstandard2.0">
-        <dependency id="AWSSDK.S3" version="3.7.0.4" exclude="Build,Analyzers" />
-      </group>
-    </dependencies>
-  </metadata>
-</package>
\ No newline at end of file
diff --git a/snowflake-connector-net.sln b/snowflake-connector-net.sln
index ba1c183a3..520b94461 100755
--- a/snowflake-connector-net.sln
+++ b/snowflake-connector-net.sln
@@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Snowflake.Data", "Snowflake
 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
 Global
 	GlobalSection(Performance) = preSolution
 		HasPerformanceSessions = true
@@ -24,6 +26,10 @@ 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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 46e54d5fb1e35296c3e09985dc6073ce82f8178a Mon Sep 17 00:00:00 2001
From: Juan Martinez Ramirez <juan.martinezramirez@snowflake.com>
Date: Tue, 23 Apr 2024 12:07:04 -0600
Subject: [PATCH 6/7] New project structure for dependencies installation. Move
 Snowflake logic to Snowflake.Data.Core. Create specific projects for cloud
 providers dependencies.

---
 .../Snowflake.Data.AWS.Dependencies.csproj    |   4 +-
 .../Snowflake.Data.Azure.Dependencies.csproj  |  25 ++++
 .../Client/SnowflakeDbCommand.cs              |   0
 .../Client/SnowflakeDbCommandBuilder.cs       |   0
 .../Client/SnowflakeDbConnection.cs           |   0
 .../Client/SnowflakeDbConnectionPool.cs       |   0
 .../SnowflakeDbConnectionStringBuilder.cs     |   0
 .../Client/SnowflakeDbDataAdapter.cs          |   0
 .../Client/SnowflakeDbDataReader.cs           |   0
 .../Client/SnowflakeDbException.cs            |   0
 .../Client/SnowflakeDbFactory.cs              |   0
 .../Client/SnowflakeDbParameter.cs            |   0
 .../Client/SnowflakeDbParameterCollection.cs  |   0
 .../Client/SnowflakeDbTransaction.cs          |   0
 .../Configuration/ClientConfig.cs             |   0
 .../Configuration/ClientConfigCommonProps.cs  |   0
 .../Configuration/EasyLoggingConfigFinder.cs  |   0
 .../Configuration/EasyLoggingConfigParser.cs  |   0
 .../EasyLoggingConfigProvider.cs              |   0
 .../Configuration/EasyLoggingLogLevel.cs      |   0
 .../Configuration/SFConfiguration.cs          |   0
 .../SFConfigurationSectionHandler.cs          |   0
 .../Core/ArrowChunkParser.cs                  |   0
 .../Core/ArrowResultChunk.cs                  |   0
 .../Core/ArrowResultSet.cs                    |   0
 .../Core/Authenticator/BasicAuthenticator.cs  |   0
 .../ExternalBrowserAuthenticator.cs           |   0
 .../Core/Authenticator/IAuthenticator.cs      |   0
 .../Authenticator/KeyPairAuthenticator.cs     |   0
 .../Core/Authenticator/OAuthAuthenticator.cs  |   0
 .../Core/Authenticator/OktaAuthenticator.cs   |   0
 .../Core/BaseResultChunk.cs                   |   0
 .../Core/ChunkDeserializer.cs                 |   0
 .../Core/ChunkDownloaderFactory.cs            |   0
 .../Core/ChunkParserFactory.cs                |   0
 .../Core/ConcatenatedStream.cs                |   0
 .../Core/ErrorMessages.Designer.cs            |   0
 .../Core/ErrorMessages.resx                   |   0
 .../Core/FastMemoryStream.cs                  |   0
 .../Core/FastParser.cs                        |   0
 .../Core/FileTransfer/EncryptionProvider.cs   |   0
 .../FileTransfer/FileBackedOutputStream.cs    |   0
 .../FileTransfer/SFFileCompressionTypes.cs    |   0
 .../Core/FileTransfer/SFFileMetadata.cs       |   0
 .../Core/FileTransfer/SFFileTransferAgent.cs  |   0
 .../StorageClient/ISFRemoteStorageClient.cs   |   0
 .../FileTransfer/StorageClient/SFGCSClient.cs |   0
 .../StorageClient/SFLocalStorageUtil.cs       |   0
 .../StorageClient/SFRemoteStorageUtil.cs      |   0
 .../FileTransfer/StorageClient/SFS3Client.cs  |   0
 .../StorageClient/SFSnowflakeAzureClient.cs   |   0
 .../Core/HeartBeatBackground.cs               |   0
 .../Core/HttpUtil.cs                          |   0
 .../Core/IChunkDownloader.cs                  |   0
 .../Core/IChunkParser.cs                      |   0
 .../Core/IChunkParserFactory.cs               |   0
 .../Core/IResultChunk.cs                      |   0
 .../Core/JsonUtils.cs                         |   0
 .../Core/ParameterBinding.cs                  |   0
 .../Core/QueryContextCache.cs                 |   0
 .../Core/QueryResultsAwaiter.cs               |   0
 .../Core/RestParams.cs                        |   0
 .../Core/RestRequest.cs                       |   0
 .../Core/RestRequester.cs                     |   0
 .../Core/RestResponse.cs                      |   0
 .../Core/ResultSetUtil.cs                     |   0
 .../Core/ReusableChunkParser.cs               |   0
 .../Core/SFBaseResultSet.cs                   |   0
 .../Core/SFBindUploader.cs                    |   0
 .../Core/SFBlockingChunkDownloaderV3.cs       |   0
 .../Core/SFDataConverter.cs                   |   0
 .../Core/SFError.cs                           |   0
 .../Core/SFMultiStatementsResultSet.cs        |   0
 .../Core/SFResultChunk.cs                     |   0
 .../Core/SFResultSet.cs                       |   0
 .../Core/SFResultSetMetaData.cs               |   0
 .../Core/SFReusableChunk.cs                   |   0
 .../Core/SFStatement.cs                       |   0
 .../Core/Session/ConnectionCacheManager.cs    |   0
 .../Core/Session/EasyLoggingStarter.cs        |   0
 .../Core/Session/IConnectionManager.cs        |   0
 .../Core/Session/SFSession.cs                 |   0
 .../Session/SFSessionHttpClientProperties.cs  |   0
 .../SFSessionHttpClientProxyProperties.cs     |   0
 .../Core/Session/SFSessionParameter.cs        |   0
 .../Core/Session/SFSessionProperty.cs         |   0
 .../Core/Session/SessionPool.cs               |   0
 .../Core/Tools/DirectoryOperations.cs         |   0
 .../Core/Tools/EnvironmentOperations.cs       |   0
 .../Core/Tools/FileOperations.cs              |   0
 .../Core/Tools/HomeDirectoryProvider.cs       |   0
 .../Core/Tools/UnixOperations.cs              |   0
 .../Core/UTF8Buffer.cs                        |   0
 .../Logger/EasyLoggerManager.cs               |   0
 .../Logger/EasyLoggingLevelMapper.cs          |   0
 .../Logger/Log4netImpl.cs                     |   0
 .../Logger/SFLogger.cs                        |   0
 .../Logger/SFLoggerEmptyImpl.cs               |   0
 .../Logger/SFLoggerFactory.cs                 |   0
 .../Logger/SecretDetector.cs                  |   0
 .../Logger/UnixFilePermissionsConverter .cs   |   0
 .../Snowflake.Data.Core.csproj                |  79 ++++++++++++
 .../snowflake.ico                             | Bin
 .../Snowflake.Data.GCP.Dependencies.csproj    |  25 ++++
 .../Snowflake.Data.Tests.csproj               |   5 +-
 Snowflake.Data/Snowflake.Data.csproj          | 113 +++++-------------
 snowflake-connector-net.sln                   |  20 +++-
 107 files changed, 185 insertions(+), 86 deletions(-)
 create mode 100644 Snowflake.Data.Azure.Dependencies/Snowflake.Data.Azure.Dependencies.csproj
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbCommand.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbCommandBuilder.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbConnection.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbConnectionPool.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbConnectionStringBuilder.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbDataAdapter.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbDataReader.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbException.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbFactory.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbParameter.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbParameterCollection.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Client/SnowflakeDbTransaction.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Configuration/ClientConfig.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Configuration/ClientConfigCommonProps.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Configuration/EasyLoggingConfigFinder.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Configuration/EasyLoggingConfigParser.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Configuration/EasyLoggingConfigProvider.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Configuration/EasyLoggingLogLevel.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Configuration/SFConfiguration.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Configuration/SFConfigurationSectionHandler.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ArrowChunkParser.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ArrowResultChunk.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ArrowResultSet.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Authenticator/BasicAuthenticator.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Authenticator/ExternalBrowserAuthenticator.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Authenticator/IAuthenticator.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Authenticator/KeyPairAuthenticator.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Authenticator/OAuthAuthenticator.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Authenticator/OktaAuthenticator.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/BaseResultChunk.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ChunkDeserializer.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ChunkDownloaderFactory.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ChunkParserFactory.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ConcatenatedStream.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ErrorMessages.Designer.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ErrorMessages.resx (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FastMemoryStream.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FastParser.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FileTransfer/EncryptionProvider.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FileTransfer/FileBackedOutputStream.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FileTransfer/SFFileCompressionTypes.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FileTransfer/SFFileMetadata.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FileTransfer/SFFileTransferAgent.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FileTransfer/StorageClient/ISFRemoteStorageClient.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FileTransfer/StorageClient/SFGCSClient.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FileTransfer/StorageClient/SFLocalStorageUtil.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FileTransfer/StorageClient/SFRemoteStorageUtil.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FileTransfer/StorageClient/SFS3Client.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/FileTransfer/StorageClient/SFSnowflakeAzureClient.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/HeartBeatBackground.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/HttpUtil.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/IChunkDownloader.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/IChunkParser.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/IChunkParserFactory.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/IResultChunk.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/JsonUtils.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ParameterBinding.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/QueryContextCache.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/QueryResultsAwaiter.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/RestParams.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/RestRequest.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/RestRequester.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/RestResponse.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ResultSetUtil.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/ReusableChunkParser.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/SFBaseResultSet.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/SFBindUploader.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/SFBlockingChunkDownloaderV3.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/SFDataConverter.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/SFError.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/SFMultiStatementsResultSet.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/SFResultChunk.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/SFResultSet.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/SFResultSetMetaData.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/SFReusableChunk.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/SFStatement.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Session/ConnectionCacheManager.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Session/EasyLoggingStarter.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Session/IConnectionManager.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Session/SFSession.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Session/SFSessionHttpClientProperties.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Session/SFSessionHttpClientProxyProperties.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Session/SFSessionParameter.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Session/SFSessionProperty.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Session/SessionPool.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Tools/DirectoryOperations.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Tools/EnvironmentOperations.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Tools/FileOperations.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Tools/HomeDirectoryProvider.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/Tools/UnixOperations.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Core/UTF8Buffer.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Logger/EasyLoggerManager.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Logger/EasyLoggingLevelMapper.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Logger/Log4netImpl.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Logger/SFLogger.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Logger/SFLoggerEmptyImpl.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Logger/SFLoggerFactory.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Logger/SecretDetector.cs (100%)
 rename {Snowflake.Data => Snowflake.Data.Core}/Logger/UnixFilePermissionsConverter .cs (100%)
 create mode 100644 Snowflake.Data.Core/Snowflake.Data.Core.csproj
 rename {Snowflake.Data => Snowflake.Data.Core}/snowflake.ico (100%)
 create mode 100644 Snowflake.Data.GCP.Dependencies/Snowflake.Data.GCP.Dependencies.csproj

diff --git a/Snowflake.Data.AWS.Dependencies/Snowflake.Data.AWS.Dependencies.csproj b/Snowflake.Data.AWS.Dependencies/Snowflake.Data.AWS.Dependencies.csproj
index 3cc12fa83..367fdf880 100644
--- a/Snowflake.Data.AWS.Dependencies/Snowflake.Data.AWS.Dependencies.csproj
+++ b/Snowflake.Data.AWS.Dependencies/Snowflake.Data.AWS.Dependencies.csproj
@@ -12,8 +12,8 @@
         <Company>Snowflake Computing, Inc</Company>
         <Product>Snowflake Connector for .NET</Product>
         <Authors>Snowflake</Authors>
-        <Copyright>Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.</Copyright>
-        <Version>3.1.0</Version>
+        <Copyright>Copyright (c) 2012-2024 Snowflake Computing Inc. All rights reserved.</Copyright>
+        <Version>3.2.0</Version>
         <DebugType>Full</DebugType>
         <LangVersion>7.3</LangVersion>
     </PropertyGroup>
diff --git a/Snowflake.Data.Azure.Dependencies/Snowflake.Data.Azure.Dependencies.csproj b/Snowflake.Data.Azure.Dependencies/Snowflake.Data.Azure.Dependencies.csproj
new file mode 100644
index 000000000..00432082b
--- /dev/null
+++ b/Snowflake.Data.Azure.Dependencies/Snowflake.Data.Azure.Dependencies.csproj
@@ -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.2.0</Version>
+        <DebugType>Full</DebugType>
+        <LangVersion>7.3</LangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
+    </ItemGroup>
+
+</Project>
diff --git a/Snowflake.Data/Client/SnowflakeDbCommand.cs b/Snowflake.Data.Core/Client/SnowflakeDbCommand.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbCommand.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbCommand.cs
diff --git a/Snowflake.Data/Client/SnowflakeDbCommandBuilder.cs b/Snowflake.Data.Core/Client/SnowflakeDbCommandBuilder.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbCommandBuilder.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbCommandBuilder.cs
diff --git a/Snowflake.Data/Client/SnowflakeDbConnection.cs b/Snowflake.Data.Core/Client/SnowflakeDbConnection.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbConnection.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbConnection.cs
diff --git a/Snowflake.Data/Client/SnowflakeDbConnectionPool.cs b/Snowflake.Data.Core/Client/SnowflakeDbConnectionPool.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbConnectionPool.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbConnectionPool.cs
diff --git a/Snowflake.Data/Client/SnowflakeDbConnectionStringBuilder.cs b/Snowflake.Data.Core/Client/SnowflakeDbConnectionStringBuilder.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbConnectionStringBuilder.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbConnectionStringBuilder.cs
diff --git a/Snowflake.Data/Client/SnowflakeDbDataAdapter.cs b/Snowflake.Data.Core/Client/SnowflakeDbDataAdapter.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbDataAdapter.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbDataAdapter.cs
diff --git a/Snowflake.Data/Client/SnowflakeDbDataReader.cs b/Snowflake.Data.Core/Client/SnowflakeDbDataReader.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbDataReader.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbDataReader.cs
diff --git a/Snowflake.Data/Client/SnowflakeDbException.cs b/Snowflake.Data.Core/Client/SnowflakeDbException.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbException.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbException.cs
diff --git a/Snowflake.Data/Client/SnowflakeDbFactory.cs b/Snowflake.Data.Core/Client/SnowflakeDbFactory.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbFactory.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbFactory.cs
diff --git a/Snowflake.Data/Client/SnowflakeDbParameter.cs b/Snowflake.Data.Core/Client/SnowflakeDbParameter.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbParameter.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbParameter.cs
diff --git a/Snowflake.Data/Client/SnowflakeDbParameterCollection.cs b/Snowflake.Data.Core/Client/SnowflakeDbParameterCollection.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbParameterCollection.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbParameterCollection.cs
diff --git a/Snowflake.Data/Client/SnowflakeDbTransaction.cs b/Snowflake.Data.Core/Client/SnowflakeDbTransaction.cs
similarity index 100%
rename from Snowflake.Data/Client/SnowflakeDbTransaction.cs
rename to Snowflake.Data.Core/Client/SnowflakeDbTransaction.cs
diff --git a/Snowflake.Data/Configuration/ClientConfig.cs b/Snowflake.Data.Core/Configuration/ClientConfig.cs
similarity index 100%
rename from Snowflake.Data/Configuration/ClientConfig.cs
rename to Snowflake.Data.Core/Configuration/ClientConfig.cs
diff --git a/Snowflake.Data/Configuration/ClientConfigCommonProps.cs b/Snowflake.Data.Core/Configuration/ClientConfigCommonProps.cs
similarity index 100%
rename from Snowflake.Data/Configuration/ClientConfigCommonProps.cs
rename to Snowflake.Data.Core/Configuration/ClientConfigCommonProps.cs
diff --git a/Snowflake.Data/Configuration/EasyLoggingConfigFinder.cs b/Snowflake.Data.Core/Configuration/EasyLoggingConfigFinder.cs
similarity index 100%
rename from Snowflake.Data/Configuration/EasyLoggingConfigFinder.cs
rename to Snowflake.Data.Core/Configuration/EasyLoggingConfigFinder.cs
diff --git a/Snowflake.Data/Configuration/EasyLoggingConfigParser.cs b/Snowflake.Data.Core/Configuration/EasyLoggingConfigParser.cs
similarity index 100%
rename from Snowflake.Data/Configuration/EasyLoggingConfigParser.cs
rename to Snowflake.Data.Core/Configuration/EasyLoggingConfigParser.cs
diff --git a/Snowflake.Data/Configuration/EasyLoggingConfigProvider.cs b/Snowflake.Data.Core/Configuration/EasyLoggingConfigProvider.cs
similarity index 100%
rename from Snowflake.Data/Configuration/EasyLoggingConfigProvider.cs
rename to Snowflake.Data.Core/Configuration/EasyLoggingConfigProvider.cs
diff --git a/Snowflake.Data/Configuration/EasyLoggingLogLevel.cs b/Snowflake.Data.Core/Configuration/EasyLoggingLogLevel.cs
similarity index 100%
rename from Snowflake.Data/Configuration/EasyLoggingLogLevel.cs
rename to Snowflake.Data.Core/Configuration/EasyLoggingLogLevel.cs
diff --git a/Snowflake.Data/Configuration/SFConfiguration.cs b/Snowflake.Data.Core/Configuration/SFConfiguration.cs
similarity index 100%
rename from Snowflake.Data/Configuration/SFConfiguration.cs
rename to Snowflake.Data.Core/Configuration/SFConfiguration.cs
diff --git a/Snowflake.Data/Configuration/SFConfigurationSectionHandler.cs b/Snowflake.Data.Core/Configuration/SFConfigurationSectionHandler.cs
similarity index 100%
rename from Snowflake.Data/Configuration/SFConfigurationSectionHandler.cs
rename to Snowflake.Data.Core/Configuration/SFConfigurationSectionHandler.cs
diff --git a/Snowflake.Data/Core/ArrowChunkParser.cs b/Snowflake.Data.Core/Core/ArrowChunkParser.cs
similarity index 100%
rename from Snowflake.Data/Core/ArrowChunkParser.cs
rename to Snowflake.Data.Core/Core/ArrowChunkParser.cs
diff --git a/Snowflake.Data/Core/ArrowResultChunk.cs b/Snowflake.Data.Core/Core/ArrowResultChunk.cs
similarity index 100%
rename from Snowflake.Data/Core/ArrowResultChunk.cs
rename to Snowflake.Data.Core/Core/ArrowResultChunk.cs
diff --git a/Snowflake.Data/Core/ArrowResultSet.cs b/Snowflake.Data.Core/Core/ArrowResultSet.cs
similarity index 100%
rename from Snowflake.Data/Core/ArrowResultSet.cs
rename to Snowflake.Data.Core/Core/ArrowResultSet.cs
diff --git a/Snowflake.Data/Core/Authenticator/BasicAuthenticator.cs b/Snowflake.Data.Core/Core/Authenticator/BasicAuthenticator.cs
similarity index 100%
rename from Snowflake.Data/Core/Authenticator/BasicAuthenticator.cs
rename to Snowflake.Data.Core/Core/Authenticator/BasicAuthenticator.cs
diff --git a/Snowflake.Data/Core/Authenticator/ExternalBrowserAuthenticator.cs b/Snowflake.Data.Core/Core/Authenticator/ExternalBrowserAuthenticator.cs
similarity index 100%
rename from Snowflake.Data/Core/Authenticator/ExternalBrowserAuthenticator.cs
rename to Snowflake.Data.Core/Core/Authenticator/ExternalBrowserAuthenticator.cs
diff --git a/Snowflake.Data/Core/Authenticator/IAuthenticator.cs b/Snowflake.Data.Core/Core/Authenticator/IAuthenticator.cs
similarity index 100%
rename from Snowflake.Data/Core/Authenticator/IAuthenticator.cs
rename to Snowflake.Data.Core/Core/Authenticator/IAuthenticator.cs
diff --git a/Snowflake.Data/Core/Authenticator/KeyPairAuthenticator.cs b/Snowflake.Data.Core/Core/Authenticator/KeyPairAuthenticator.cs
similarity index 100%
rename from Snowflake.Data/Core/Authenticator/KeyPairAuthenticator.cs
rename to Snowflake.Data.Core/Core/Authenticator/KeyPairAuthenticator.cs
diff --git a/Snowflake.Data/Core/Authenticator/OAuthAuthenticator.cs b/Snowflake.Data.Core/Core/Authenticator/OAuthAuthenticator.cs
similarity index 100%
rename from Snowflake.Data/Core/Authenticator/OAuthAuthenticator.cs
rename to Snowflake.Data.Core/Core/Authenticator/OAuthAuthenticator.cs
diff --git a/Snowflake.Data/Core/Authenticator/OktaAuthenticator.cs b/Snowflake.Data.Core/Core/Authenticator/OktaAuthenticator.cs
similarity index 100%
rename from Snowflake.Data/Core/Authenticator/OktaAuthenticator.cs
rename to Snowflake.Data.Core/Core/Authenticator/OktaAuthenticator.cs
diff --git a/Snowflake.Data/Core/BaseResultChunk.cs b/Snowflake.Data.Core/Core/BaseResultChunk.cs
similarity index 100%
rename from Snowflake.Data/Core/BaseResultChunk.cs
rename to Snowflake.Data.Core/Core/BaseResultChunk.cs
diff --git a/Snowflake.Data/Core/ChunkDeserializer.cs b/Snowflake.Data.Core/Core/ChunkDeserializer.cs
similarity index 100%
rename from Snowflake.Data/Core/ChunkDeserializer.cs
rename to Snowflake.Data.Core/Core/ChunkDeserializer.cs
diff --git a/Snowflake.Data/Core/ChunkDownloaderFactory.cs b/Snowflake.Data.Core/Core/ChunkDownloaderFactory.cs
similarity index 100%
rename from Snowflake.Data/Core/ChunkDownloaderFactory.cs
rename to Snowflake.Data.Core/Core/ChunkDownloaderFactory.cs
diff --git a/Snowflake.Data/Core/ChunkParserFactory.cs b/Snowflake.Data.Core/Core/ChunkParserFactory.cs
similarity index 100%
rename from Snowflake.Data/Core/ChunkParserFactory.cs
rename to Snowflake.Data.Core/Core/ChunkParserFactory.cs
diff --git a/Snowflake.Data/Core/ConcatenatedStream.cs b/Snowflake.Data.Core/Core/ConcatenatedStream.cs
similarity index 100%
rename from Snowflake.Data/Core/ConcatenatedStream.cs
rename to Snowflake.Data.Core/Core/ConcatenatedStream.cs
diff --git a/Snowflake.Data/Core/ErrorMessages.Designer.cs b/Snowflake.Data.Core/Core/ErrorMessages.Designer.cs
similarity index 100%
rename from Snowflake.Data/Core/ErrorMessages.Designer.cs
rename to Snowflake.Data.Core/Core/ErrorMessages.Designer.cs
diff --git a/Snowflake.Data/Core/ErrorMessages.resx b/Snowflake.Data.Core/Core/ErrorMessages.resx
similarity index 100%
rename from Snowflake.Data/Core/ErrorMessages.resx
rename to Snowflake.Data.Core/Core/ErrorMessages.resx
diff --git a/Snowflake.Data/Core/FastMemoryStream.cs b/Snowflake.Data.Core/Core/FastMemoryStream.cs
similarity index 100%
rename from Snowflake.Data/Core/FastMemoryStream.cs
rename to Snowflake.Data.Core/Core/FastMemoryStream.cs
diff --git a/Snowflake.Data/Core/FastParser.cs b/Snowflake.Data.Core/Core/FastParser.cs
similarity index 100%
rename from Snowflake.Data/Core/FastParser.cs
rename to Snowflake.Data.Core/Core/FastParser.cs
diff --git a/Snowflake.Data/Core/FileTransfer/EncryptionProvider.cs b/Snowflake.Data.Core/Core/FileTransfer/EncryptionProvider.cs
similarity index 100%
rename from Snowflake.Data/Core/FileTransfer/EncryptionProvider.cs
rename to Snowflake.Data.Core/Core/FileTransfer/EncryptionProvider.cs
diff --git a/Snowflake.Data/Core/FileTransfer/FileBackedOutputStream.cs b/Snowflake.Data.Core/Core/FileTransfer/FileBackedOutputStream.cs
similarity index 100%
rename from Snowflake.Data/Core/FileTransfer/FileBackedOutputStream.cs
rename to Snowflake.Data.Core/Core/FileTransfer/FileBackedOutputStream.cs
diff --git a/Snowflake.Data/Core/FileTransfer/SFFileCompressionTypes.cs b/Snowflake.Data.Core/Core/FileTransfer/SFFileCompressionTypes.cs
similarity index 100%
rename from Snowflake.Data/Core/FileTransfer/SFFileCompressionTypes.cs
rename to Snowflake.Data.Core/Core/FileTransfer/SFFileCompressionTypes.cs
diff --git a/Snowflake.Data/Core/FileTransfer/SFFileMetadata.cs b/Snowflake.Data.Core/Core/FileTransfer/SFFileMetadata.cs
similarity index 100%
rename from Snowflake.Data/Core/FileTransfer/SFFileMetadata.cs
rename to Snowflake.Data.Core/Core/FileTransfer/SFFileMetadata.cs
diff --git a/Snowflake.Data/Core/FileTransfer/SFFileTransferAgent.cs b/Snowflake.Data.Core/Core/FileTransfer/SFFileTransferAgent.cs
similarity index 100%
rename from Snowflake.Data/Core/FileTransfer/SFFileTransferAgent.cs
rename to Snowflake.Data.Core/Core/FileTransfer/SFFileTransferAgent.cs
diff --git a/Snowflake.Data/Core/FileTransfer/StorageClient/ISFRemoteStorageClient.cs b/Snowflake.Data.Core/Core/FileTransfer/StorageClient/ISFRemoteStorageClient.cs
similarity index 100%
rename from Snowflake.Data/Core/FileTransfer/StorageClient/ISFRemoteStorageClient.cs
rename to Snowflake.Data.Core/Core/FileTransfer/StorageClient/ISFRemoteStorageClient.cs
diff --git a/Snowflake.Data/Core/FileTransfer/StorageClient/SFGCSClient.cs b/Snowflake.Data.Core/Core/FileTransfer/StorageClient/SFGCSClient.cs
similarity index 100%
rename from Snowflake.Data/Core/FileTransfer/StorageClient/SFGCSClient.cs
rename to Snowflake.Data.Core/Core/FileTransfer/StorageClient/SFGCSClient.cs
diff --git a/Snowflake.Data/Core/FileTransfer/StorageClient/SFLocalStorageUtil.cs b/Snowflake.Data.Core/Core/FileTransfer/StorageClient/SFLocalStorageUtil.cs
similarity index 100%
rename from Snowflake.Data/Core/FileTransfer/StorageClient/SFLocalStorageUtil.cs
rename to Snowflake.Data.Core/Core/FileTransfer/StorageClient/SFLocalStorageUtil.cs
diff --git a/Snowflake.Data/Core/FileTransfer/StorageClient/SFRemoteStorageUtil.cs b/Snowflake.Data.Core/Core/FileTransfer/StorageClient/SFRemoteStorageUtil.cs
similarity index 100%
rename from Snowflake.Data/Core/FileTransfer/StorageClient/SFRemoteStorageUtil.cs
rename to Snowflake.Data.Core/Core/FileTransfer/StorageClient/SFRemoteStorageUtil.cs
diff --git a/Snowflake.Data/Core/FileTransfer/StorageClient/SFS3Client.cs b/Snowflake.Data.Core/Core/FileTransfer/StorageClient/SFS3Client.cs
similarity index 100%
rename from Snowflake.Data/Core/FileTransfer/StorageClient/SFS3Client.cs
rename to Snowflake.Data.Core/Core/FileTransfer/StorageClient/SFS3Client.cs
diff --git a/Snowflake.Data/Core/FileTransfer/StorageClient/SFSnowflakeAzureClient.cs b/Snowflake.Data.Core/Core/FileTransfer/StorageClient/SFSnowflakeAzureClient.cs
similarity index 100%
rename from Snowflake.Data/Core/FileTransfer/StorageClient/SFSnowflakeAzureClient.cs
rename to Snowflake.Data.Core/Core/FileTransfer/StorageClient/SFSnowflakeAzureClient.cs
diff --git a/Snowflake.Data/Core/HeartBeatBackground.cs b/Snowflake.Data.Core/Core/HeartBeatBackground.cs
similarity index 100%
rename from Snowflake.Data/Core/HeartBeatBackground.cs
rename to Snowflake.Data.Core/Core/HeartBeatBackground.cs
diff --git a/Snowflake.Data/Core/HttpUtil.cs b/Snowflake.Data.Core/Core/HttpUtil.cs
similarity index 100%
rename from Snowflake.Data/Core/HttpUtil.cs
rename to Snowflake.Data.Core/Core/HttpUtil.cs
diff --git a/Snowflake.Data/Core/IChunkDownloader.cs b/Snowflake.Data.Core/Core/IChunkDownloader.cs
similarity index 100%
rename from Snowflake.Data/Core/IChunkDownloader.cs
rename to Snowflake.Data.Core/Core/IChunkDownloader.cs
diff --git a/Snowflake.Data/Core/IChunkParser.cs b/Snowflake.Data.Core/Core/IChunkParser.cs
similarity index 100%
rename from Snowflake.Data/Core/IChunkParser.cs
rename to Snowflake.Data.Core/Core/IChunkParser.cs
diff --git a/Snowflake.Data/Core/IChunkParserFactory.cs b/Snowflake.Data.Core/Core/IChunkParserFactory.cs
similarity index 100%
rename from Snowflake.Data/Core/IChunkParserFactory.cs
rename to Snowflake.Data.Core/Core/IChunkParserFactory.cs
diff --git a/Snowflake.Data/Core/IResultChunk.cs b/Snowflake.Data.Core/Core/IResultChunk.cs
similarity index 100%
rename from Snowflake.Data/Core/IResultChunk.cs
rename to Snowflake.Data.Core/Core/IResultChunk.cs
diff --git a/Snowflake.Data/Core/JsonUtils.cs b/Snowflake.Data.Core/Core/JsonUtils.cs
similarity index 100%
rename from Snowflake.Data/Core/JsonUtils.cs
rename to Snowflake.Data.Core/Core/JsonUtils.cs
diff --git a/Snowflake.Data/Core/ParameterBinding.cs b/Snowflake.Data.Core/Core/ParameterBinding.cs
similarity index 100%
rename from Snowflake.Data/Core/ParameterBinding.cs
rename to Snowflake.Data.Core/Core/ParameterBinding.cs
diff --git a/Snowflake.Data/Core/QueryContextCache.cs b/Snowflake.Data.Core/Core/QueryContextCache.cs
similarity index 100%
rename from Snowflake.Data/Core/QueryContextCache.cs
rename to Snowflake.Data.Core/Core/QueryContextCache.cs
diff --git a/Snowflake.Data/Core/QueryResultsAwaiter.cs b/Snowflake.Data.Core/Core/QueryResultsAwaiter.cs
similarity index 100%
rename from Snowflake.Data/Core/QueryResultsAwaiter.cs
rename to Snowflake.Data.Core/Core/QueryResultsAwaiter.cs
diff --git a/Snowflake.Data/Core/RestParams.cs b/Snowflake.Data.Core/Core/RestParams.cs
similarity index 100%
rename from Snowflake.Data/Core/RestParams.cs
rename to Snowflake.Data.Core/Core/RestParams.cs
diff --git a/Snowflake.Data/Core/RestRequest.cs b/Snowflake.Data.Core/Core/RestRequest.cs
similarity index 100%
rename from Snowflake.Data/Core/RestRequest.cs
rename to Snowflake.Data.Core/Core/RestRequest.cs
diff --git a/Snowflake.Data/Core/RestRequester.cs b/Snowflake.Data.Core/Core/RestRequester.cs
similarity index 100%
rename from Snowflake.Data/Core/RestRequester.cs
rename to Snowflake.Data.Core/Core/RestRequester.cs
diff --git a/Snowflake.Data/Core/RestResponse.cs b/Snowflake.Data.Core/Core/RestResponse.cs
similarity index 100%
rename from Snowflake.Data/Core/RestResponse.cs
rename to Snowflake.Data.Core/Core/RestResponse.cs
diff --git a/Snowflake.Data/Core/ResultSetUtil.cs b/Snowflake.Data.Core/Core/ResultSetUtil.cs
similarity index 100%
rename from Snowflake.Data/Core/ResultSetUtil.cs
rename to Snowflake.Data.Core/Core/ResultSetUtil.cs
diff --git a/Snowflake.Data/Core/ReusableChunkParser.cs b/Snowflake.Data.Core/Core/ReusableChunkParser.cs
similarity index 100%
rename from Snowflake.Data/Core/ReusableChunkParser.cs
rename to Snowflake.Data.Core/Core/ReusableChunkParser.cs
diff --git a/Snowflake.Data/Core/SFBaseResultSet.cs b/Snowflake.Data.Core/Core/SFBaseResultSet.cs
similarity index 100%
rename from Snowflake.Data/Core/SFBaseResultSet.cs
rename to Snowflake.Data.Core/Core/SFBaseResultSet.cs
diff --git a/Snowflake.Data/Core/SFBindUploader.cs b/Snowflake.Data.Core/Core/SFBindUploader.cs
similarity index 100%
rename from Snowflake.Data/Core/SFBindUploader.cs
rename to Snowflake.Data.Core/Core/SFBindUploader.cs
diff --git a/Snowflake.Data/Core/SFBlockingChunkDownloaderV3.cs b/Snowflake.Data.Core/Core/SFBlockingChunkDownloaderV3.cs
similarity index 100%
rename from Snowflake.Data/Core/SFBlockingChunkDownloaderV3.cs
rename to Snowflake.Data.Core/Core/SFBlockingChunkDownloaderV3.cs
diff --git a/Snowflake.Data/Core/SFDataConverter.cs b/Snowflake.Data.Core/Core/SFDataConverter.cs
similarity index 100%
rename from Snowflake.Data/Core/SFDataConverter.cs
rename to Snowflake.Data.Core/Core/SFDataConverter.cs
diff --git a/Snowflake.Data/Core/SFError.cs b/Snowflake.Data.Core/Core/SFError.cs
similarity index 100%
rename from Snowflake.Data/Core/SFError.cs
rename to Snowflake.Data.Core/Core/SFError.cs
diff --git a/Snowflake.Data/Core/SFMultiStatementsResultSet.cs b/Snowflake.Data.Core/Core/SFMultiStatementsResultSet.cs
similarity index 100%
rename from Snowflake.Data/Core/SFMultiStatementsResultSet.cs
rename to Snowflake.Data.Core/Core/SFMultiStatementsResultSet.cs
diff --git a/Snowflake.Data/Core/SFResultChunk.cs b/Snowflake.Data.Core/Core/SFResultChunk.cs
similarity index 100%
rename from Snowflake.Data/Core/SFResultChunk.cs
rename to Snowflake.Data.Core/Core/SFResultChunk.cs
diff --git a/Snowflake.Data/Core/SFResultSet.cs b/Snowflake.Data.Core/Core/SFResultSet.cs
similarity index 100%
rename from Snowflake.Data/Core/SFResultSet.cs
rename to Snowflake.Data.Core/Core/SFResultSet.cs
diff --git a/Snowflake.Data/Core/SFResultSetMetaData.cs b/Snowflake.Data.Core/Core/SFResultSetMetaData.cs
similarity index 100%
rename from Snowflake.Data/Core/SFResultSetMetaData.cs
rename to Snowflake.Data.Core/Core/SFResultSetMetaData.cs
diff --git a/Snowflake.Data/Core/SFReusableChunk.cs b/Snowflake.Data.Core/Core/SFReusableChunk.cs
similarity index 100%
rename from Snowflake.Data/Core/SFReusableChunk.cs
rename to Snowflake.Data.Core/Core/SFReusableChunk.cs
diff --git a/Snowflake.Data/Core/SFStatement.cs b/Snowflake.Data.Core/Core/SFStatement.cs
similarity index 100%
rename from Snowflake.Data/Core/SFStatement.cs
rename to Snowflake.Data.Core/Core/SFStatement.cs
diff --git a/Snowflake.Data/Core/Session/ConnectionCacheManager.cs b/Snowflake.Data.Core/Core/Session/ConnectionCacheManager.cs
similarity index 100%
rename from Snowflake.Data/Core/Session/ConnectionCacheManager.cs
rename to Snowflake.Data.Core/Core/Session/ConnectionCacheManager.cs
diff --git a/Snowflake.Data/Core/Session/EasyLoggingStarter.cs b/Snowflake.Data.Core/Core/Session/EasyLoggingStarter.cs
similarity index 100%
rename from Snowflake.Data/Core/Session/EasyLoggingStarter.cs
rename to Snowflake.Data.Core/Core/Session/EasyLoggingStarter.cs
diff --git a/Snowflake.Data/Core/Session/IConnectionManager.cs b/Snowflake.Data.Core/Core/Session/IConnectionManager.cs
similarity index 100%
rename from Snowflake.Data/Core/Session/IConnectionManager.cs
rename to Snowflake.Data.Core/Core/Session/IConnectionManager.cs
diff --git a/Snowflake.Data/Core/Session/SFSession.cs b/Snowflake.Data.Core/Core/Session/SFSession.cs
similarity index 100%
rename from Snowflake.Data/Core/Session/SFSession.cs
rename to Snowflake.Data.Core/Core/Session/SFSession.cs
diff --git a/Snowflake.Data/Core/Session/SFSessionHttpClientProperties.cs b/Snowflake.Data.Core/Core/Session/SFSessionHttpClientProperties.cs
similarity index 100%
rename from Snowflake.Data/Core/Session/SFSessionHttpClientProperties.cs
rename to Snowflake.Data.Core/Core/Session/SFSessionHttpClientProperties.cs
diff --git a/Snowflake.Data/Core/Session/SFSessionHttpClientProxyProperties.cs b/Snowflake.Data.Core/Core/Session/SFSessionHttpClientProxyProperties.cs
similarity index 100%
rename from Snowflake.Data/Core/Session/SFSessionHttpClientProxyProperties.cs
rename to Snowflake.Data.Core/Core/Session/SFSessionHttpClientProxyProperties.cs
diff --git a/Snowflake.Data/Core/Session/SFSessionParameter.cs b/Snowflake.Data.Core/Core/Session/SFSessionParameter.cs
similarity index 100%
rename from Snowflake.Data/Core/Session/SFSessionParameter.cs
rename to Snowflake.Data.Core/Core/Session/SFSessionParameter.cs
diff --git a/Snowflake.Data/Core/Session/SFSessionProperty.cs b/Snowflake.Data.Core/Core/Session/SFSessionProperty.cs
similarity index 100%
rename from Snowflake.Data/Core/Session/SFSessionProperty.cs
rename to Snowflake.Data.Core/Core/Session/SFSessionProperty.cs
diff --git a/Snowflake.Data/Core/Session/SessionPool.cs b/Snowflake.Data.Core/Core/Session/SessionPool.cs
similarity index 100%
rename from Snowflake.Data/Core/Session/SessionPool.cs
rename to Snowflake.Data.Core/Core/Session/SessionPool.cs
diff --git a/Snowflake.Data/Core/Tools/DirectoryOperations.cs b/Snowflake.Data.Core/Core/Tools/DirectoryOperations.cs
similarity index 100%
rename from Snowflake.Data/Core/Tools/DirectoryOperations.cs
rename to Snowflake.Data.Core/Core/Tools/DirectoryOperations.cs
diff --git a/Snowflake.Data/Core/Tools/EnvironmentOperations.cs b/Snowflake.Data.Core/Core/Tools/EnvironmentOperations.cs
similarity index 100%
rename from Snowflake.Data/Core/Tools/EnvironmentOperations.cs
rename to Snowflake.Data.Core/Core/Tools/EnvironmentOperations.cs
diff --git a/Snowflake.Data/Core/Tools/FileOperations.cs b/Snowflake.Data.Core/Core/Tools/FileOperations.cs
similarity index 100%
rename from Snowflake.Data/Core/Tools/FileOperations.cs
rename to Snowflake.Data.Core/Core/Tools/FileOperations.cs
diff --git a/Snowflake.Data/Core/Tools/HomeDirectoryProvider.cs b/Snowflake.Data.Core/Core/Tools/HomeDirectoryProvider.cs
similarity index 100%
rename from Snowflake.Data/Core/Tools/HomeDirectoryProvider.cs
rename to Snowflake.Data.Core/Core/Tools/HomeDirectoryProvider.cs
diff --git a/Snowflake.Data/Core/Tools/UnixOperations.cs b/Snowflake.Data.Core/Core/Tools/UnixOperations.cs
similarity index 100%
rename from Snowflake.Data/Core/Tools/UnixOperations.cs
rename to Snowflake.Data.Core/Core/Tools/UnixOperations.cs
diff --git a/Snowflake.Data/Core/UTF8Buffer.cs b/Snowflake.Data.Core/Core/UTF8Buffer.cs
similarity index 100%
rename from Snowflake.Data/Core/UTF8Buffer.cs
rename to Snowflake.Data.Core/Core/UTF8Buffer.cs
diff --git a/Snowflake.Data/Logger/EasyLoggerManager.cs b/Snowflake.Data.Core/Logger/EasyLoggerManager.cs
similarity index 100%
rename from Snowflake.Data/Logger/EasyLoggerManager.cs
rename to Snowflake.Data.Core/Logger/EasyLoggerManager.cs
diff --git a/Snowflake.Data/Logger/EasyLoggingLevelMapper.cs b/Snowflake.Data.Core/Logger/EasyLoggingLevelMapper.cs
similarity index 100%
rename from Snowflake.Data/Logger/EasyLoggingLevelMapper.cs
rename to Snowflake.Data.Core/Logger/EasyLoggingLevelMapper.cs
diff --git a/Snowflake.Data/Logger/Log4netImpl.cs b/Snowflake.Data.Core/Logger/Log4netImpl.cs
similarity index 100%
rename from Snowflake.Data/Logger/Log4netImpl.cs
rename to Snowflake.Data.Core/Logger/Log4netImpl.cs
diff --git a/Snowflake.Data/Logger/SFLogger.cs b/Snowflake.Data.Core/Logger/SFLogger.cs
similarity index 100%
rename from Snowflake.Data/Logger/SFLogger.cs
rename to Snowflake.Data.Core/Logger/SFLogger.cs
diff --git a/Snowflake.Data/Logger/SFLoggerEmptyImpl.cs b/Snowflake.Data.Core/Logger/SFLoggerEmptyImpl.cs
similarity index 100%
rename from Snowflake.Data/Logger/SFLoggerEmptyImpl.cs
rename to Snowflake.Data.Core/Logger/SFLoggerEmptyImpl.cs
diff --git a/Snowflake.Data/Logger/SFLoggerFactory.cs b/Snowflake.Data.Core/Logger/SFLoggerFactory.cs
similarity index 100%
rename from Snowflake.Data/Logger/SFLoggerFactory.cs
rename to Snowflake.Data.Core/Logger/SFLoggerFactory.cs
diff --git a/Snowflake.Data/Logger/SecretDetector.cs b/Snowflake.Data.Core/Logger/SecretDetector.cs
similarity index 100%
rename from Snowflake.Data/Logger/SecretDetector.cs
rename to Snowflake.Data.Core/Logger/SecretDetector.cs
diff --git a/Snowflake.Data/Logger/UnixFilePermissionsConverter .cs b/Snowflake.Data.Core/Logger/UnixFilePermissionsConverter .cs
similarity index 100%
rename from Snowflake.Data/Logger/UnixFilePermissionsConverter .cs
rename to Snowflake.Data.Core/Logger/UnixFilePermissionsConverter .cs
diff --git a/Snowflake.Data.Core/Snowflake.Data.Core.csproj b/Snowflake.Data.Core/Snowflake.Data.Core.csproj
new file mode 100644
index 000000000..5c455042d
--- /dev/null
+++ b/Snowflake.Data.Core/Snowflake.Data.Core.csproj
@@ -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.2.0</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>
diff --git a/Snowflake.Data/snowflake.ico b/Snowflake.Data.Core/snowflake.ico
similarity index 100%
rename from Snowflake.Data/snowflake.ico
rename to Snowflake.Data.Core/snowflake.ico
diff --git a/Snowflake.Data.GCP.Dependencies/Snowflake.Data.GCP.Dependencies.csproj b/Snowflake.Data.GCP.Dependencies/Snowflake.Data.GCP.Dependencies.csproj
new file mode 100644
index 000000000..7bfa90e5f
--- /dev/null
+++ b/Snowflake.Data.GCP.Dependencies/Snowflake.Data.GCP.Dependencies.csproj
@@ -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.2.0</Version>
+        <DebugType>Full</DebugType>
+        <LangVersion>7.3</LangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Google.Cloud.Storage.V1" Version="4.6.0" />
+    </ItemGroup>
+
+</Project>
diff --git a/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj b/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
index 86decd67a..4edff8368 100644
--- a/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
+++ b/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
@@ -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)" />
diff --git a/Snowflake.Data/Snowflake.Data.csproj b/Snowflake.Data/Snowflake.Data.csproj
index e04f8d0cf..4b1b019f5 100644
--- a/Snowflake.Data/Snowflake.Data.csproj
+++ b/Snowflake.Data/Snowflake.Data.csproj
@@ -1,82 +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>
-    <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.0</Version>
-    <DebugType>Full</DebugType>
-    <LangVersion>7.3</LangVersion>
-  </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="Azure.Storage.Common" Version="12.12.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>
+<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.2.0</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>
diff --git a/snowflake-connector-net.sln b/snowflake-connector-net.sln
index 520b94461..d0bb7e932 100755
--- a/snowflake-connector-net.sln
+++ b/snowflake-connector-net.sln
@@ -3,12 +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
@@ -30,6 +36,18 @@ Global
 		{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

From 588a841c55dacf9fb69fd1c846ad3affd0a87368 Mon Sep 17 00:00:00 2001
From: Juan Martinez Ramirez <juan.martinezramirez@snowflake.com>
Date: Tue, 23 Apr 2024 14:43:07 -0600
Subject: [PATCH 7/7] Changed assembly name in dbfactoryprovider for testing

---
 Snowflake.Data.Tests/App.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Snowflake.Data.Tests/App.config b/Snowflake.Data.Tests/App.config
index 5e3dd1335..ce76bb1dd 100755
--- a/Snowflake.Data.Tests/App.config
+++ b/Snowflake.Data.Tests/App.config
@@ -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>