Skip to content

Commit a03cf94

Browse files
huangpfhuangpf
committed
Update DLL & Test Script
1 parent ef249e0 commit a03cf94

File tree

7 files changed

+641
-20
lines changed

7 files changed

+641
-20
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<SpecificVersion>False</SpecificVersion>
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.Compute, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.7.0.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
69+
<Reference Include="Microsoft.Azure.Management.Compute, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.8.2.0\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ function Test-VirtualMachineListWithPaging
13651365
try
13661366
{
13671367
# Common
1368-
$loc = 'West US';
1368+
$loc = Get-ComputeDefaultLocation;
13691369
New-AzureResourceGroup -Name $rgname -Location $loc -Force;
13701370

13711371
$numberOfInstances = 51;
@@ -1399,7 +1399,7 @@ function Test-VirtualMachineListWithPaging
13991399

14001400
Set-Content -Path $paramFile -Value $paramContent -Force -Verbose;
14011401

1402-
New-AzureResourceGroupDeployment -Name "${rgname}dp" -ResourceGroupName $rgname -TemplateFile $templateFile -TemplateParameterFile $paramFile -Verbose;
1402+
New-AzureResourceGroupDeployment -Name "${rgname}dp" -ResourceGroupName $rgname -TemplateFile $templateFile -TemplateParameterFile $paramFile;
14031403

14041404
$vms = Get-AzureVM -ResourceGroupName $rgname;
14051405
Assert-True { $vms.Count -eq $numberOfInstances };

‎src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineTests/TestVirtualMachineListWithPaging.json

Lines changed: 629 additions & 0 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Compute/Commands.Compute.Test/Templates/azuredeploy.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@
2929
},
3030
"location": {
3131
"type": "string",
32-
"allowedValues": [
33-
"West US",
34-
"East US",
35-
"West Europe",
36-
"East Asia",
37-
"Southeast Asia"
38-
],
3932
"metadata": {
4033
"description": "Location to deploy the VM in"
4134
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.Compute" version="7.0.0-preview" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Compute" version="8.2.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Network" version="2.0.9-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Resources" version="2.18.4-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
<SpecificVersion>False</SpecificVersion>
7878
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7979
</Reference>
80-
<Reference Include="Microsoft.Azure.Management.Compute, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.7.0.0-preview\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
80+
<Reference Include="Microsoft.Azure.Management.Compute, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.8.2.0\lib\net40\Microsoft.Azure.Management.Compute.dll</HintPath>
8282
<Private>True</Private>
8383
</Reference>
8484
<Reference Include="Microsoft.Azure.Management.Network, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -347,4 +347,4 @@
347347
<Target Name="AfterBuild">
348348
</Target>
349349
-->
350-
</Project>
350+
</Project>

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Graph.RBAC" version="1.7.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
11-
<package id="Microsoft.Azure.Management.Compute" version="7.0.0-preview" targetFramework="net45" />
11+
<package id="Microsoft.Azure.Management.Compute" version="8.2.0" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Network" version="2.0.9-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.Resources" version="2.18.4-preview" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
@@ -18,12 +18,11 @@
1818
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
1919
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
2020
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
21-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
22-
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
23-
<package id="WindowsAzure.Storage" version="5.0.0" targetFramework="net45" />
2421
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
2522
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
2623
<package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
2724
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
28-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
25+
<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="5.0.0" targetFramework="net45" />
2928
</packages>

0 commit comments

Comments
 (0)