Skip to content

Commit aa0783c

Browse files
smithaborkarsmithaborkar
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents 266a8c2 + c6c9279 commit aa0783c

File tree

793 files changed

+284668
-233554
lines changed

Some content is hidden

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

793 files changed

+284668
-233554
lines changed

‎ChangeLog.md

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,46 @@
1-
* Azure Redis Cache
1+
* Azure SQL Database: new cmdlets for managing database threat detection policies:
2+
* Get-AzureRmSqlDatabaseThreatDetectionPolicy
3+
* Set-AzureRmSqlDatabaseThreatDetectionPolicy
4+
* Remove-AzureRmSqlDatabaseThreatDetectionPolicy
5+
* Azure RemoteApp: New cmdlets for managing stale machine accounts in AD:
6+
* Get-AzureRemoteAppVmStaleAdObject
7+
* Clear-AzureRemoteAppVmStaleAdObject
8+
9+
## 2015.11.09 version 1.0.1
10+
* Azure Compute
11+
* Added cmdlets for managing VM DiskEncryption extension
12+
* Azure KeyVault
13+
* Added EnabledForDiskEncryption and EnabledForTemplateDeployment flags to Azure Key Vault access policy
14+
* Azure Websites
15+
* Fixed issues with website management client creation
16+
17+
## 2015.11.05 version 1.0
18+
* Azure Compute
19+
* AzureRmVM cmdlet bug fixes
20+
* Fixes for DSC Extension cmdlets
21+
* Azure DataLake
22+
* First release of Azure DataLake Store and Azure DataLake Analytics cmdlets
23+
* Azure Network
24+
* Fixes to ExpressRoute cmdlets in Azure Resource Manager
25+
* Changes to BGP cmdlets
26+
* Azure Notification Hubs
27+
* First release of Azure Notification Hubs cmdlets
28+
* Azure Profile
29+
* Enable Certificate login for AD Applications
30+
* Get-AzureRmSubscription, Set-AzureRmContext search all tenants by default when no tenant is specified
31+
* Azure Redis Cache
232
* Set-AzureRedisCache - Premium and vNet support for redis cache
333
* New-AzureRedisCache - Premium and vNet support for redis cache
4-
34+
* Azure Resource Manager
35+
* Automatic RP Registration
36+
* Updates for Find-Resource, Authorization cmdlets, and AzureAD cmdlets
37+
* Azure Sql
38+
* Changes to Data Masking cmdlets
39+
* Azure Storage
40+
* Added support for storage file and usage metrics in Azure Resource Manager cmdlets
41+
* Azure Websites
42+
* New and rewritten cmdlets for Azure Web Application management
43+
544
## 2015.10.09 version 1.0 preview
645
* Azure Resource Manager Management Cmdlets
746
* New-AzureRmResourceGroup - Removed the template deployment parameters from this cmdlet. Template deployment will now be

‎setup/azurecmd.wxs

Lines changed: 12 additions & 2 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">
33

4-
<?define productName="Microsoft Azure PowerShell - October 23, 2015" ?>
4+
<?define productName="Microsoft Azure PowerShell - November 2015" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

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

@@ -47,10 +47,20 @@
4747
</DirectorySearch>
4848
</Property>
4949

50+
<Property Id="POWERSHELLGETAZUREINSTALLED" >
51+
<DirectorySearch Id="AZURECONTAINER" Path="[BaseModulesFolder]">
52+
<DirectorySearch Id= "AZUREMODULE" Path="Azure"/>
53+
</DirectorySearch>
54+
</Property>
55+
5056
<Condition Message="Azure Modules from the PowerShell Gallery are installed on this machine. Please remove these modules before installing this MSI.">
5157
<![CDATA[Installed or NOT(POWERSHELLGETMODULESINSTALLED >< "AzureRM.Profile")]]>
5258
</Condition>
5359

60+
<Condition Message="Azure Modules from the PowerShell Gallery are installed on this machine. Please remove these modules before installing this MSI.">
61+
<![CDATA[Installed or NOT(POWERSHELLGETAZUREINSTALLED >< "Azure")]]>
62+
</Condition>
63+
5464

5565
<Condition Message="This setup requires the Windows PowerShell 3.0 or compatible version to be installed.">
5666
<!-- This condition will break if PowerShell has version x3.0 and it is not compatible with 3.0 -->

‎setup/azurecmdfiles.wxi

Lines changed: 52 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,15 +1283,6 @@
12831283
<Component Id="cmp1C7EFB238F49BC10B88911B4DD7CD760" Guid="*">
12841284
<File Id="filC52B079BABFAD11D6B89732C6569172A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Azure.ResourceManager.dll" />
12851285
</Component>
1286-
<Component Id="cmpF469AE6EA612B0399957FAF85083221B" Guid="*">
1287-
<File Id="fil5684108D378817FBD69741594A1691AA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Data.Edm.dll" />
1288-
</Component>
1289-
<Component Id="cmp28D6E7B5DF1FD9B79A5B4D16447379A1" Guid="*">
1290-
<File Id="fil5FFABBF4B17F9CB6DC30FB21B11A1B3F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Data.OData.dll" />
1291-
</Component>
1292-
<Component Id="cmpCD008CF1C7D17EBD72102BD129C9372C" Guid="*">
1293-
<File Id="filAE03B936A9EEBD6BA395089F817FD5A0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Data.Services.Client.dll" />
1294-
</Component>
12951286
<Component Id="cmpD542C61584E161A92D52490818D7E34A" Guid="*">
12961287
<File Id="filC47A710583991C8D624107A3F8EBDD72" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
12971288
</Component>
@@ -1331,9 +1322,6 @@
13311322
<Component Id="cmpD29EA01597258746011AE6EF9FC3D15A" Guid="*">
13321323
<File Id="filCE0262D8D43EF7AB4CDB25A0752B7121" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\System.Net.Http.Primitives.dll" />
13331324
</Component>
1334-
<Component Id="cmp8EE8340753317C13D69F692E7E42B175" Guid="*">
1335-
<File Id="filAE60D28516977FE205BBEB3D15EB53DE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\System.Spatial.dll" />
1336-
</Component>
13371325
</Directory>
13381326
<Directory Id="dir76147B1D381C34B7638F2A844B5685DC" Name="AzureRM.Network">
13391327
<Component Id="cmp33F39A22183184A6B41F85DF085BAD29" Guid="*">
@@ -2485,6 +2473,15 @@
24852473
</Component>
24862474
</Directory>
24872475
<Directory Id="dir71903E152B1EC7360B3834768786084D" Name="AzureRM.Websites">
2476+
<Component Id="cmp976F4BB0FDF13DD49710C6F49EC6155E" Guid="*">
2477+
<File Id="fil4CEC7BA75E9E4B270DB19F35611E2C89" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\AzureResourceManager.psd1" />
2478+
</Component>
2479+
<Component Id="cmp31CCE98DB6C5E1DB88E1B384C167D241" Guid="*">
2480+
<File Id="filE79F6A1D30ACBAD2611E711D647AA710" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\AzureRM.Resources.psd1" />
2481+
</Component>
2482+
<Component Id="cmp83791849FA3C29D4D8CCF5D3FFA24FC1" Guid="*">
2483+
<File Id="fil4AE05CE87678924F7CA463E085491815" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\AzureRM.Tags.psd1" />
2484+
</Component>
24882485
<Component Id="cmpF679AA745A78D9232AFA533AC5A06B55" Guid="*">
24892486
<File Id="fil2BCD1C222604E8D245E834F1092DE5F3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\AzureRM.Websites.psd1" />
24902487
</Component>
@@ -2494,15 +2491,36 @@
24942491
<Component Id="cmpC5759F38821AA48E1C9BD8673AED9C0E" Guid="*">
24952492
<File Id="fil4B71765782224C550544FEFC24F479AD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.ApplicationInsights.dll" />
24962493
</Component>
2494+
<Component Id="cmpACE8179B7C1A697082BBA394F5F07BE3" Guid="*">
2495+
<File Id="filD1DD9680B5BF82D5894A4392D868C893" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll" />
2496+
</Component>
2497+
<Component Id="cmp22803095492E8D0D37C1DD736AABEA02" Guid="*">
2498+
<File Id="fil93B0DF3194AE6D2B8F1624251C3123F4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll-Help.xml" />
2499+
</Component>
24972500
<Component Id="cmp9476B9E28FEBB017468E192B45CA0750" Guid="*">
24982501
<File Id="fil739E5FBDF30A029D72DF64D461A69C84" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
24992502
</Component>
2503+
<Component Id="cmp93772AC2745F6B6E807F7B5A7028523B" Guid="*">
2504+
<File Id="filAAF1072C709AC193E1E97F0CD8A0AE33" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Resources.dll" />
2505+
</Component>
2506+
<Component Id="cmp24DFBDAA3B9275C9231D1F7FCC9DAC35" Guid="*">
2507+
<File Id="filAFE791172D326D8B77DCACC5689A8E5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Resources.dll-Help.xml" />
2508+
</Component>
2509+
<Component Id="cmpAF6FDD36F73DF1B8825F6FCDBF99D507" Guid="*">
2510+
<File Id="filE60B89A0375025D8078CBBE13C43626A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Resources.format.ps1xml" />
2511+
</Component>
2512+
<Component Id="cmp7FD7399FBFB41BA93701CD0B54D3E590" Guid="*">
2513+
<File Id="filD2AC6C37607AB4FA8D87E34E6C5E70C7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Tags.dll" />
2514+
</Component>
2515+
<Component Id="cmp9CD7A6B4A060D1905998AF07D0B4B02A" Guid="*">
2516+
<File Id="filF0458BC5D689F3255BB60BB64ACD3FAF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Tags.dll-help.xml" />
2517+
</Component>
2518+
<Component Id="cmpC3F5E35306467501723E692635390B24" Guid="*">
2519+
<File Id="fil4788043C0190D0FDE791392148091E13" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Tags.format.ps1xml" />
2520+
</Component>
25002521
<Component Id="cmp8F839B12289A46E7A8870014F8111911" Guid="*">
25012522
<File Id="fil449FE2073F074013C18B88473DD9F75D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Websites.dll" />
25022523
</Component>
2503-
<Component Id="cmpAC5BC334718546D9DDEBC02E08A4532E" Guid="*">
2504-
<File Id="fil0058CD8D090E7A70802FC54C74FADBEE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Commands.Websites.dll-Help.xml" />
2505-
</Component>
25062524
<Component Id="cmp57982B9C0764C35939F55621CA5C2670" Guid="*">
25072525
<File Id="filDA174FFA7F744E8A335CD5576CB98804" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Azure.Common.Authentication.dll" />
25082526
</Component>
@@ -2536,6 +2554,9 @@
25362554
<Component Id="cmp0ED267E119A5519DB38DCF6D42002072" Guid="*">
25372555
<File Id="fil0462DB65A5AD49C4265B6A7D5F4C7182" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
25382556
</Component>
2557+
<Component Id="cmpA199CCB5ED06180823B65590BF26A313" Guid="*">
2558+
<File Id="fil8B1FD69FBB1A318583F3906BA06FC867" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Rest.ClientRuntime.Azure.dll" />
2559+
</Component>
25392560
<Component Id="cmp3B20078612586B038701E00BEBC1B530" Guid="*">
25402561
<File Id="filED5E7D89FC671B96C355B0DAB2C29A64" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.Rest.ClientRuntime.dll" />
25412562
</Component>
@@ -2551,15 +2572,15 @@
25512572
<Component Id="cmpA92CB3E601637C3DA53F38FE2CEF5C0B" Guid="*">
25522573
<File Id="fil620BFF6C87D14FF2E5FA1AC65012992F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.WindowsAzure.Commands.Common.dll" />
25532574
</Component>
2554-
<Component Id="cmpA92D5F5096D59A79F7091CC1C2C30665" Guid="*">
2555-
<File Id="fil2CA9E361B3AEA86B4593C79C9C1DFC65" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.WindowsAzure.Commands.WebSites.format.ps1xml" />
2556-
</Component>
25572575
<Component Id="cmpA9C343968C686DDFF0EE4DA174AB8B6F" Guid="*">
25582576
<File Id="fil6C405208EF459CF9A6AB96E6B54B02FE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Microsoft.WindowsAzure.Management.dll" />
25592577
</Component>
25602578
<Component Id="cmpCE729F12E833A20E504BF7420712FA49" Guid="*">
25612579
<File Id="fil3A4028318E1F7F6EE45551625CEFB376" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\Newtonsoft.Json.dll" />
25622580
</Component>
2581+
<Component Id="cmp9C45E87E06D911D61AAC3019BA99FB0C" Guid="*">
2582+
<File Id="fil286658BB6DFDA4C72565C5BC988E1BA5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\ResourceManagerStartup.ps1" />
2583+
</Component>
25632584
<Component Id="cmp4E4BAFA8406471B1D2FFA4860A8AEAA7" Guid="*">
25642585
<File Id="fil5964A0E9C541FC4A10F2A9AA83EC493A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Websites\System.Net.Http.Extensions.dll" />
25652586
</Component>
@@ -5021,9 +5042,6 @@
50215042
<ComponentRef Id="cmpD1A5B61C7046E3D9D8256C632EED70EF" />
50225043
<ComponentRef Id="cmpFD1FF637F9EDD0BF88DE235BB7C878F2" />
50235044
<ComponentRef Id="cmp1C7EFB238F49BC10B88911B4DD7CD760" />
5024-
<ComponentRef Id="cmpF469AE6EA612B0399957FAF85083221B" />
5025-
<ComponentRef Id="cmp28D6E7B5DF1FD9B79A5B4D16447379A1" />
5026-
<ComponentRef Id="cmpCD008CF1C7D17EBD72102BD129C9372C" />
50275045
<ComponentRef Id="cmpD542C61584E161A92D52490818D7E34A" />
50285046
<ComponentRef Id="cmp0EE8FCFA5508960593F3537443DACD4E" />
50295047
<ComponentRef Id="cmp6D51C798EDF35CEA322D396B85FB8E18" />
@@ -5037,7 +5055,6 @@
50375055
<ComponentRef Id="cmp8F99791178CB394FC285BF5F9DA21047" />
50385056
<ComponentRef Id="cmp55A0977CC2E4CD91F6738FFD78449307" />
50395057
<ComponentRef Id="cmpD29EA01597258746011AE6EF9FC3D15A" />
5040-
<ComponentRef Id="cmp8EE8340753317C13D69F692E7E42B175" />
50415058
<ComponentRef Id="cmp33F39A22183184A6B41F85DF085BAD29" />
50425059
<ComponentRef Id="cmp70B60DBD32D61BCA5715AB2D64131358" />
50435060
<ComponentRef Id="cmp92653399A1E9659661E74CA982C1D16A" />
@@ -5413,12 +5430,22 @@
54135430
<ComponentRef Id="cmp3CA816B036B1A48C5114288067BD2C34" />
54145431
<ComponentRef Id="cmp2EAE2FAEA4A9F020FA83FD6877F1E97F" />
54155432
<ComponentRef Id="cmp8162A7134D4C9EB5D49EC45591995C2B" />
5433+
<ComponentRef Id="cmp976F4BB0FDF13DD49710C6F49EC6155E" />
5434+
<ComponentRef Id="cmp31CCE98DB6C5E1DB88E1B384C167D241" />
5435+
<ComponentRef Id="cmp83791849FA3C29D4D8CCF5D3FFA24FC1" />
54165436
<ComponentRef Id="cmpF679AA745A78D9232AFA533AC5A06B55" />
54175437
<ComponentRef Id="cmpD0FB9F1837C72A913A5A221811D836CC" />
54185438
<ComponentRef Id="cmpC5759F38821AA48E1C9BD8673AED9C0E" />
5439+
<ComponentRef Id="cmpACE8179B7C1A697082BBA394F5F07BE3" />
5440+
<ComponentRef Id="cmp22803095492E8D0D37C1DD736AABEA02" />
54195441
<ComponentRef Id="cmp9476B9E28FEBB017468E192B45CA0750" />
5442+
<ComponentRef Id="cmp93772AC2745F6B6E807F7B5A7028523B" />
5443+
<ComponentRef Id="cmp24DFBDAA3B9275C9231D1F7FCC9DAC35" />
5444+
<ComponentRef Id="cmpAF6FDD36F73DF1B8825F6FCDBF99D507" />
5445+
<ComponentRef Id="cmp7FD7399FBFB41BA93701CD0B54D3E590" />
5446+
<ComponentRef Id="cmp9CD7A6B4A060D1905998AF07D0B4B02A" />
5447+
<ComponentRef Id="cmpC3F5E35306467501723E692635390B24" />
54205448
<ComponentRef Id="cmp8F839B12289A46E7A8870014F8111911" />
5421-
<ComponentRef Id="cmpAC5BC334718546D9DDEBC02E08A4532E" />
54225449
<ComponentRef Id="cmp57982B9C0764C35939F55621CA5C2670" />
54235450
<ComponentRef Id="cmp2488ACCABA4CB85A6B69DBB1D9FDD233" />
54245451
<ComponentRef Id="cmp67AFEBC05483435B1BCA6071E6B47F01" />
@@ -5430,14 +5457,15 @@
54305457
<ComponentRef Id="cmp36E0BE08BF36A891E1E741FAE0D24269" />
54315458
<ComponentRef Id="cmpDD166FFA65677744E2C3EFC05FC744AC" />
54325459
<ComponentRef Id="cmp0ED267E119A5519DB38DCF6D42002072" />
5460+
<ComponentRef Id="cmpA199CCB5ED06180823B65590BF26A313" />
54335461
<ComponentRef Id="cmp3B20078612586B038701E00BEBC1B530" />
54345462
<ComponentRef Id="cmp67582164B4932A904A1460B50A37A58C" />
54355463
<ComponentRef Id="cmp4D574386F62E94034679F22808B3F1F1" />
54365464
<ComponentRef Id="cmp46DF6CA6BD8BD194F1866E74A694CCB3" />
54375465
<ComponentRef Id="cmpA92CB3E601637C3DA53F38FE2CEF5C0B" />
5438-
<ComponentRef Id="cmpA92D5F5096D59A79F7091CC1C2C30665" />
54395466
<ComponentRef Id="cmpA9C343968C686DDFF0EE4DA174AB8B6F" />
54405467
<ComponentRef Id="cmpCE729F12E833A20E504BF7420712FA49" />
5468+
<ComponentRef Id="cmp9C45E87E06D911D61AAC3019BA99FB0C" />
54415469
<ComponentRef Id="cmp4E4BAFA8406471B1D2FFA4860A8AEAA7" />
54425470
<ComponentRef Id="cmpC84155BCEC352235456F36314798DEB6" />
54435471
<ComponentRef Id="cmp5DFC4ECCB8BBF842D8069F3036386B84" />

0 commit comments

Comments
 (0)