Skip to content

Commit 37c9f51

Browse files
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents 1357703 + c841ea3 commit 37c9f51

File tree

662 files changed

+108650
-87446
lines changed

Some content is hidden

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

662 files changed

+108650
-87446
lines changed

ChangeLog.md

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,50 @@
1-
##2016.03.30 version 1.2.3
1+
##2016.05.03 version 1.4.0
2+
* Azure Storage
3+
* Upgrade to Microsoft.Azure.Management.Storage nuget package v5.0 preview
4+
* Add Encryption and Hot/Cool features support to resource mode storage account cmdlets
5+
- New-AzureRmStorageAccount
6+
- Set-AzureRmStorageAccount
7+
* Add "Add" and "Create" permission to Blob SAS cmdlets
8+
- New-AzureStorageBlobSASToken
9+
- New-AzureStorageContainerSASToken
10+
- New-AzureStorageContainerStoredAccessPolicy
11+
- Set-AzureStorageContainerStoredAccessPolicy
12+
* Add "Create" permission to File SAS cmdlets
13+
- New-AzureStorageFileSASToken
14+
- New-AzureStorageShareSASToken
15+
- New-AzureStorageShareStoredAccessPolicy
16+
- Set-AzureStorageShareStoredAccessPolicy
17+
18+
##2016.04.19 version 1.3.2
19+
* Add support for specifying NIC/VMSS as application gateway backend address
20+
* Fix HDI ADL cluster creation and live test
21+
* Fix WAPack cmdlet Proxy issue for WAP
22+
* Fix Dynamic Memory Issue while setting VM
23+
* Update Azure Gov STS and Traffic Manager
24+
* Compute
25+
- Upgrade to Microsoft.Azure.Management.Compute nuget package v13.0
26+
* HDInsignt
27+
- Upgrade to Microsoft.Azure.Management.HDInsight nuget package v1.0.14
28+
* Resource Manager
29+
- Change api-version for Policy and Locks operations
30+
- Change api version for Deployments operations
31+
* Web Apps
32+
- Add backup and restore cmdlets
33+
- Restore-AzureWebApp
34+
- Edit-AzureRmWebAppBackupConfiguration
35+
- Get-AzureRmWebAppBackupConfiguration
36+
- Get-AzureRmWebAppBackup
37+
- New-AzureRmWebAppBackup
38+
- Remove-AzureRmWebAppBackup
39+
- Restore-AzureRmWebAppBackup
40+
- Get-AzureRmWebAppBackupList
41+
- New-AzureRmWebAppDatabaseBackupSetting
42+
- Upgrade to Microsoft.WindowsAzure.Management.WebSite nuget package v5.0
43+
44+
##2016.03.30 version 1.3.0
45+
* AzureRM module
46+
- Installation performance fix
47+
* New Azure CDN cmdlets
248
* Azure Storage
349
* Made Protocol parameter in following cmdlets to be nullable and optional
450
- New-AzureStorageBlobSASToken
@@ -8,6 +54,10 @@
854
- New-AzureStorageQueueSASToken
955
- New-AzureStorageTableSASToken
1056
- New-AzureStorageAccountSASToken
57+
* Add Export-AzureRmResourceGroupTemplate cmdlet
58+
* Add VirtualMachineScaleSet cmdlet
59+
* Add "EA" value for permission parameter of Set-AzurePlatformVMImage
60+
* Documentation improvements in cmdlets
1161

1262
##2016.03.03 version 1.2.2
1363
* Azure Compute (ARM):

README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ For detail descriptions and examples of the cmdlets, type
5959
* [Azure Stack](https://azure.microsoft.com/en-us/overview/azure-stack/)
6060
* [Windows Azure Pack](https://www.microsoft.com/en-us/server-cloud/windows-azure-pack.aspx)
6161
* [Microsoft Azure China](https://www.azure.cn/)
62-
* [USGovernment](https://azure.microsoft.com/en-us/features/gov/)
62+
* [Microsoft Azure US Government](https://azure.microsoft.com/en-us/features/gov/)
6363

6464
## Installation
6565

@@ -123,6 +123,15 @@ Add-AzureRmAccount -EnvironmentName AzureChinaCloud
123123
New-AzureRmResourceGroup -Name myresourceGroup -Location "China East"
124124
```
125125

126+
### Microsoft Azure US Government
127+
128+
```powershell
129+
Add-AzureRmAccount -EnvironmentName AzureUSGovernment
130+
131+
# use the cmdlets to manage your services/applications
132+
New-AzureRmResourceGroup -Name myresourceGroup -Location "US Gov Virginia"
133+
```
134+
126135
### Windows Azure Pack
127136

128137
```powershell

setup/azurecmd.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
33

4-
<?define productName="Microsoft Azure PowerShell - March 2016" ?>
4+
<?define productName="Microsoft Azure PowerShell - April 2016" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="1.2.2" ?>
8+
<?define version="1.3.2" ?>
99

1010
<Product Id="*"
1111
Name="$(var.productName)"
@@ -75,7 +75,7 @@
7575
<Component Id="PSModulePath.System" Guid="273525B9-7AAB-421A-90C8-8E50A1840B8D">
7676
<CreateFolder />
7777
<!-- Work around bug that PowerShell does not always consider default module paths. -->
78-
<Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager\AzureResourceManager\;[PowerShellFolder]ServiceManagement\;[PowerShellFolder]\Storage" System="yes" />
78+
<Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager\AzureResourceManager\;[PowerShellFolder]ServiceManagement\;[PowerShellFolder]Storage\" System="yes" />
7979
</Component>
8080
</DirectoryRef>
8181

setup/azurecmdfiles.wxi

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,6 @@
204204
<Component Id="cmp048B605B1072F4A5467F2AFFD8ED2459" Guid="*">
205205
<File Id="fil38FE506241BEC2CA3B34645613B821F3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.AzureStack.Commands.dll" />
206206
</Component>
207-
<Component Id="cmpB2F2FF5F057BDE656891B43C18ADF020" Guid="*">
208-
<File Id="fil952FAF0371C7CCC373DBDF330DB18A87" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.AzureStack.Commands.dll-help.psd1" />
209-
</Component>
210207
<Component Id="cmp889E4CFA9046EFFEFF5D63CB61E990A6" Guid="*">
211208
<File Id="filE0954BDD89FA012B32E270ADA2F66DD8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.AzureStack.Commands.dll-help.xml" />
212209
</Component>
@@ -465,6 +462,9 @@
465462
<Component Id="cmpEC720F6E3871A33FE098F6CEB7617D8F" Guid="*">
466463
<File Id="filE5E777BDF09D8E3E09A887286A7FBFCB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
467464
</Component>
465+
<Component Id="cmp7BE433E392CBC4CABE32256077124C6E" Guid="*">
466+
<File Id="fil027AB5F08FF4A7F59EE167422771AABE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Rest.ClientRuntime.Azure.dll" />
467+
</Component>
468468
<Component Id="cmp5D544D73B729F9669498812ECF7BF3E1" Guid="*">
469469
<File Id="filBC5BF331E6C0917A1886357E3ED64497" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Rest.ClientRuntime.dll" />
470470
</Component>
@@ -506,6 +506,9 @@
506506
<Component Id="cmp87DFE6BA28632B552074C8A05968ED49" Guid="*">
507507
<File Id="filB29D13A0412832DF84301430FAF5C2EB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\AzureRM.Tags.psd1" />
508508
</Component>
509+
<Component Id="cmp5387447D3AEFB20D850B31BB0324D032" Guid="*">
510+
<File Id="fil96612AEDAC40E485D577E1BB70E1777F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\CdnStartup.ps1" />
511+
</Component>
509512
<Component Id="cmpFCC54BA077C7C12B0A49F42DD3039435" Guid="*">
510513
<File Id="filD253995C681D155F4A3BAED9AC075F4D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Hyak.Common.dll" />
511514
</Component>
@@ -2535,6 +2538,9 @@
25352538
<Component Id="cmpA2A4B67ACC8738C88A82A9576BD82026" Guid="*">
25362539
<File Id="fil2E6EA8F5997FA6DBE29FCE3A58F051DF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
25372540
</Component>
2541+
<Component Id="cmp3AE4D7EAA86E455A89006A85332F6B3A" Guid="*">
2542+
<File Id="fil6C5492894C2F4DDD80E710891D53B6D2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.dll" />
2543+
</Component>
25382544
<Component Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" Guid="*">
25392545
<File Id="filDAF92272D69F4A127139311912333F8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.dll" />
25402546
</Component>
@@ -5033,7 +5039,6 @@
50335039
<ComponentRef Id="cmpFDFB38E21048DD505BCAD31F5136992E" />
50345040
<ComponentRef Id="cmpC2439F65706917CA4AABD3AF6AFB856A" />
50355041
<ComponentRef Id="cmp048B605B1072F4A5467F2AFFD8ED2459" />
5036-
<ComponentRef Id="cmpB2F2FF5F057BDE656891B43C18ADF020" />
50375042
<ComponentRef Id="cmp889E4CFA9046EFFEFF5D63CB61E990A6" />
50385043
<ComponentRef Id="cmpA2F17B479BD0FE1A81AED68A6C03B7A0" />
50395044
<ComponentRef Id="cmp4E983C9ECBC2D4A29376A70418BE5E2B" />
@@ -5118,6 +5123,7 @@
51185123
<ComponentRef Id="cmpD762051962F7D3051FBC9CF971AE9325" />
51195124
<ComponentRef Id="cmpB11D8DF03DCC6DF2571C30776714A652" />
51205125
<ComponentRef Id="cmpEC720F6E3871A33FE098F6CEB7617D8F" />
5126+
<ComponentRef Id="cmp7BE433E392CBC4CABE32256077124C6E" />
51215127
<ComponentRef Id="cmp5D544D73B729F9669498812ECF7BF3E1" />
51225128
<ComponentRef Id="cmpB1E3E66F5FC40C4E26A9CC895B89DA63" />
51235129
<ComponentRef Id="cmp35BA09F11D618680F9850F73564F9F47" />
@@ -5131,6 +5137,7 @@
51315137
<ComponentRef Id="cmp22BC5873E0018F5801CD486C6CBCE0C5" />
51325138
<ComponentRef Id="cmpB7108FC1E0DA3A2DABE2F5A549025C62" />
51335139
<ComponentRef Id="cmp87DFE6BA28632B552074C8A05968ED49" />
5140+
<ComponentRef Id="cmp5387447D3AEFB20D850B31BB0324D032" />
51345141
<ComponentRef Id="cmpFCC54BA077C7C12B0A49F42DD3039435" />
51355142
<ComponentRef Id="cmp984FE30B4A873A5B1BC8F7E85B1CEF85" />
51365143
<ComponentRef Id="cmp2F3E4B9B10BAC8DA1FA711C6B756E1D1" />
@@ -5794,6 +5801,7 @@
57945801
<ComponentRef Id="cmp4EA5A818E3BE7C67C27B69ADABCE5CBF" />
57955802
<ComponentRef Id="cmpBF600E80A7D04977AF21CAA07A79254C" />
57965803
<ComponentRef Id="cmpA2A4B67ACC8738C88A82A9576BD82026" />
5804+
<ComponentRef Id="cmp3AE4D7EAA86E455A89006A85332F6B3A" />
57975805
<ComponentRef Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" />
57985806
<ComponentRef Id="cmpA94FD747C692B4A9A45D9DE5D869DE53" />
57995807
<ComponentRef Id="cmp7F0D9683DB4D431F6A1A42EBCAD0E4E3" />

src/AzureRT.testsettings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Description>These are test settings for AzureRT test run.</Description>
88
<Deployment>
99
<DeploymentItem filename="ServiceManagement\Compute\Commands.ServiceManagement.Test\Resources\" />
10-
<DeploymentItem filename="Package\Debug\" />
10+
<DeploymentItem filename="ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\" />
1111
</Deployment>
1212
<Execution parallelTestCount="0">
1313
<Timeouts testTimeout="3000000" />

src/Common/Commands.Common.Authentication.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828

2929
[assembly: ComVisible(false)]
3030
[assembly: CLSCompliant(false)]
31-
[assembly: AssemblyVersion("1.0.4")]
32-
[assembly: AssemblyFileVersion("1.0.4")]
31+
[assembly: AssemblyVersion("1.3.2")]
32+
[assembly: AssemblyFileVersion("1.3.2")]
3333
[assembly: CollectionBehavior(DisableTestParallelization = true)]

src/Common/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ private string StorageFileEndpointFormat()
146146
{ AzureEnvironment.Endpoint.Gallery, AzureEnvironmentConstants.USGovernmentGalleryEndpoint },
147147
{ AzureEnvironment.Endpoint.SqlDatabaseDnsSuffix, AzureEnvironmentConstants.USGovernmentSqlDatabaseDnsSuffix },
148148
{ AzureEnvironment.Endpoint.Graph, AzureEnvironmentConstants.USGovernmentGraphEndpoint },
149-
{ AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, null },
149+
{ AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, AzureEnvironmentConstants.USGovernmentTrafficManagerDnsSuffix },
150150
{ AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, AzureEnvironmentConstants.USGovernmentKeyVaultDnsSuffix},
151151
{ AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.USGovernmentKeyVaultServiceEndpointResourceId},
152152
{ AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix, null},
153153
{ AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix, null},
154-
{AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint}
154+
{ AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint }
155155
}
156156
}
157157
}
@@ -391,7 +391,7 @@ public static class AzureEnvironmentConstants
391391

392392
public const string ChinaActiveDirectoryEndpoint = "https://login.chinacloudapi.cn/";
393393

394-
public const string USGovernmentActiveDirectoryEndpoint = "https://login.microsoftonline.com/";
394+
public const string USGovernmentActiveDirectoryEndpoint = "https://login-us.microsoftonline.com/";
395395

396396
public const string AzureGraphEndpoint = "https://graph.windows.net/";
397397

@@ -403,6 +403,8 @@ public static class AzureEnvironmentConstants
403403

404404
public const string ChinaTrafficManagerDnsSuffix = "trafficmanager.cn";
405405

406+
public const string USGovernmentTrafficManagerDnsSuffix = "usgovtrafficmanager.net";
407+
406408
public const string AzureKeyVaultDnsSuffix = "vault.azure.net";
407409

408410
public const string ChinaKeyVaultDnsSuffix = "vault.azure.cn";

src/Common/Commands.Common.Authentication/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
// You can specify all the values or you can default the Build and Revision Numbers
4747
// by using the '*' as shown below:
4848
// [assembly: AssemblyVersion("1.0.*")]
49-
[assembly: AssemblyVersion("1.0.0.0")]
50-
[assembly: AssemblyFileVersion("1.0.0.0")]
49+
[assembly: AssemblyVersion("1.3.2")]
50+
[assembly: AssemblyFileVersion("1.3.2")]

src/Common/Commands.Common.Authentication/stuff/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("1.3.2")]
36+
[assembly: AssemblyFileVersion("1.3.2")]

src/Common/Commands.Common.Storage/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
[assembly: ComVisible(false)]
2525
[assembly: CLSCompliant(false)]
2626
[assembly: Guid("c565107e-98a9-4703-85cd-a7efc3d8da7b")]
27-
[assembly: AssemblyVersion("1.0.5")]
28-
[assembly: AssemblyFileVersion("1.0.5")]
27+
[assembly: AssemblyVersion("1.3.2")]
28+
[assembly: AssemblyFileVersion("1.3.2")]

src/Common/Commands.Common/AzurePowerShell.cs

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

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

29-
public const string AssemblyVersion = "1.0.5";
29+
public const string AssemblyVersion = "1.3.2";
3030

31-
public const string AssemblyFileVersion = "1.0.5";
31+
public const string AssemblyFileVersion = "1.3.2";
3232

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

src/Common/Commands.Common/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("4f3ab2e4-cc7a-43ac-bb15-f481fcf94d58")]
28-
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
29-
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
28+
[assembly: AssemblyVersion("1.3.2")]
29+
[assembly: AssemblyFileVersion("1.3.2")]
3030
#if SIGN
3131
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

src/Common/Commands.ScenarioTests.Common/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("1.3.2")]
36+
[assembly: AssemblyFileVersion("1.3.2")]
3737
[assembly: CollectionBehavior(DisableTestParallelization = true)]

src/ResourceManager.ForRefactoringOnly.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.Reso
119119
EndProject
120120
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}"
121121
EndProject
122-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
122+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
123123
EndProject
124124
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}"
125125
EndProject

src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.5'
12+
ModuleVersion = '1.0.7'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.7'})
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444

45-
[assembly: AssemblyVersion("1.0.4")]
46-
[assembly: AssemblyFileVersion("1.0.4")]
45+
[assembly: AssemblyVersion("1.0.7")]
46+
[assembly: AssemblyFileVersion("1.0.7")]

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@
179179
</ProjectReference>
180180
</ItemGroup>
181181
<ItemGroup>
182+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Storage.ps1">
183+
<Link>ScenarioTests\AzureRM.Storage.ps1</Link>
184+
</None>
182185
<None Include="packages.config">
183186
<SubType>Designer</SubType>
184187
</None>

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
// You can specify all the values or you can default the Build and Revision Numbers
4242
// by using the '*' as shown below:
4343

44-
[assembly: AssemblyVersion("1.0.4")]
45-
[assembly: AssemblyFileVersion("1.0.4")]
44+
[assembly: AssemblyVersion("1.0.7")]
45+
[assembly: AssemblyFileVersion("1.0.7")]

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ private void RunPowerShellTest(params string[] scripts)
176176
_helper.RMProfileModule,
177177
_helper.RMResourceModule,
178178
_helper.RMStorageDataPlaneModule,
179-
_helper.RMStorageModule,
180-
_helper.GetRMModulePath("AzureRM.ApiManagement.psd1"));
179+
_helper.GetRMModulePath("AzureRM.ApiManagement.psd1"),
180+
"AzureRM.Storage.ps1");
181181

182182
_helper.RunPowerShellTest(scripts);
183183
}

src/ResourceManager/ApiManagement/Commands.ApiManagement/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
// You can specify all the values or you can default the Build and Revision Numbers
4242
// by using the '*' as shown below:
4343

44-
[assembly: AssemblyVersion("1.0.4")]
45-
[assembly: AssemblyFileVersion("1.0.4")]
44+
[assembly: AssemblyVersion("1.0.7")]
45+
[assembly: AssemblyFileVersion("1.0.7")]

0 commit comments

Comments
 (0)