Skip to content

Commit 27b466a

Browse files
author
Hovsep
committed
Merge pull request #1769 from hovsepm/dev
Fixed several dependency issues.
2 parents 096dc34 + bc30a67 commit 27b466a

File tree

14 files changed

+71
-314
lines changed

14 files changed

+71
-314
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 68 additions & 168 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin/Commands.AzureStackAdmin.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</Reference>
8484
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8585
<SpecificVersion>False</SpecificVersion>
86-
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
86+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
8787
</Reference>
8888
<Reference Include="Microsoft.Azure.Common.Authentication">
8989
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.6.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>

‎src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,6 @@
113113
<Reference Include="Microsoft.Azure.Common.NetFramework">
114114
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
115115
</Reference>
116-
<Reference Include="Microsoft.Data.Edm">
117-
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
118-
</Reference>
119-
<Reference Include="Microsoft.Data.OData">
120-
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
121-
</Reference>
122-
<Reference Include="Microsoft.Data.Services.Client">
123-
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
124-
</Reference>
125116
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126117
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
127118
<Private>True</Private>
@@ -164,9 +155,6 @@
164155
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
165156
</Reference>
166157
<Reference Include="System.Net.Http.WebRequest" />
167-
<Reference Include="System.Spatial">
168-
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
169-
</Reference>
170158
<Reference Include="System.XML" />
171159
<Reference Include="System.Xml.Linq" />
172160
</ItemGroup>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,9 @@
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1212
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
13-
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
14-
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
15-
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
1613
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1714
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1815
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
1916
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
2017
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
21-
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
2218
</packages>

‎src/ResourceManager/Network/Commands.Network/Commands.Network.csproj

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@
6868
<SpecificVersion>False</SpecificVersion>
6969
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.9.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll</HintPath>
7070
</Reference>
71-
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72-
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
73-
<Private>True</Private>
74-
</Reference>
7571
<Reference Include="Microsoft.Azure.Management.Authorization">
7672
<SpecificVersion>False</SpecificVersion>
7773
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
@@ -80,19 +76,7 @@
8076
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
8177
<Private>True</Private>
8278
</Reference>
83-
<Reference Include="Microsoft.Data.Edm">
84-
<SpecificVersion>False</SpecificVersion>
85-
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
86-
</Reference>
87-
<Reference Include="Microsoft.Data.OData">
88-
<SpecificVersion>False</SpecificVersion>
89-
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
90-
</Reference>
91-
<Reference Include="Microsoft.Data.Services.Client">
92-
<SpecificVersion>False</SpecificVersion>
93-
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
94-
</Reference>
95-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9680
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
9781
<Private>True</Private>
9882
</Reference>
@@ -124,10 +108,6 @@
124108
<SpecificVersion>False</SpecificVersion>
125109
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
126110
</Reference>
127-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128-
<SpecificVersion>False</SpecificVersion>
129-
<HintPath>..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
130-
</Reference>
131111
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
132112
<SpecificVersion>False</SpecificVersion>
133113
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -146,10 +126,6 @@
146126
</Reference>
147127
<Reference Include="System.Net.Http.WebRequest" />
148128
<Reference Include="System.Runtime.Serialization" />
149-
<Reference Include="System.Spatial">
150-
<SpecificVersion>False</SpecificVersion>
151-
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
152-
</Reference>
153129
<Reference Include="System.Xml.Linq" />
154130
<Reference Include="System.Data.DataSetExtensions" />
155131
<Reference Include="Microsoft.CSharp" />

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,16 @@
77
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Graph.RBAC" version="1.9.0-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
1110
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
1211
<package id="Microsoft.Azure.Management.Network" version="3.1.0-preview" targetFramework="net45" />
1312
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
1413
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1514
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1615
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
17-
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
18-
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
19-
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
2016
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
2117
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
2218
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
2319
<package id="Microsoft.Rest.ClientRuntime.Azure" version="2.5.4" targetFramework="net45" />
2420
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
2521
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
26-
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
27-
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
2822
</packages>

‎src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,6 @@
7171
<SpecificVersion>False</SpecificVersion>
7272
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.11-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7373
</Reference>
74-
<Reference Include="Microsoft.Data.Edm">
75-
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
76-
<Private>True</Private>
77-
</Reference>
78-
<Reference Include="Microsoft.Data.OData">
79-
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
80-
<Private>True</Private>
81-
</Reference>
82-
<Reference Include="Microsoft.Data.Services.Client">
83-
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
84-
<Private>True</Private>
85-
</Reference>
8674
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8775
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
8876
<Private>True</Private>
@@ -140,10 +128,6 @@
140128
</Reference>
141129
<Reference Include="System.Net.Http.WebRequest" />
142130
<Reference Include="System.Runtime.Serialization" />
143-
<Reference Include="System.Spatial">
144-
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
145-
<Private>True</Private>
146-
</Reference>
147131
<Reference Include="System.Xml.Linq" />
148132
<Reference Include="System.Data.DataSetExtensions" />
149133
<Reference Include="Microsoft.CSharp" />

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,10 @@
1111
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1212
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1313
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
14-
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
15-
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
16-
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
1714
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1815
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1916
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
2017
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
2118
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2219
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
23-
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
24-
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
25-
</packages>
20+
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" /></packages>

‎src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,6 @@
278278
<SpecificVersion>False</SpecificVersion>
279279
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
280280
</Reference>
281-
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
282-
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
283-
<Private>True</Private>
284-
</Reference>
285281
<Reference Include="Microsoft.Azure.Management.Sql, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
286282
<SpecificVersion>False</SpecificVersion>
287283
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.43.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
@@ -294,18 +290,6 @@
294290
<SpecificVersion>False</SpecificVersion>
295291
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.11-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
296292
</Reference>
297-
<Reference Include="Microsoft.Data.Edm">
298-
<SpecificVersion>False</SpecificVersion>
299-
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
300-
</Reference>
301-
<Reference Include="Microsoft.Data.OData">
302-
<SpecificVersion>False</SpecificVersion>
303-
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
304-
</Reference>
305-
<Reference Include="Microsoft.Data.Services.Client">
306-
<SpecificVersion>False</SpecificVersion>
307-
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
308-
</Reference>
309293
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
310294
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
311295
<Private>True</Private>
@@ -333,10 +317,6 @@
333317
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
334318
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
335319
</Reference>
336-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
337-
<SpecificVersion>False</SpecificVersion>
338-
<HintPath>..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
339-
</Reference>
340320
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
341321
<SpecificVersion>False</SpecificVersion>
342322
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -359,10 +339,6 @@
359339
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
360340
</Reference>
361341
<Reference Include="System.Net.Http.WebRequest" />
362-
<Reference Include="System.Spatial">
363-
<SpecificVersion>False</SpecificVersion>
364-
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
365-
</Reference>
366342
<Reference Include="System.XML" />
367343
<Reference Include="System.Xml.Linq" />
368344
</ItemGroup>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,17 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.6.1-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
87
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
98
<package id="Microsoft.Azure.Management.Sql" version="0.43.0-prerelease" targetFramework="net45" />
109
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
1110
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1211
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1312
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
14-
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
15-
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
16-
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
1713
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1814
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1915
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
2016
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
2117
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2218
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2319
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
24-
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
25-
<package id="WindowsAzure.Storage" version="5.0.0" targetFramework="net45" />
2620
</packages>

0 commit comments

Comments
 (0)