Skip to content

Commit 21a7e12

Browse files
deepakswiftydeepakswifty
committed
merge with crp2
2 parents 71f45c7 + af58849 commit 21a7e12

File tree

56 files changed

+4927
-6944
lines changed

Some content is hidden

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

56 files changed

+4927
-6944
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -768,9 +768,6 @@
768768
<Component Id="cmp02282C55620BE455F3DA6F0140F930DB" Guid="*">
769769
<File Id="filB27ECB158FA6C96FB8A9BE6403FEE113" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\NetworkResourceProvider\Microsoft.Azure.Management.Network.dll" />
770770
</Component>
771-
<Component Id="cmp376056F5367B9E5C189D8A246AFA0C97" Guid="*">
772-
<File Id="filB9CCFF18187D11B090CC1D2F8C043600" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\NetworkResourceProvider\Microsoft.Azure.Management.Storage.dll" />
773-
</Component>
774771
<Component Id="cmp143934D4D6CF1D6494CCBEAB5587D90C" Guid="*">
775772
<File Id="filAC769B36278D851238820D0CA032D9C0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\NetworkResourceProvider\Microsoft.Azure.ResourceManager.dll" />
776773
</Component>
@@ -1118,6 +1115,9 @@
11181115
<Component Id="cmp93A93C29B2093AFCB0348F2C5B999E64" Guid="*">
11191116
<File Id="fil3D666DBAA021AB26520C7A0308E583D4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Newtonsoft.Json.dll" />
11201117
</Component>
1118+
<Component Id="cmp61DDE2E3D2FBB80AA9CED6F33128035D" Guid="*">
1119+
<File Id="fil7149B5FE830ECDCE2EACA3B4E8289AAF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\PostBuild.ps1" />
1120+
</Component>
11211121
<Component Id="cmp7985D9505A461C04CC38A8D7F341EBC2" Guid="*">
11221122
<File Id="fil12F263F6FC0E5DBC1B0BCA1887AFD846" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\System.Net.Http.Extensions.dll" />
11231123
</Component>
@@ -2764,6 +2764,9 @@
27642764
<Component Id="cmpA10291DA4F33CEBFB790A935E68C763C" Guid="*">
27652765
<File Id="filF5A4A20E3A90049515A936CA24C18514" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Newtonsoft.Json.dll" />
27662766
</Component>
2767+
<Component Id="cmp8839023EABF68726F33F2E22907EE5CA" Guid="*">
2768+
<File Id="fil7E09EF4FC96DB53F9DCD865B90E854B6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\PostBuild.ps1" />
2769+
</Component>
27672770
<Component Id="cmp0B5A5E6BA5861771073ED88DCAB35DCC" Guid="*">
27682771
<File Id="fil7399EB9870646ED4FE533B1842E6CE84" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\ServiceManagementStartup.ps1" />
27692772
</Component>
@@ -2859,6 +2862,9 @@
28592862
<Component Id="cmp6ECD97BC8B820C8F075B08C926EE8E18" Guid="*">
28602863
<File Id="fil327F23A245CA0317EFF25FB727CC237C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Storage\Newtonsoft.Json.dll" />
28612864
</Component>
2865+
<Component Id="cmp2788656715EE90B002A2DF2A355A4B7C" Guid="*">
2866+
<File Id="fil255776871423D5F544B74A1AA9926B3C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Storage\PostBuild.ps1" />
2867+
</Component>
28622868
<Component Id="cmpDE403EAE6FDC0C14D1EC077F2D9DCDF6" Guid="*">
28632869
<File Id="fil63C9BDB6186929AAA2E72F85AA3A4558" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Storage\System.Net.Http.Extensions.dll" />
28642870
</Component>
@@ -3252,7 +3258,6 @@
32523258
<ComponentRef Id="cmp7ADB55DC274F3EAC0A57EF6D74270CF1" />
32533259
<ComponentRef Id="cmpA51A23FDB8743E3EE5338D2FBA1CBD59" />
32543260
<ComponentRef Id="cmp02282C55620BE455F3DA6F0140F930DB" />
3255-
<ComponentRef Id="cmp376056F5367B9E5C189D8A246AFA0C97" />
32563261
<ComponentRef Id="cmp143934D4D6CF1D6494CCBEAB5587D90C" />
32573262
<ComponentRef Id="cmp705C423CD334C3C2D04EF72EF593B26B" />
32583263
<ComponentRef Id="cmp143F53256F23DC7DFAE70795CA1FFA11" />
@@ -3366,6 +3371,7 @@
33663371
<ComponentRef Id="cmp8CC873DBE9230381C5CDCADC4920348E" />
33673372
<ComponentRef Id="cmp1E206A516CD1793516989E02475DED35" />
33683373
<ComponentRef Id="cmp93A93C29B2093AFCB0348F2C5B999E64" />
3374+
<ComponentRef Id="cmp61DDE2E3D2FBB80AA9CED6F33128035D" />
33693375
<ComponentRef Id="cmp7985D9505A461C04CC38A8D7F341EBC2" />
33703376
<ComponentRef Id="cmp02ACACBB96C5AF339C3EF0B3D748D59D" />
33713377
<ComponentRef Id="cmpADC075B4FA9AC22F9AA7C27E98D28FBE" />
@@ -3894,6 +3900,7 @@
38943900
<ComponentRef Id="cmpB559FF7BECE247BF0FB2DEE533E5A820" />
38953901
<ComponentRef Id="cmp2DA9A48FC4B479D897435D7DCFA6DDE3" />
38963902
<ComponentRef Id="cmpA10291DA4F33CEBFB790A935E68C763C" />
3903+
<ComponentRef Id="cmp8839023EABF68726F33F2E22907EE5CA" />
38973904
<ComponentRef Id="cmp0B5A5E6BA5861771073ED88DCAB35DCC" />
38983905
<ComponentRef Id="cmp8FDC59E62622D98C6BE19E68ABC2666F" />
38993906
<ComponentRef Id="cmpE8892E4AE524E10FC9808A04A8A7D4BE" />
@@ -3925,6 +3932,7 @@
39253932
<ComponentRef Id="cmp294C3C7148D92CE8D41B74464DF7DEBD" />
39263933
<ComponentRef Id="cmpD77395F69A94BA2E235B63510FA5ACE2" />
39273934
<ComponentRef Id="cmp6ECD97BC8B820C8F075B08C926EE8E18" />
3935+
<ComponentRef Id="cmp2788656715EE90B002A2DF2A355A4B7C" />
39283936
<ComponentRef Id="cmpDE403EAE6FDC0C14D1EC077F2D9DCDF6" />
39293937
<ComponentRef Id="cmp558B809B6B758A29CA1CD1B340943369" />
39303938
<ComponentRef Id="cmp2D8EAF351C80F628AB412FA578D5DA1F" />

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
6161
</Reference>
6262
<Reference Include="Microsoft.Azure.Management.Authorization">
63-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.1-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
63+
<SpecificVersion>False</SpecificVersion>
64+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6465
</Reference>
6566
<Reference Include="Microsoft.Azure.Management.Batch">
6667
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Batch.1.3.0-preview\lib\net40\Microsoft.Azure.Management.Batch.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Common.Authentication" version="1.0.22-preview" targetFramework="net45" />
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" />
9-
<package id="Microsoft.Azure.Management.Authorization" version="0.18.1-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.Authorization" version="0.18.2-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Batch" version="1.3.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,17 @@
6262
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll</HintPath>
6363
</Reference>
6464
<Reference Include="Microsoft.Azure.Management.Authorization">
65-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.1-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
65+
<SpecificVersion>False</SpecificVersion>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6667
</Reference>
6768
<Reference Include="Microsoft.Azure.Management.Compute">
6869
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.3.4.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
6970
</Reference>
70-
<Reference Include="Microsoft.Azure.Management.Network">
71+
<Reference Include="Microsoft.Azure.Management.Storage">
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.1.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
73+
</Reference> <Reference Include="Microsoft.Azure.Management.Network">
7174
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.1.0.8-preview\lib\net40\Microsoft.Azure.Management.Network.dll</HintPath>
72-
</Reference>
73-
<Reference Include="Microsoft.Azure.ResourceManager">
75+
</Reference> <Reference Include="Microsoft.Azure.ResourceManager">
7476
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7577
</Reference>
7678
<Reference Include="Microsoft.Azure.Test.Framework">
@@ -99,10 +101,6 @@
99101
<SpecificVersion>False</SpecificVersion>
100102
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
101103
</Reference>
102-
<Reference Include="Microsoft.Azure.Management.Storage">
103-
<SpecificVersion>False</SpecificVersion>
104-
<HintPath>..\..\..\lib\Microsoft.Azure.Management.Storage.dll</HintPath>
105-
</Reference>
106104
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
107105
<SpecificVersion>False</SpecificVersion>
108106
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/ComputeTestController.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public sealed class ComputeTestController
5252
public AuthorizationManagementClient AuthorizationManagementClient { get; private set; }
5353

5454

55-
public SrpManagementClient StorageClient { get; private set; }
55+
public StorageManagementClient StorageClient { get; private set; }
5656

5757
public NetworkResourceProviderClient NetworkResourceProviderClient { get; private set; }
5858

@@ -208,11 +208,11 @@ private SubscriptionClient GetSubscriptionClient()
208208
return TestBase.GetServiceClient<SubscriptionClient>(this.csmTestFactory);
209209
}
210210

211-
private SrpManagementClient GetStorageManagementClient()
211+
private StorageManagementClient GetStorageManagementClient()
212212
{
213213
return testViaCsm
214-
? TestBase.GetServiceClient<SrpManagementClient>(this.csmTestFactory)
215-
: TestBase.GetServiceClient<SrpManagementClient>(new RDFETestEnvironmentFactory());
214+
? TestBase.GetServiceClient<StorageManagementClient>(this.csmTestFactory)
215+
: TestBase.GetServiceClient<StorageManagementClient>(new RDFETestEnvironmentFactory());
216216
}
217217

218218
private GalleryClient GetGalleryClient()

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StorageAccountTests.ps1

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,33 +33,37 @@ function Test-StorageAccount
3333
New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
3434
$stos = Get-AzureStorageAccount -ResourceGroupName $rgname;
3535

36+
$stotype = 'StandardGRS';
3637
Retry-IfException { $global:sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname; }
3738
Assert-AreEqual $sto.Name $stoname;
38-
Assert-AreEqual $sto.Properties.AccountType $stotype;
39+
Assert-AreEqual $sto.AccountType $stotype;
3940
Assert-AreEqual $sto.Location $loc;
4041

4142
$stotype = 'Standard_LRS';
4243
# TODO: Still need to do retry for Set-, even after Get- returns it.
4344
Retry-IfException { $global:sto = Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype; }
4445
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
46+
$stotype = 'StandardLRS';
4547
Assert-AreEqual $sto.Name $stoname;
46-
Assert-AreEqual $sto.Properties.AccountType $stotype;
48+
Assert-AreEqual $sto.AccountType $stotype;
4749
Assert-AreEqual $sto.Location $loc;
4850

4951
$stotype = 'Standard_RAGRS';
5052
Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype;
5153

5254
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
55+
$stotype = 'StandardRAGRS';
5356
Assert-AreEqual $sto.Name $stoname;
54-
Assert-AreEqual $sto.Properties.AccountType $stotype;
57+
Assert-AreEqual $sto.AccountType $stotype;
5558
Assert-AreEqual $sto.Location $loc;
5659

5760
$stotype = 'Standard_GRS';
5861
Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype;
5962

6063
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
64+
$stotype = 'StandardGRS';
6165
Assert-AreEqual $sto.Name $stoname;
62-
Assert-AreEqual $sto.Properties.AccountType $stotype;
66+
Assert-AreEqual $sto.AccountType $stotype;
6367
Assert-AreEqual $sto.Location $loc;
6468

6569
$stokey1 = Get-AzureStorageAccountKey -ResourceGroupName $rgname -Name $stoname;
@@ -136,13 +140,14 @@ function Test-GetAzureStorageAccount
136140
New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
137141

138142
Retry-IfException { $global:sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname; }
143+
$stotype = 'StandardGRS';
139144
Assert-AreEqual $sto.Name $stoname;
140-
Assert-AreEqual $sto.Properties.AccountType $stotype;
145+
Assert-AreEqual $sto.AccountType $stotype;
141146
Assert-AreEqual $sto.Location $loc;
142147

143148
$stos = Get-AzureStorageAccount -ResourceGroupName $rgname;
144149
Assert-AreEqual $stos[0].Name $stoname;
145-
Assert-AreEqual $stos[0].Properties.AccountType $stotype;
150+
Assert-AreEqual $stos[0].AccountType $stotype;
146151
Assert-AreEqual $stos[0].Location $loc;
147152

148153
Remove-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
@@ -174,13 +179,14 @@ function Test-SetAzureStorageAccount
174179
New-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype;
175180

176181
Retry-IfException { $global:sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname; }
182+
$stotype = 'StandardGRS';
177183
Assert-AreEqual $sto.Name $stoname;
178-
Assert-AreEqual $sto.Properties.AccountType $stotype;
184+
Assert-AreEqual $sto.AccountType $stotype;
179185
Assert-AreEqual $sto.Location $loc;
180186

181187
$stos = Get-AzureStorageAccount -ResourceGroupName $rgname;
182188
Assert-AreEqual $stos[0].Name $stoname;
183-
Assert-AreEqual $stos[0].Properties.AccountType $stotype;
189+
Assert-AreEqual $stos[0].AccountType $stotype;
184190
Assert-AreEqual $stos[0].Location $loc;
185191

186192
$stotype = 'Standard_LRS';
@@ -190,8 +196,9 @@ function Test-SetAzureStorageAccount
190196
Set-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname -Type $stotype;
191197

192198
$sto = Get-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;
199+
$stotype = 'StandardRAGRS';
193200
Assert-AreEqual $sto.Name $stoname;
194-
Assert-AreEqual $sto.Properties.AccountType $stotype;
201+
Assert-AreEqual $sto.AccountType $stotype;
195202
Assert-AreEqual $sto.Location $loc;
196203

197204
Remove-AzureStorageAccount -ResourceGroupName $rgname -Name $stoname;

0 commit comments

Comments
 (0)