Skip to content

Commit 0fe4da3

Browse files
huangpfhuangpf
committed
Merge pull request #96 from huangpf/dev
Dev
2 parents 175977f + 450f8a7 commit 0fe4da3

File tree

202 files changed

+10078
-11739
lines changed

Some content is hidden

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

202 files changed

+10078
-11739
lines changed

‎ChangeLog.md‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,24 @@
1+
## 2015.12.14 version 1.0.2
2+
* Azure Compute (ARM):
3+
* Enable BGInfo extension by default
4+
* Fix the issue when an OS disk is in a different resource group: Now New-AzureRmVM does not create a new storage account for boot diagnostics.
5+
* Add Set-AzureRmBginfoExtension cmdlet
6+
* Make WinRMCertificateUrl parameter mandatory when Set-AzureRmVMOperatingSystem cmdlet is performed with WinRMHttps switch
7+
* Azure Compute (Service Management):
8+
* Fix the issue when adding a new VM without a data disk
9+
* Add ExtensionId parameter for all extension cmdlets
10+
* Expose RemoteAccessCertificateThumbprint property for Get-AzureVM cmdlet
111
* Azure SQL Database: new cmdlets for managing database threat detection policies:
212
* Get-AzureRmSqlDatabaseThreatDetectionPolicy
313
* Set-AzureRmSqlDatabaseThreatDetectionPolicy
414
* Remove-AzureRmSqlDatabaseThreatDetectionPolicy
515
* Azure RemoteApp: New cmdlets for managing stale machine accounts in AD:
616
* Get-AzureRemoteAppVmStaleAdObject
717
* Clear-AzureRemoteAppVmStaleAdObject
8-
* Azure Intune: New cmdlets for Mobile Application management:
9-
* Add-AzureRmIntuneAndroidMAMPolicyApp
10-
* Add-AzureRmIntuneAndroidMAMPolicyGroup
11-
* Add-AzureRmIntuneiOSMAMPolicyApp
12-
* Add-AzureRmIntuneiOSMAMPolicyGroup
13-
* Get-AzureRmIntuneAndroidMAMApp
14-
* Get-AzureRmIntuneAndroidMAMPolicy
15-
* Get-AzureRmIntuneAndroidMAMPolicyApp
16-
* Get-AzureRmIntuneAndroidMAMPolicyGroup
17-
* Get-AzureRmIntuneiOSMAMApp
18-
* Get-AzureRmIntuneiOSMAMPolicy
19-
* Get-AzureRmIntuneiOSMAMPolicyApp
20-
* Get-AzureRmIntuneiOSMAMPolicyGroup
21-
* Get-AzureRmIntuneMAMFlaggedUser
22-
* Get-AzureRmIntuneMAMStatus
23-
* Get-AzureRmIntuneMAMUserDevice
24-
* Get-AzureRmIntuneMAMUserFlaggedEnrolledApp
25-
* Get-AzureRmIntuneOperationResult
26-
* Invoke-AzureRmIntuneMAMUserDeviceWipe
27-
* New-AzureRmIntuneAndroidMAMPolicy
28-
* New-AzureRmIntuneiOSMAMPolicy
29-
* Remove-AzureRmIntuneAndroidMAMPolicy
30-
* Remove-AzureRmIntuneAndroidMAMPolicyApp
31-
* Remove-AzureRmIntuneAndroidMAMPolicyGroup
32-
* Remove-AzureRmIntuneIOSMAMPolicy
33-
* Remove-AzureRmIntuneiOSMAMPolicyApp
34-
* Remove-AzureRmIntuneiOSMAMPolicyGroup
35-
* Set-AzureRmIntuneAndroidMAMPolicy
36-
* Set-AzureRmIntuneiOSMAMPolicy
37-
18+
* ARM Storage:
19+
* Fix alias missing issue
20+
21+
3822
## 2015.11.09 version 1.0.1
3923
* Azure Compute
4024
* Added cmdlets for managing VM DiskEncryption extension

‎build.proj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@
4545
<Scope Condition=" $(Scope) == '' " >all</Scope>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln" Condition=" '$(Scope)' == 'all' "/>
48+
<CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln"
49+
Exclude=".\src\ResourceManager\Intune\*.sln"
50+
Condition=" '$(Scope)' == 'all' "/>
4951
<CmdletSolutionsToBuild Include=".\src\ResourceManager\$(Scope)\*.sln"
5052
Condition=" '$(Scope)' != 'all' and '$(Scope)' != 'ServiceManagement' and '$(Scope)' != 'AzureStorage' "/>
5153
<CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"

‎setup/azurecmd.wxs‎

Lines changed: 2 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" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
33

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

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

‎setup/azurecmdfiles.wxi‎

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,71 +1174,6 @@
11741174
<File Id="fil7A9F66CF061583CA28B0DA562E249A8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Newtonsoft.Json.dll" />
11751175
</Component>
11761176
</Directory>
1177-
<Directory Id="dirF8BB5CC2A8AA03F23D432B214F947ADA" Name="AzureRM.Intune">
1178-
<Component Id="cmp26757C9254980E46634DDBF7FA3DC0EE" Guid="*">
1179-
<File Id="fil15F8D200C8D0DEF2FBDEC493EDAB1BB4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\AzureRM.Intune.psd1" />
1180-
</Component>
1181-
<Component Id="cmp6A7508D641ABC42CBC47E8C71F5F7960" Guid="*">
1182-
<File Id="fil1C925E148CCDCEC0309363FC8D38D29F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Hyak.Common.dll" />
1183-
</Component>
1184-
<Component Id="cmpC40A93532FA1B6B3CC495C44287DD4FD" Guid="*">
1185-
<File Id="fil975F3E120A33EB1AD11D26AA54DC0E22" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.ApplicationInsights.dll" />
1186-
</Component>
1187-
<Component Id="cmpBA0E9AFF4B786F09AF8CA24A30DA0B3E" Guid="*">
1188-
<File Id="fil383BA66850249A60C6F43C9B50FE1975" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.Intune.dll" />
1189-
</Component>
1190-
<Component Id="cmpC329903507D2C760A07068087F01E0F0" Guid="*">
1191-
<File Id="fil6BD6B84E30BE331FEED4195F69F365FB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.Intune.dll-Help.xml" />
1192-
</Component>
1193-
<Component Id="cmpA98F34A253A4D33476481745DC338B72" Guid="*">
1194-
<File Id="fil2BB88DE9212FEEA5B5883B030C218237" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
1195-
</Component>
1196-
<Component Id="cmp3218E7B28F820C614786457C75F68FDE" Guid="*">
1197-
<File Id="fil2A8526A4DBACB5E1589A680FBBC5C68D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.Authentication.dll" />
1198-
</Component>
1199-
<Component Id="cmpD48ED88B3D289F81DFEB1BE8D8BDFDBB" Guid="*">
1200-
<File Id="fil469E93C3E227C1882BBC95DF2B8EF8E9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.dll" />
1201-
</Component>
1202-
<Component Id="cmp9D7D5FC99E7FB18787B78A246F386511" Guid="*">
1203-
<File Id="filBC526C0E7B432252967B14C5EDBE9ADE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.NetFramework.dll" />
1204-
</Component>
1205-
<Component Id="cmp01D375B8D50C7BB0584789AF3262E6EB" Guid="*">
1206-
<File Id="filCA529DB57BEA2658246C587E86778481" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Management.Intune.dll" />
1207-
</Component>
1208-
<Component Id="cmp75A4FEB22AE2D2B4A03F04A4C7E8D32E" Guid="*">
1209-
<File Id="fil61C8BE5CFE6844DFC7DA11E02D2F3820" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Bcl.Build.Tasks.dll" />
1210-
</Component>
1211-
<Component Id="cmp71E32FD24E0F5940BB92662C539A00BA" Guid="*">
1212-
<File Id="fil1FCD51FDA84726CA73598C710DCF91C9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1213-
</Component>
1214-
<Component Id="cmpC0D2910F1E8DD94834985F8BBB1133A5" Guid="*">
1215-
<File Id="filD18744A14F342FBAF8AEEC84E7631535" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1216-
</Component>
1217-
<Component Id="cmpB8F6CEC74DC065D2D08FB82A76CF7411" Guid="*">
1218-
<File Id="filB56D69688254BE5906767249216D4B5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
1219-
</Component>
1220-
<Component Id="cmpFF465588FB32BEF908242C7BC2621DF6" Guid="*">
1221-
<File Id="fil40E441D30C21729F47D1073C6C45C06E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.Azure.dll" />
1222-
</Component>
1223-
<Component Id="cmpDEF412B27E738D9D17F5B36668F8D91C" Guid="*">
1224-
<File Id="fil52611C34282A47F1829053BBE3A88C5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.dll" />
1225-
</Component>
1226-
<Component Id="cmp28E39E96F170CA278BC16412EA44C66B" Guid="*">
1227-
<File Id="filAFFBCF14874562DC60CBDBBD0023F27E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Threading.Tasks.dll" />
1228-
</Component>
1229-
<Component Id="cmpD4CEF26E124B97CCF29E53FCEA63DF11" Guid="*">
1230-
<File Id="fil87975FFE36159391F2BFE90DC9870D1E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.WindowsAzure.Commands.Common.dll" />
1231-
</Component>
1232-
<Component Id="cmp91E4DB8DA0930C4EC30468BFA8F0C631" Guid="*">
1233-
<File Id="fil254001240A6A5CC7E60E12E8993C003E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.WindowsAzure.Management.dll" />
1234-
</Component>
1235-
<Component Id="cmp5A44264503BFAF83A7DA76A44878BC02" Guid="*">
1236-
<File Id="fil9CFE883503A62070640B22AC40754BF7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Newtonsoft.Json.dll" />
1237-
</Component>
1238-
<Component Id="cmp3C91684B2D48E072C9B84111E717AC26" Guid="*">
1239-
<File Id="fil3B384C03C867008DE2C9E8A0F7926E84" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\System.Management.Automation.dll" />
1240-
</Component>
1241-
</Directory>
12421177
<Directory Id="dirA5BF4C5FC88CC5FD4E43A0FA840806C7" Name="AzureRM.KeyVault">
12431178
<Component Id="cmpFEE86D031CEC182D160B80C5EC00914F" Guid="*">
12441179
<File Id="fil6DABB515D371B3CE610505D7BF92C2F4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\AzureResourceManager.psd1" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class AzurePowerShell
2929

3030
public const string AssemblyVersion = "1.0.0";
3131

32-
public const string AssemblyFileVersion = "1.0.1";
32+
public const string AssemblyFileVersion = "1.0.2";
3333

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

‎src/Common/Storage/Azure.Storage.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.1'
12+
ModuleVersion = '1.0.2'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '00612bca-fa22-401d-a671-9cc48b010e3b'
@@ -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.1'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.2'})
4949

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

‎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.1'
12+
ModuleVersion = '1.0.2'
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.1'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.2'})
4949

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

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/ApiManagementClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,12 +1039,12 @@ public void PolicySetTenantLevel(PsApiManagementContext context, string format,
10391039

10401040
public void PolicySetProductLevel(PsApiManagementContext context, string format, Stream stream, string productId)
10411041
{
1042-
Client.ProductPolicy.Set(context.ResourceGroupName, context.ServiceName, productId, format, stream);
1042+
Client.ProductPolicy.Set(context.ResourceGroupName, context.ServiceName, productId, format, stream, "*");
10431043
}
10441044

10451045
public void PolicySetApiLevel(PsApiManagementContext context, string format, Stream stream, string apiId)
10461046
{
1047-
Client.ApiPolicy.Set(context.ResourceGroupName, context.ServiceName, apiId, format, stream);
1047+
Client.ApiPolicy.Set(context.ResourceGroupName, context.ServiceName, apiId, format, stream, "*");
10481048
}
10491049

10501050
public void PolicySetOperationLevel(PsApiManagementContext context, string format, Stream stream, string apiId, string operationId)

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7474
<SpecificVersion>False</SpecificVersion>
75-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.0-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
76-
<Private>True</Private>
75+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.1-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
7776
</Reference>
7877
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7978
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/GetAzureApiManagementGroup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public override void ExecuteApiManagementCmdlet()
6565
{
6666
if (ParameterSetName.Equals(GetAll))
6767
{
68-
var groups = Client.GroupsList(Context, null, null, null);
68+
var groups = Client.GroupsList(Context, Name, null, null);
6969
WriteObject(groups, true);
7070
}
7171
else if (ParameterSetName.Equals(GetById))

0 commit comments

Comments
 (0)