From 4c44f1f963b68062721be3c8dcc6a54bf836fca1 Mon Sep 17 00:00:00 2001
From: Krzysztof Nozderko <krzysztof.nozderko@snowflake.com>
Date: Wed, 4 Dec 2024 16:46:28 +0100
Subject: [PATCH] SNOW-1833578 support for .net9 (#1065)

---
 .github/workflows/main.yml                          | 9 ++++++---
 README.md                                           | 3 ++-
 Snowflake.Data.Tests/Snowflake.Data.Tests.csproj    | 4 ++--
 Snowflake.Data.Tests/UnitTests/SFEnvironmentTest.cs | 2 ++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1e1b78850..d19255d52 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dotnet: ['net6.0', 'net7.0', 'net8.0', 'net462', 'net471', 'net472', 'net48', 'net481']
+        dotnet: ['net6.0', 'net7.0', 'net8.0', 'net9.0', 'net462', 'net471', 'net472', 'net48', 'net481']
         cloud_env: ['AZURE', 'GCP', 'AWS']
     steps:
       - name: Checkout code
@@ -42,6 +42,7 @@ jobs:
           dotnet-version: |
             6.0.x
             8.0.x
+            9.0.x
           dotnet-quality: 'ga'
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -93,7 +94,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dotnet: ['net6.0', 'net7.0', 'net8.0']
+        dotnet: ['net6.0', 'net7.0', 'net8.0', 'net9.0']
         cloud_env: ['AZURE', 'GCP', 'AWS']
     steps:
       - uses: actions/checkout@v4
@@ -103,6 +104,7 @@ jobs:
           dotnet-version: |
             6.0.x
             8.0.x
+            9.0.x
           dotnet-quality: 'ga'
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -152,7 +154,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dotnet: ['net6.0', 'net7.0', 'net8.0']
+        dotnet: ['net6.0', 'net7.0', 'net8.0', 'net9.0']
         cloud_env: ['AZURE', 'GCP', 'AWS']
     steps:
       - uses: actions/checkout@v4
@@ -162,6 +164,7 @@ jobs:
           dotnet-version: |
             6.0.x
             8.0.x
+            9.0.x
           dotnet-quality: 'ga'
       - name: Setup Python
         uses: actions/setup-python@v5
diff --git a/README.md b/README.md
index 682475df3..12e52a056 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![NuGet](https://img.shields.io/nuget/v/Snowflake.Data.svg)](https://www.nuget.org/packages/Snowflake.Data/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
-The Snowflake .NET connector supports the the following .NET framework and libraries versions:
+The Snowflake .NET connector supports the following .NET framework and libraries versions:
 
 - .NET Framework 4.6.2
 - .NET Framework 4.7.1
@@ -14,6 +14,7 @@ The Snowflake .NET connector supports the the following .NET framework and libra
 - .NET 6.0
 - .NET 7.0
 - .NET 8.0
+- .NET 9.0
 
 Disclaimer: While the connector targets netstandard2.0 and may work with versions in its [support matrix](https://learn.microsoft.com/en-us/dotnet/standard/net-standard?tabs=net-standard-2-0#select-net-standard-version), only the versions listed above are supported and tested by the connector
 
diff --git a/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj b/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
index 86da12b20..89d295439 100644
--- a/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
+++ b/Snowflake.Data.Tests/Snowflake.Data.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net462;net471;net472;net48;net481</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0;net7.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net462;net471;net472;net48;net481</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <Title>Snowflake.Data.Tests</Title>
     <Description>Snowflake Connector for .NET</Description>
     <Company>Snowflake Computing, Inc</Company>
diff --git a/Snowflake.Data.Tests/UnitTests/SFEnvironmentTest.cs b/Snowflake.Data.Tests/UnitTests/SFEnvironmentTest.cs
index 34aa60f2c..ccf352ac8 100644
--- a/Snowflake.Data.Tests/UnitTests/SFEnvironmentTest.cs
+++ b/Snowflake.Data.Tests/UnitTests/SFEnvironmentTest.cs
@@ -22,6 +22,8 @@ public void TestRuntimeExtraction()
             expectedVersion = "7.0";
 #elif NET8_0
             expectedVersion = "8.0";
+#elif NET9_0
+            expectedVersion = "9.0";
 #endif
 
             // Act