From 4232dc7e21963ec1f71de8beb7fc63a010220be1 Mon Sep 17 00:00:00 2001
From: Xuekai Mou <xumou@microsoft.com>
Date: Wed, 24 Apr 2024 14:32:20 +0800
Subject: [PATCH 1/3] Update the version of
 Microsoft.DataTransfer.Gateway.Encryption

---
 src/DataFactory/DataFactoryV1.Test/DataFactoryV1.Test.csproj | 2 +-
 src/DataFactory/DataFactoryV1/DataFactoryV1.csproj           | 4 ++--
 src/DataFactory/DataFactoryV2.Test/DataFactoryV2.Test.csproj | 2 +-
 src/DataFactory/DataFactoryV2/DataFactoryV2.csproj           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/DataFactory/DataFactoryV1.Test/DataFactoryV1.Test.csproj b/src/DataFactory/DataFactoryV1.Test/DataFactoryV1.Test.csproj
index 4da721d73328..83e85e875af7 100644
--- a/src/DataFactory/DataFactoryV1.Test/DataFactoryV1.Test.csproj
+++ b/src/DataFactory/DataFactoryV1.Test/DataFactoryV1.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.DataFactories" Version="4.13.3" />
-    <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="4.14.7587.7" />
+    <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="5.29.8499.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/DataFactory/DataFactoryV1/DataFactoryV1.csproj b/src/DataFactory/DataFactoryV1/DataFactoryV1.csproj
index 2c1bd530b4b0..181e281b468a 100644
--- a/src/DataFactory/DataFactoryV1/DataFactoryV1.csproj
+++ b/src/DataFactory/DataFactoryV1/DataFactoryV1.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>DataFactory</PsModuleName>
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.DataFactories" Version="4.13.3" />
-    <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="4.14.7587.7" />
+    <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="5.29.8499.2" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
     <!-- Include the following DLLs for security issue -->
diff --git a/src/DataFactory/DataFactoryV2.Test/DataFactoryV2.Test.csproj b/src/DataFactory/DataFactoryV2.Test/DataFactoryV2.Test.csproj
index 38eacd11c7b8..8746b290985d 100644
--- a/src/DataFactory/DataFactoryV2.Test/DataFactoryV2.Test.csproj
+++ b/src/DataFactory/DataFactoryV2.Test/DataFactoryV2.Test.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="4.14.7587.7" />
+    <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="5.29.8499.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj b/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
index ac5f210d7545..bf25aec22def 100644
--- a/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
+++ b/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="4.14.7587.7" />
     <!-- Include the following DLLs for security issue -->
+    <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="5.29.8499.2" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="4.7.1" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>

From f29fed3eb572224f719ffbcc29195ee74543c453 Mon Sep 17 00:00:00 2001
From: Xuekai Mou <xumou@microsoft.com>
Date: Wed, 24 Apr 2024 14:50:45 +0800
Subject: [PATCH 2/3] Update change log

---
 src/DataFactory/DataFactory/ChangeLog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/DataFactory/DataFactory/ChangeLog.md b/src/DataFactory/DataFactory/ChangeLog.md
index cf8603422d4c..32cfde256047 100644
--- a/src/DataFactory/DataFactory/ChangeLog.md
+++ b/src/DataFactory/DataFactory/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Updated ADF encryption client SDK version to 5.29.8499.2
 
 ## Version 1.18.3
 * Added ServiceNowV2, PostgreSqlV2, GoogleBigQuery in ADF

From df1ff4e35c04bd77f705b1df99b2e53065dad6c0 Mon Sep 17 00:00:00 2001
From: Xuekai Mou <xumou@microsoft.com>
Date: Wed, 24 Apr 2024 14:52:03 +0800
Subject: [PATCH 3/3] format code style

---
 src/DataFactory/DataFactoryV2/DataFactoryV2.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj b/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
index bf25aec22def..7e12ec2c79e3 100644
--- a/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
+++ b/src/DataFactory/DataFactoryV2/DataFactoryV2.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- Include the following DLLs for security issue -->
     <PackageReference Include="Microsoft.DataTransfer.Gateway.Encryption" Version="5.29.8499.2" />
+    <!-- Include the following DLLs for security issue -->
     <PackageReference Include="System.Security.Cryptography.Xml" Version="4.7.1" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>