Skip to content

Commit 01e4cac

Browse files
author
Hovsep Mkrtchyan
committed
Merge branch 'Compute.1.2.6-hotfix' of github.com:Azure/azure-powershell into Compute.1.2.6
2 parents 539ae60 + 218df34 commit 01e4cac

File tree

197 files changed

+11845
-2287
lines changed

Some content is hidden

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

197 files changed

+11845
-2287
lines changed

‎ChangeLog.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
##2016.03.30 version 1.2.3
1+
##2016.03.30 version 1.3.0
2+
* AzureRM module
3+
- Installation performance fix
4+
* New Azure CDN cmdlets
25
* Azure Storage
36
* Made Protocol parameter in following cmdlets to be nullable and optional
47
- New-AzureStorageBlobSASToken
@@ -8,6 +11,10 @@
811
- New-AzureStorageQueueSASToken
912
- New-AzureStorageTableSASToken
1013
- New-AzureStorageAccountSASToken
14+
* Add Export-AzureRmResourceGroupTemplate cmdlet
15+
* Add VirtualMachineScaleSet cmdlet
16+
* Add "EA" value for permission parameter of Set-AzurePlatformVMImage
17+
* Documentation improvements in cmdlets
1118

1219
##2016.03.03 version 1.2.2
1320
* Azure Compute (ARM):

‎setup/azurecmd.wxs‎

Lines changed: 2 additions & 2 deletions
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="1.2.2" ?>
8+
<?define version="1.3.0" ?>
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: 4 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>
@@ -506,6 +503,9 @@
506503
<Component Id="cmp87DFE6BA28632B552074C8A05968ED49" Guid="*">
507504
<File Id="filB29D13A0412832DF84301430FAF5C2EB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\AzureRM.Tags.psd1" />
508505
</Component>
506+
<Component Id="cmp5387447D3AEFB20D850B31BB0324D032" Guid="*">
507+
<File Id="fil96612AEDAC40E485D577E1BB70E1777F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\CdnStartup.ps1" />
508+
</Component>
509509
<Component Id="cmpFCC54BA077C7C12B0A49F42DD3039435" Guid="*">
510510
<File Id="filD253995C681D155F4A3BAED9AC075F4D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Hyak.Common.dll" />
511511
</Component>
@@ -5033,7 +5033,6 @@
50335033
<ComponentRef Id="cmpFDFB38E21048DD505BCAD31F5136992E" />
50345034
<ComponentRef Id="cmpC2439F65706917CA4AABD3AF6AFB856A" />
50355035
<ComponentRef Id="cmp048B605B1072F4A5467F2AFFD8ED2459" />
5036-
<ComponentRef Id="cmpB2F2FF5F057BDE656891B43C18ADF020" />
50375036
<ComponentRef Id="cmp889E4CFA9046EFFEFF5D63CB61E990A6" />
50385037
<ComponentRef Id="cmpA2F17B479BD0FE1A81AED68A6C03B7A0" />
50395038
<ComponentRef Id="cmp4E983C9ECBC2D4A29376A70418BE5E2B" />
@@ -5131,6 +5130,7 @@
51315130
<ComponentRef Id="cmp22BC5873E0018F5801CD486C6CBCE0C5" />
51325131
<ComponentRef Id="cmpB7108FC1E0DA3A2DABE2F5A549025C62" />
51335132
<ComponentRef Id="cmp87DFE6BA28632B552074C8A05968ED49" />
5133+
<ComponentRef Id="cmp5387447D3AEFB20D850B31BB0324D032" />
51345134
<ComponentRef Id="cmpFCC54BA077C7C12B0A49F42DD3039435" />
51355135
<ComponentRef Id="cmp984FE30B4A873A5B1BC8F7E85B1CEF85" />
51365136
<ComponentRef Id="cmp2F3E4B9B10BAC8DA1FA711C6B756E1D1" />

‎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.0")]
32+
[assembly: AssemblyFileVersion("1.3.0")]
3333
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎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.0")]
50+
[assembly: AssemblyFileVersion("1.3.0")]

‎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.0")]
36+
[assembly: AssemblyFileVersion("1.3.0")]

‎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.0")]
28+
[assembly: AssemblyFileVersion("1.3.0")]

‎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.0";
3030

31-
public const string AssemblyFileVersion = "1.0.5";
31+
public const string AssemblyFileVersion = "1.3.0";
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.0")]
29+
[assembly: AssemblyFileVersion("1.3.0")]
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.0")]
36+
[assembly: AssemblyFileVersion("1.3.0")]
3737
[assembly: CollectionBehavior(DisableTestParallelization = true)]

0 commit comments

Comments
 (0)