Skip to content

Commit 18d4840

Browse files
ogailogail
committed
Merge pull request Azure#83 from ogail/dev
Update Azure PowerShell to depend on Hyak.Common
2 parents b12da02 + b8f16e5 commit 18d4840

File tree

341 files changed

+11741
-5021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

341 files changed

+11741
-5021
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 288 additions & 156 deletions
Large diffs are not rendered by default.

‎src/AzurePowershell.sln

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics",
155155
EndProject
156156
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Test", "ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\Commands.StreamAnalytics.Test.csproj", "{7E6683BE-ECFF-4709-89EB-1325E9E70512}"
157157
EndProject
158-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Extensions", "Common\Azure.Common.Extensions\Common.Extensions.csproj", "{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}"
159-
EndProject
160158
Global
161159
GlobalSection(SolutionConfigurationPlatforms) = preSolution
162160
Debug|Any CPU = Debug|Any CPU
@@ -355,6 +353,10 @@ Global
355353
{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Debug|Any CPU.Build.0 = Debug|Any CPU
356354
{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Release|Any CPU.ActiveCfg = Release|Any CPU
357355
{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Release|Any CPU.Build.0 = Release|Any CPU
356+
{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
357+
{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
358+
{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
359+
{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Release|Any CPU.Build.0 = Release|Any CPU
358360
{98B10548-DF97-4FB1-8D82-2A12945D4F21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
359361
{98B10548-DF97-4FB1-8D82-2A12945D4F21}.Debug|Any CPU.Build.0 = Debug|Any CPU
360362
{98B10548-DF97-4FB1-8D82-2A12945D4F21}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -363,10 +365,6 @@ Global
363365
{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
364366
{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
365367
{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}.Release|Any CPU.Build.0 = Release|Any CPU
366-
{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
367-
{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
368-
{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
369-
{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Release|Any CPU.Build.0 = Release|Any CPU
370368
{F49A314A-A235-47D3-A654-1EC19ACA366C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
371369
{F49A314A-A235-47D3-A654-1EC19ACA366C}.Debug|Any CPU.Build.0 = Debug|Any CPU
372370
{F49A314A-A235-47D3-A654-1EC19ACA366C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -375,10 +373,6 @@ Global
375373
{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Debug|Any CPU.Build.0 = Debug|Any CPU
376374
{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Release|Any CPU.ActiveCfg = Release|Any CPU
377375
{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Release|Any CPU.Build.0 = Release|Any CPU
378-
{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
379-
{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Debug|Any CPU.Build.0 = Debug|Any CPU
380-
{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Release|Any CPU.ActiveCfg = Release|Any CPU
381-
{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Release|Any CPU.Build.0 = Release|Any CPU
382376
EndGlobalSection
383377
GlobalSection(SolutionProperties) = preSolution
384378
HideSolutionNode = FALSE
@@ -407,8 +401,8 @@ Global
407401
{4AE5705F-62CF-461D-B72E-DD9DCD9B3609} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
408402
{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
409403
{FDB897BD-FCB4-44A1-8D66-AC99F22EC737} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
410-
{A415F75B-EB6A-49A6-934E-5BA71B83D6EB} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
411404
{080B0477-7E52-4455-90AB-23BD13D1B1CE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
405+
{A415F75B-EB6A-49A6-934E-5BA71B83D6EB} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
412406
{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
413407
EndGlobalSection
414408
EndGlobal

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,26 @@
4848
<Prefer32Bit>false</Prefer32Bit>
4949
</PropertyGroup>
5050
<ItemGroup>
51+
<Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52+
<SpecificVersion>False</SpecificVersion>
53+
<HintPath>..\..\packages\Hyak.Common.1.0.1\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
54+
</Reference>
55+
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<SpecificVersion>False</SpecificVersion>
57+
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.1\lib\net45\Microsoft.Azure.Common.dll</HintPath>
58+
</Reference>
59+
<Reference Include="Microsoft.Azure.Common.Extensions, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<SpecificVersion>False</SpecificVersion>
61+
<HintPath>..\..\packages\Microsoft.Azure.Common.Extensions.0.13.0-preview\lib\net45\Microsoft.Azure.Common.Extensions.dll</HintPath>
62+
</Reference>
63+
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<SpecificVersion>False</SpecificVersion>
65+
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.1\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
66+
</Reference>
67+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<SpecificVersion>False</SpecificVersion>
69+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
70+
</Reference>
5171
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5272
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
5373
</Reference>
@@ -57,6 +77,13 @@
5777
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5878
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
5979
</Reference>
80+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<SpecificVersion>False</SpecificVersion>
82+
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
83+
</Reference>
84+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms">
85+
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
86+
</Reference>
6087
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6188
<SpecificVersion>False</SpecificVersion>
6289
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -69,20 +96,16 @@
6996
<SpecificVersion>False</SpecificVersion>
7097
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
7198
</Reference>
72-
<Reference Include="Microsoft.WindowsAzure.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
73-
<SpecificVersion>False</SpecificVersion>
74-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.dll</HintPath>
75-
</Reference>
76-
<Reference Include="Microsoft.WindowsAzure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<SpecificVersion>False</SpecificVersion>
78-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll</HintPath>
79-
</Reference>
8099
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81100
<HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
82101
</Reference>
83-
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
102+
<Reference Include="Microsoft.WindowsAzure.Management, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84103
<SpecificVersion>False</SpecificVersion>
85-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.3.1.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
104+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.0.0\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
105+
</Reference>
106+
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107+
<SpecificVersion>False</SpecificVersion>
108+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
86109
</Reference>
87110
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88111
<SpecificVersion>False</SpecificVersion>
@@ -131,10 +154,6 @@
131154
<Compile Include="WindowsAzureSubscriptionExtensions.cs" />
132155
</ItemGroup>
133156
<ItemGroup>
134-
<ProjectReference Include="..\Azure.Common.Extensions\Common.Extensions.csproj">
135-
<Project>{b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89}</Project>
136-
<Name>Common.Extensions</Name>
137-
</ProjectReference>
138157
<ProjectReference Include="..\Commands.Common\Commands.Common.csproj">
139158
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
140159
<Name>Commands.Common</Name>

‎src/Common/Commands.Common.Storage/packages.config

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Hyak.Common" version="1.0.1" targetFramework="net45" />
4+
<package id="Microsoft.Azure.Common" version="2.0.1" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Common.Extensions" version="0.13.0-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
38
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
49
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
510
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
611
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
712
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
813
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
14+
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.11.10918.1222" targetFramework="net45" />
915
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
10-
<package id="Microsoft.WindowsAzure.Common" version="1.4.1" targetFramework="net45" />
11-
<package id="Microsoft.WindowsAzure.Common.Dependencies" version="1.1.1" targetFramework="net45" />
1216
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
13-
<package id="Microsoft.WindowsAzure.Management.Storage" version="3.1.0" targetFramework="net45" />
17+
<package id="Microsoft.WindowsAzure.Management" version="4.0.0" targetFramework="net45" />
18+
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.0.0" targetFramework="net45" />
1419
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1520
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
1621
<package id="WindowsAzure.Storage" version="4.0.0" targetFramework="net45" />

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,25 @@
4848
<Prefer32Bit>false</Prefer32Bit>
4949
</PropertyGroup>
5050
<ItemGroup>
51-
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<Reference Include="Hyak.Common">
52+
<HintPath>..\..\packages\Hyak.Common.1.0.1\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
53+
</Reference>
54+
<Reference Include="Microsoft.Azure.Common">
55+
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.1\lib\net45\Microsoft.Azure.Common.dll</HintPath>
56+
</Reference>
57+
<Reference Include="Microsoft.Azure.Common.Extensions, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5258
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.7.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
54-
<Private>True</Private>
59+
<HintPath>..\..\packages\Microsoft.Azure.Common.Extensions.0.13.0-preview\lib\net45\Microsoft.Azure.Common.Extensions.dll</HintPath>
60+
</Reference>
61+
<Reference Include="Microsoft.Azure.Common.NetFramework">
62+
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.1\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
63+
</Reference>
64+
<Reference Include="Microsoft.Azure.ResourceManager">
65+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
5566
</Reference>
56-
<Reference Include="Microsoft.Azure.Utilities.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67+
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5768
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\..\packages\Hydra.HttpRecorder.1.0.5417.13285-prerelease\lib\net45\Microsoft.Azure.Utilities.HttpRecorder.dll</HintPath>
69+
<HintPath>..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5486.28526-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
5970
</Reference>
6071
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6172
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
@@ -87,28 +98,17 @@
8798
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
8899
</Reference>
89100
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
90-
<Reference Include="Microsoft.WindowsAzure.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91-
<SpecificVersion>False</SpecificVersion>
92-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.dll</HintPath>
93-
</Reference>
94-
<Reference Include="Microsoft.WindowsAzure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95-
<SpecificVersion>False</SpecificVersion>
96-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll</HintPath>
97-
</Reference>
98101
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
99102
<HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
100103
</Reference>
101-
<Reference Include="Microsoft.WindowsAzure.Management, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
102-
<SpecificVersion>False</SpecificVersion>
103-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.2.1.0\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
104+
<Reference Include="Microsoft.WindowsAzure.Management">
105+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.0.0\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
104106
</Reference>
105-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106-
<SpecificVersion>False</SpecificVersion>
107-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.6.1.2\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
107+
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
108+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.8.0.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
108109
</Reference>
109-
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110-
<SpecificVersion>False</SpecificVersion>
111-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.3.1.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
110+
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
111+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
112112
</Reference>
113113
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114114
<SpecificVersion>False</SpecificVersion>
@@ -156,28 +156,28 @@
156156
<Compile Include="Common\ProfileCmdltsTests.cs" />
157157
<Compile Include="Common\ProfileClientTests.cs" />
158158
<Compile Include="Common\ServicePrincipalStoreTests.cs" />
159-
<Compile Include="Mocks\MockAccessTokenProvider.cs" />
160-
<Compile Include="Mocks\MockTokenAuthenticationFactory.cs" />
161-
<Compile Include="Mocks\MockCertificateAuthenticationFactory.cs" />
162-
<Compile Include="Mocks\ClientMocks.cs" />
163159
<Compile Include="Common\GeneralUtilitiesTests.cs" />
164160
<Compile Include="Common\Data.cs" />
165161
<Compile Include="Common\DirStack.cs" />
166162
<Compile Include="Common\EmbeddedFileWriter.cs" />
167163
<Compile Include="Common\GeneralTests.cs" />
168164
<Compile Include="Common\IdnUtilitiesTests.cs" />
169165
<Compile Include="Common\JsonUtilitiesTests.cs" />
170-
<Compile Include="Mocks\MockCommandRuntime.cs" />
171-
<Compile Include="Mocks\MockDataStore.cs" />
172-
<Compile Include="Mocks\MockClientFactory.cs" />
166+
<Compile Include="Mocks\ClientMocks.cs" />
173167
<Compile Include="Mocks\MockAccessToken.cs" />
168+
<Compile Include="Mocks\MockAccessTokenProvider.cs" />
169+
<Compile Include="Mocks\MockCertificateAuthenticationFactory.cs" />
170+
<Compile Include="Mocks\MockClientFactory.cs" />
171+
<Compile Include="Mocks\MockCommandRuntime.cs" />
174172
<Compile Include="Common\PSObjectExtensions.cs" />
175173
<Compile Include="Common\RemoveAzurePublishSettings.cs" />
176174
<Compile Include="Common\SimpleServiceManagementAsyncResult.cs" />
177175
<Compile Include="Common\TestBase.cs" />
178176
<Compile Include="Common\ConversionUtilitiesTests.cs" />
179177
<Compile Include="Common\Testing.cs" />
180178
<Compile Include="Common\TestingTracingInterceptor.cs" />
179+
<Compile Include="Mocks\MockDataStore.cs" />
180+
<Compile Include="Mocks\MockTokenAuthenticationFactory.cs" />
181181
<Compile Include="Properties\AssemblyInfo.cs" />
182182
<Compile Include="Properties\Resources.Designer.cs">
183183
<AutoGen>True</AutoGen>
@@ -187,10 +187,6 @@
187187
<Compile Include="Resources\ResourceLocator.cs" />
188188
</ItemGroup>
189189
<ItemGroup>
190-
<ProjectReference Include="..\Azure.Common.Extensions\Common.Extensions.csproj">
191-
<Project>{b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89}</Project>
192-
<Name>Common.Extensions</Name>
193-
</ProjectReference>
194190
<ProjectReference Include="..\Commands.Common.Storage\Commands.Common.Storage.csproj">
195191
<Project>{65c3a86a-716d-4e7d-ab67-1db00b3bf72d}</Project>
196192
<Name>Commands.Common.Storage</Name>

0 commit comments

Comments
 (0)