Skip to content

Commit 457d10d

Browse files
author
Hovsep
committed
Merge pull request Azure#1774 from hovsepm/dev
Revert "Merge pull request Azure#1769 from hovsepm/dev"
2 parents ff61e3f + d4cfce7 commit 457d10d

File tree

13 files changed

+313
-70
lines changed

13 files changed

+313
-70
lines changed

‎setup/azurecmdfiles.wxi

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

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,15 @@
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>
116125
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117126
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
118127
<Private>True</Private>
@@ -155,6 +164,9 @@
155164
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
156165
</Reference>
157166
<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>
158170
<Reference Include="System.XML" />
159171
<Reference Include="System.Xml.Linq" />
160172
</ItemGroup>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@
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" />
1316
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1417
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1518
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
1619
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
1720
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
21+
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
1822
</packages>

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@
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>
7175
<Reference Include="Microsoft.Azure.Management.Authorization">
7276
<SpecificVersion>False</SpecificVersion>
7377
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
@@ -76,7 +80,19 @@
7680
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.3.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
7781
<Private>True</Private>
7882
</Reference>
79-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
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">
8096
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
8197
<Private>True</Private>
8298
</Reference>
@@ -108,6 +124,10 @@
108124
<SpecificVersion>False</SpecificVersion>
109125
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
110126
</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>
111131
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
112132
<SpecificVersion>False</SpecificVersion>
113133
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -126,6 +146,10 @@
126146
</Reference>
127147
<Reference Include="System.Net.Http.WebRequest" />
128148
<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>
129153
<Reference Include="System.Xml.Linq" />
130154
<Reference Include="System.Data.DataSetExtensions" />
131155
<Reference Include="Microsoft.CSharp" />

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,22 @@
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" />
1011
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
1112
<package id="Microsoft.Azure.Management.Network" version="3.1.0-preview" targetFramework="net45" />
1213
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
1314
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1415
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1516
<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" />
1620
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1721
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1822
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
1923
<package id="Microsoft.Rest.ClientRuntime.Azure" version="2.5.4" targetFramework="net45" />
2024
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
2125
<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" />
2228
</packages>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,18 @@
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>
7486
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7587
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
7688
<Private>True</Private>
@@ -128,6 +140,10 @@
128140
</Reference>
129141
<Reference Include="System.Net.Http.WebRequest" />
130142
<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>
131147
<Reference Include="System.Xml.Linq" />
132148
<Reference Include="System.Data.DataSetExtensions" />
133149
<Reference Include="Microsoft.CSharp" />

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@
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" />
1417
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1518
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1619
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
1720
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
1821
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
1922
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
20-
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" /></packages>
23+
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
24+
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
25+
</packages>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,10 @@
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>
281285
<Reference Include="Microsoft.Azure.Management.Sql, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
282286
<SpecificVersion>False</SpecificVersion>
283287
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.43.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
@@ -290,6 +294,18 @@
290294
<SpecificVersion>False</SpecificVersion>
291295
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.11-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
292296
</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>
293309
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
294310
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
295311
<Private>True</Private>
@@ -317,6 +333,10 @@
317333
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
318334
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
319335
</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>
320340
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
321341
<SpecificVersion>False</SpecificVersion>
322342
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -339,6 +359,10 @@
339359
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
340360
</Reference>
341361
<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>
342366
<Reference Include="System.XML" />
343367
<Reference Include="System.Xml.Linq" />
344368
</ItemGroup>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,23 @@
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" />
78
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
89
<package id="Microsoft.Azure.Management.Sql" version="0.43.0-prerelease" targetFramework="net45" />
910
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
1011
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1112
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1213
<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" />
1317
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1418
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1519
<package id="Microsoft.Rest.ClientRuntime" version="1.8.2" targetFramework="net45" />
1620
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.11.0" targetFramework="net45" />
1721
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
1822
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
1923
<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" />
2026
</packages>

0 commit comments

Comments
 (0)