Skip to content

Commit 56e2722

Browse files
author
tongwu
committed
fix assembly conflict issue
1 parent 23c1bfd commit 56e2722

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</Reference>
9494
<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.4.6600.1\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.4.6600.1" 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</Reference>
5959
<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.4.6600.1\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.4.6600.1" 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</Reference>
8282
<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.4.6600.1\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.4.6600.1" 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/Commands.DataFactoryV2.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</Reference>
5555
<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.4.6600.1\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.4.6600.1" 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)