Skip to content

Commit 6659747

Browse files
cormacpaynecormacpayne
authored
Merge pull request #5458 from skywalker-wu/encryptclientupdate
Update encryption client for Data Factory to fix encryption issue
2 parents 7019ddb + 2336e0c commit 6659747

File tree

10 files changed

+14
-12
lines changed

10 files changed

+14
-12
lines changed

‎src/ResourceManager/DataFactories/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Fix credential encryption issue that caused no meaningful error for some encryption operations.
2122

2223
## Version 4.1.0
2324
* Enabled Azure Key Vault support for all data store linked services

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@
9191
<SpecificVersion>False</SpecificVersion>
9292
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
9393
</Reference>
94-
<Reference Include="Microsoft.DataTransfer.Gateway.Encryption, Version=3.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
94+
<Reference Include="Microsoft.DataTransfer.Gateway.Encryption, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9595
<SpecificVersion>False</SpecificVersion>
96-
<HintPath>..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.3.2.6534.3\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll</HintPath>
96+
<HintPath>..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.3.4.6604.1\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll</HintPath>
9797
</Reference>
9898
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9999
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
1717
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
1818
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
19-
<package id="Microsoft.DataTransfer.Gateway.Encryption" version="3.2.6534.3" targetFramework="net45" />
19+
<package id="Microsoft.DataTransfer.Gateway.Encryption" version="3.4.6604.1" targetFramework="net45" />
2020
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
2121
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
2222
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net45" />

‎src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
<SpecificVersion>False</SpecificVersion>
5757
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.13.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
5858
</Reference>
59-
<Reference Include="Microsoft.DataTransfer.Gateway.Encryption, Version=3.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<Reference Include="Microsoft.DataTransfer.Gateway.Encryption, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6060
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.3.2.6534.3\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll</HintPath>
61+
<HintPath>..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.3.4.6604.1\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Microsoft.WindowsAzure.Storage, Version=5.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6464
<HintPath>..\..\..\packages\WindowsAzure.Storage.5.0.2\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>

‎src/ResourceManager/DataFactories/Commands.DataFactories/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<packages>
33
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
44
<package id="Microsoft.Azure.Management.DataFactories" version="4.13.0" targetFramework="net45" />
5-
<package id="Microsoft.DataTransfer.Gateway.Encryption" version="3.2.6534.3" targetFramework="net45" />
5+
<package id="Microsoft.DataTransfer.Gateway.Encryption" version="3.4.6604.1" targetFramework="net45" />
66
<package id="WindowsAzure.Storage" version="5.0.2" targetFramework="net452" />
77
</packages>

‎src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/Commands.DataFactoryV2.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
<SpecificVersion>False</SpecificVersion>
8080
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
8181
</Reference>
82-
<Reference Include="Microsoft.DataTransfer.Gateway.Encryption, Version=3.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
82+
<Reference Include="Microsoft.DataTransfer.Gateway.Encryption, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8383
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.3.2.6534.3\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll</HintPath>
84+
<HintPath>..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.3.4.6604.1\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll</HintPath>
8585
</Reference>
8686
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8787
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>

‎src/ResourceManager/DataFactories/Commands.DataFactoryV2.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
1515
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
1616
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
17-
<package id="Microsoft.DataTransfer.Gateway.Encryption" version="3.2.6534.3" targetFramework="net45" />
17+
<package id="Microsoft.DataTransfer.Gateway.Encryption" version="3.4.6604.1" targetFramework="net45" />
1818
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1919
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net45" />
2020
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.7.2" targetFramework="net452" />

‎src/ResourceManager/DataFactories/Commands.DataFactoryV2/Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
-->
2020

2121
## Current Release
22+
* Fix credential encryption issue that caused no meaningful error for some encryption operations.
2223

2324
## Version 0.5.0
2425
* Enabled Azure Key Vault support for all data store linked services

‎src/ResourceManager/DataFactories/Commands.DataFactoryV2/Commands.DataFactoryV2.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
<SpecificVersion>False</SpecificVersion>
5353
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactory.0.4.0-preview\lib\net452\Microsoft.Azure.Management.DataFactory.dll</HintPath>
5454
</Reference>
55-
<Reference Include="Microsoft.DataTransfer.Gateway.Encryption, Version=3.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<Reference Include="Microsoft.DataTransfer.Gateway.Encryption, Version=3.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5656
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.3.2.6534.3\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll</HintPath>
57+
<HintPath>..\..\..\packages\Microsoft.DataTransfer.Gateway.Encryption.3.4.6604.1\lib\net45\Microsoft.DataTransfer.Gateway.Encryption.dll</HintPath>
5858
</Reference>
5959
<Reference Include="System.Globalization" />
6060
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />

‎src/ResourceManager/DataFactories/Commands.DataFactoryV2/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
66
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
77
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
8-
<package id="Microsoft.DataTransfer.Gateway.Encryption" version="3.2.6534.3" targetFramework="net45" />
8+
<package id="Microsoft.DataTransfer.Gateway.Encryption" version="3.4.6604.1" targetFramework="net45" />
99
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
1010
</packages>

0 commit comments

Comments
 (0)