Skip to content

Commit 27bfa42

Browse files
sriramvusriramvu
committed
Merge remote-tracking branch 'upstream/dev' into dev
2 parents 827a0f2 + 85ec2b7 commit 27bfa42

File tree

24 files changed

+1695
-1154
lines changed

24 files changed

+1695
-1154
lines changed

‎ChangeLog.txt

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,40 @@
1-
2015.06.25 version 0.9.4
2-
* Added Batch cmdlets
3-
* Start-AzureBatchPoolResize
4-
* Stop-AzureBatchPoolResize
5-
* Azure SQL Database
6-
* Added cmdlets for pause/resume functionality and retrieving restore points for restoring backups:
7-
* Suspend-AzureSqlDatabase
8-
* Resume-AzureSqlDatabase
9-
* Get-AzureSqlDatabaseRestorePoints
10-
* Changed cmdlets:
11-
* New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
12-
* RedisCache cmdlets
13-
* Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
14-
* New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513
1+
2015.06.26 version 0.9.4
2+
* Azure Compute cmdlets
3+
* Warning message for deprecation Name parameter in New-AzureVM. The guidance is to use –Name parameter in New-AzureVMConfig cmdlet.
4+
* Save-AzureVMImgage has new paramter -Path to save the JSON template returned from the server.
5+
* Add-AzureVMNetworkInterface has new paramter -NetworkInterface which accepts a list of NIC object returned by Get-AzureNetworkInterface cmdlet.
6+
* Deprecated “-Name” parameter in Set-AzureVMSourceImage. The guidance is to use the Pub, Offer, SKU, Version method to specify the VM Images for the VM.
7+
* Fixed the formatting of the output of VM Image cmdlets.
8+
* Fixed issues in New/Set-AzureDeployment & other service extension related cmdlets.
9+
* Azure Batch cmdlets
10+
* Added Start-AzureBatchPoolResize
11+
* Added Stop-AzureBatchPoolResize
1512
* Azure Key Vault cmdlets
1613
* Updated Key Vault package versions
1714
* Fixed bugs related to secrets
18-
* Azure Resource Manager
19-
* Added Get-AzureProviderOperation cmdlet
20-
* Added Test-AzureResourceGroup and Test-AzureResource cmdlets
21-
* Refactored Resource Lock cmdlets
22-
* Removed unnecessary code when getting a resource
23-
* Added UsageAggregates cmdlets
24-
* Get-UsageAggregates
25-
* Network Resource Provider changes
15+
* Azure Network Resource Provider cmdlets
2616
* New-AzureLocalNetworkGateway parameter name change
2717
* Reset-AzureLocalNetworkGateway renamed to Set-AzureLocalNetworkGateway, added new parameter
2818
* VirtualNetworkGateway parameter changes
2919
* New-AzureVirtualNetworkGateway parameter changes
3020
* Removed command Resize-AzureVirtualNetworkGateway
3121
* Reset-AzureVirtualNetworkGatewayConnection renamed to Set-AzureVirtualNetworkGatewayConnection8
22+
* Azure RedisCache cmdlets
23+
* Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
24+
* New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513
25+
* Azure Resource Manager cmdlets
26+
* Added Get-UsageAggregates
27+
* Added Get-AzureProviderOperation cmdlet
28+
* Added Test-AzureResourceGroup and Test-AzureResource cmdlets
29+
* Refactored Resource Lock cmdlets
30+
* Removed unnecessary code when getting a resource
31+
* Azure SQL Database
32+
* Added cmdlets for pause/resume functionality and retrieving restore points for restoring backups:
33+
* Suspend-AzureSqlDatabase
34+
* Resume-AzureSqlDatabase
35+
* Get-AzureSqlDatabaseRestorePoints
36+
* Changed cmdlets:
37+
* New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
3238

3339
2015.06.05 version 0.9.3
3440
* Fixed bug in Websites cmdlets related to slots #454

‎setup/azurecmd.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="0.9.3" ?>
8+
<?define version="0.9.4" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

‎setup/azurecmdfiles.wxi

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

‎setup/azurepowershell.sln

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
3+
VisualStudioVersion = 12.0.30110.0
44
MinimumVisualStudioVersion = 10.0.40219.1
5+
56
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "azurepowershell", "azurepowershell.wixproj", "{36D6E303-E057-4963-A093-C7AAE0FD92B3}"
67
ProjectSection(ProjectDependencies) = postProject
78
{EA5BD11B-10B3-433D-A250-92AE76669D8D} = {EA5BD11B-10B3-433D-A250-92AE76669D8D}
@@ -15,8 +16,10 @@ Global
1516
Release|Any CPU = Release|Any CPU
1617
EndGlobalSection
1718
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|x86
19-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|x86
19+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
21+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
22+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.Build.0 = Release|Any CPU
2023
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2124
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
2225
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/Common/Commands.Common/AzurePowerShell.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public class AzurePowerShell
2727

2828
public const string AssemblyCopyright = "Copyright © Microsoft";
2929

30-
public const string AssemblyVersion = "0.9.3";
30+
public const string AssemblyVersion = "0.9.4";
3131

32-
public const string AssemblyFileVersion = "0.9.3";
32+
public const string AssemblyFileVersion = "0.9.4";
3333

3434
public const string ProfileFile = "AzureProfile.json";
3535

‎src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2828
<DebugType>pdbonly</DebugType>
29+
<DefineConstants>TRACE;SIGN</DefineConstants>
2930
<Optimize>true</Optimize>
3031
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\UsageAggregates</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
32+
<PlatformTarget>AnyCPU</PlatformTarget>
33+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
34+
<SignAssembly>true</SignAssembly>
35+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
36+
<DelaySign>true</DelaySign>
3437
</PropertyGroup>
3538
<ItemGroup>
3639
<Reference Include="Hyak.Common">
@@ -83,6 +86,7 @@
8386
</ItemGroup>
8487
<ItemGroup>
8588
<None Include="Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1" />
89+
<None Include="MSSharedLibKey.snk" />
8690
<None Include="packages.config" />
8791
<None Include="TestTheCmdLet.ps1" />
8892
</ItemGroup>

‎src/ResourceManager/Commerce/Commands.UsageAggregates/MSSharedLibKey.snk

160 Bytes
Binary file not shown.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@
167167
<None Include="ScenarioTests\Common.ps1">
168168
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
169169
</None>
170-
<None Include="ScenarioTests\KeyVaultManagementTests.ps1">
170+
<None Include="Scripts\ControlPlane\KeyVaultManagementTests.ps1">
171+
<Link>ScenarioTests\KeyVaultManagementTests.ps1</Link>
171172
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
172173
</None>
173174
<None Include="SessionRecords\Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests\TestCreateDeleteVaultWithPiping.json">

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/Common.ps1

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Get test secret name
5656
#>
5757
function Get-SecretName([string]$suffix)
5858
{
59-
return 'pshts-' + $global:testns+ '-' + $suffix
59+
return 'pshts-' + $global:testns + '-' + $suffix
6060
}
6161

6262

@@ -240,6 +240,18 @@ function Run-SecretTest ([ScriptBlock] $test, [string] $testName)
240240
}
241241
}
242242

243+
function Run-VaultTest ([ScriptBlock] $test, [string] $testName)
244+
{
245+
try
246+
{
247+
Run-Test $test $testName *>> "$testName.debug_log"
248+
}
249+
finally
250+
{
251+
252+
}
253+
}
254+
243255
function Write-FileReport
244256
{
245257
$fileName = "$global:testEnv"+"$global:testns"+"Summary.debug_log"

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/ControlPlane/Common.ps1

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
<#
16+
.SYNOPSIS
17+
Gets the location for the Website. Default to West US if none found.
18+
#>
19+
function Get-Location
20+
{
21+
$location = Get-AzureLocation | where {$_.Name -eq "Microsoft.KeyVault/vaults"}
22+
if ($location -eq $null)
23+
{
24+
return "East US"
25+
}
26+
else
27+
{
28+
$location.Locations[0]
29+
}
30+
}
31+
32+
<#
33+
.SYNOPSIS
34+
Gets the default location for a provider
35+
#>
36+
function Get-ProviderLocation($provider)
37+
{
38+
$location = Get-AzureLocation | where {$_.Name -eq $provider}
39+
if ($location -eq $null) {
40+
"East US"
41+
} else {
42+
$location.Locations[0]
43+
}
44+
}

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementTests.ps1 renamed to ‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/ControlPlane/KeyVaultManagementTests.ps1

File renamed without changes.

0 commit comments

Comments
 (0)