Skip to content

Dev #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 85 commits into from
Dec 19, 2015
Merged

Dev #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
f5ad946
+ added unit test
ailn Oct 21, 2015
783ae7e
Merge remote-tracking branch 'upstream/dev' into dev
ailn Oct 23, 2015
e2b2378
+ updated SDK package to the latest one
ailn Oct 26, 2015
229f872
Merge remote-tracking branch 'upstream/dev' into dev
ailn Oct 26, 2015
c33dcb6
Merge remote-tracking branch 'upstream/dev' into dev
ailn Oct 27, 2015
3706b2c
Merge remote-tracking branch 'upstream/master' into dev
ailn Oct 28, 2015
fe6f7b3
Merge remote-tracking branch 'upstream/dev' into dev
ailn Oct 30, 2015
583d13c
Merge remote-tracking branch 'upstream/dev' into dev
ailn Nov 2, 2015
99556dd
Use version 1.0.0 of the TrafficManager .NET SDK, add support for Min…
Nov 19, 2015
8699c19
Fix Get-AzureRmTrafficManagerProfile not populating some endpoint pro…
Nov 23, 2015
66a1034
KeyVault: Add support for "standard vault only" regions in test scripts
Dec 4, 2015
7de5d31
[AppGW] Adding probe, multisite and URL routing support
Dec 4, 2015
b5a5fe3
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Dec 4, 2015
0b42521
[AppGW] Adding probe, multisite, URL routing
Dec 7, 2015
b7d55c4
upstream merge
Dec 7, 2015
a0d21b3
[AppGW] Incrementing to latest Network SDK
Dec 7, 2015
12e8eb9
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Dec 7, 2015
42fb88a
[AppGW] Re-recording test
Dec 7, 2015
47cc609
[AppGW] Updating compute project with latest Network package
Dec 7, 2015
426a0b5
bump SDK version
Dec 7, 2015
358eb8d
fixing storage bug
Dec 8, 2015
47a3828
Merge pull request #1433 from kagamsft/dev
jianghaolu Dec 8, 2015
625dc59
Merge pull request #1437 from shefaliv/hdi
jianghaolu Dec 8, 2015
86aee28
Update change log
jianghaolu Dec 8, 2015
41d2223
Update version numbers for 1.0.2 release
jianghaolu Dec 8, 2015
6caaf34
Remove intune module from wxi
jianghaolu Dec 8, 2015
358e2c5
Temporarily remove intune from build
jianghaolu Dec 8, 2015
e52f110
November -> December
jianghaolu Dec 9, 2015
f08a2f0
Correct version numbers in psd1 modules
jianghaolu Dec 9, 2015
bc93498
Merge pull request #1445 from jianghaolu/release-1.0.2
jianghaolu Dec 9, 2015
647e298
Added new Server threat detection support
yaakoviyun Dec 9, 2015
c88078e
Merge remote-tracking branch 'upstream/dev' into dev
ailn Dec 9, 2015
4a5b2cb
KeyVault: Only create standard vaults for testing in standardvaultonl…
Dec 9, 2015
7e22121
Add changelog for Compute cmdlets.
hyonholee Dec 9, 2015
2f5477e
copyright fixes
ailn Dec 10, 2015
dcdce37
Merge pull request #1457 from hyonholee/release-1.0.2
jianghaolu Dec 10, 2015
871c779
+ fixed GetGroup
ailn Dec 10, 2015
36392c3
Add change log for azure resource storage.
EmmaZhu Dec 10, 2015
20204bb
Merge pull request #36 from Azure/dev
avneeshraiusit Dec 10, 2015
41c57f9
Fixing Copyright Information
avneeshraiusit Dec 10, 2015
7e0dd19
Merge remote-tracking branch 'upstream/dev' into dev
ailn Dec 10, 2015
e32b882
Fixing the broken PS command let:- Get-AzureRmVpnClientPackage by add…
Nilambari Dec 10, 2015
2322aef
Fix bug 191050:Service principal accounts cannot use Key Vault via Po…
Dec 9, 2015
6337cb0
Merge pull request #1462 from wastoresh/dev
jianghaolu Dec 11, 2015
37803ab
Update ShortcutStartup.ps1
markcowl Dec 11, 2015
7a3f9cd
Incorporate review comments.
Nilambari Dec 11, 2015
6405acc
Incorporate review comments-Part2.
Nilambari Dec 11, 2015
1743c33
Incorporate review comments-Part3
Nilambari Dec 11, 2015
e4e409b
Merge pull request #1472 from Azure/fixShortcut
markcowl Dec 11, 2015
33578d4
Merge pull request #1469 from Nilambari/latestdev
markcowl Dec 11, 2015
bbd6a3c
Update version of the job package and re-run tests
Dec 11, 2015
489cb2e
Merge pull request #6 from Azure/dev
yaakoviyun Dec 14, 2015
ef00783
Revert "Added new Server threat detection support"
yaakoviyun Dec 14, 2015
9df32e3
"Database" typo fix
yaakoviyun Dec 14, 2015
8a9e512
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Dec 15, 2015
e23401a
Adding help xml for ADL
Dec 15, 2015
2b64d53
Merge pull request #1466 from AsrArmOneSdk/dev
markcowl Dec 15, 2015
29dd82e
Merge pull request #1430 from karlaugsten/dev
markcowl Dec 15, 2015
9e1a3e4
Fix GenerateVpnClient commandlet, remove hardcoded location
Nilambari Dec 15, 2015
e5ce403
Merge pull request #246 from Azure/dev
huangpf Dec 15, 2015
dbe5b6c
Merge pull request #1491 from Nilambari/latestdev
markcowl Dec 15, 2015
a4282d2
Fix RDP cmdlet
deepakswifty Dec 15, 2015
9b8e4bd
Remove local feed, fix display for jobs include ID
Dec 15, 2015
05878ef
Merge pull request #1490 from YuhuiZhong/serviceprincipal
Dec 15, 2015
2d58fcd
Merge pull request #1495 from Azure/release-1.0.2
jianghaolu Dec 15, 2015
cb434db
Merge pull request #250 from Azure/dev
huangpf Dec 15, 2015
ea34dea
Merge pull request #1497 from Azure/master
jianghaolu Dec 15, 2015
fe250ea
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
huangpf Dec 15, 2015
f072110
Merge branch 'dev' of https://github.com/huangpf/azure-powershell int…
huangpf Dec 15, 2015
79ac0c1
Add Expand option for all top level resources
deepakswifty Dec 16, 2015
2b86fdf
Merge Azure/dev and fix conflicts
Dec 16, 2015
abe5f8b
Re-added deleted cmdlet file GetAzureAutomationJobOutputRecord.cs
safeermohammed Dec 16, 2015
868cbb5
Bump up version for AzureRM
jianghaolu Dec 16, 2015
97fb295
Merge pull request #1508 from jianghaolu/release-1.0.2
jianghaolu Dec 16, 2015
4a1d2ba
Merge pull request #1479 from yaakoviyun/dev
markcowl Dec 17, 2015
1e4d68e
Merge pull request #1488 from begoldsm/dev
markcowl Dec 17, 2015
97ddf8f
Merge pull request #1511 from Azure/AzureRM-release-1.0.4
markcowl Dec 17, 2015
57521bf
Merge pull request #1506 from vladca/trafficmanagerNovGA
Dec 17, 2015
f0d2eb3
Merge pull request #254 from Azure/dev
huangpf Dec 17, 2015
44798fb
Merge pull request #1516 from Azure/master
markcowl Dec 17, 2015
e7e841c
Merge pull request #1467 from ailn/dev
markcowl Dec 17, 2015
e5e44d3
Merge pull request #1496 from DeepakRajendranMsft/FixRDPCmdlet
markcowl Dec 17, 2015
94eb547
Merge pull request #1503 from DeepakRajendranMsft/ExpandParameter
markcowl Dec 17, 2015
4b58f19
Merge pull request #1507 from AzureAutomationTeam/dev
markcowl Dec 17, 2015
450f8a7
Merge pull request #257 from Azure/dev
huangpf Dec 18, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 14 additions & 30 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,40 +1,24 @@
## 2015.12.14 version 1.0.2
* Azure Compute (ARM):
* Enable BGInfo extension by default
* 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.
* Add Set-AzureRmBginfoExtension cmdlet
* Make WinRMCertificateUrl parameter mandatory when Set-AzureRmVMOperatingSystem cmdlet is performed with WinRMHttps switch
* Azure Compute (Service Management):
* Fix the issue when adding a new VM without a data disk
* Add ExtensionId parameter for all extension cmdlets
* Expose RemoteAccessCertificateThumbprint property for Get-AzureVM cmdlet
* Azure SQL Database: new cmdlets for managing database threat detection policies:
* Get-AzureRmSqlDatabaseThreatDetectionPolicy
* Set-AzureRmSqlDatabaseThreatDetectionPolicy
* Remove-AzureRmSqlDatabaseThreatDetectionPolicy
* Azure RemoteApp: New cmdlets for managing stale machine accounts in AD:
* Get-AzureRemoteAppVmStaleAdObject
* Clear-AzureRemoteAppVmStaleAdObject
* Azure Intune: New cmdlets for Mobile Application management:
* Add-AzureRmIntuneAndroidMAMPolicyApp
* Add-AzureRmIntuneAndroidMAMPolicyGroup
* Add-AzureRmIntuneiOSMAMPolicyApp
* Add-AzureRmIntuneiOSMAMPolicyGroup
* Get-AzureRmIntuneAndroidMAMApp
* Get-AzureRmIntuneAndroidMAMPolicy
* Get-AzureRmIntuneAndroidMAMPolicyApp
* Get-AzureRmIntuneAndroidMAMPolicyGroup
* Get-AzureRmIntuneiOSMAMApp
* Get-AzureRmIntuneiOSMAMPolicy
* Get-AzureRmIntuneiOSMAMPolicyApp
* Get-AzureRmIntuneiOSMAMPolicyGroup
* Get-AzureRmIntuneMAMFlaggedUser
* Get-AzureRmIntuneMAMStatus
* Get-AzureRmIntuneMAMUserDevice
* Get-AzureRmIntuneMAMUserFlaggedEnrolledApp
* Get-AzureRmIntuneOperationResult
* Invoke-AzureRmIntuneMAMUserDeviceWipe
* New-AzureRmIntuneAndroidMAMPolicy
* New-AzureRmIntuneiOSMAMPolicy
* Remove-AzureRmIntuneAndroidMAMPolicy
* Remove-AzureRmIntuneAndroidMAMPolicyApp
* Remove-AzureRmIntuneAndroidMAMPolicyGroup
* Remove-AzureRmIntuneIOSMAMPolicy
* Remove-AzureRmIntuneiOSMAMPolicyApp
* Remove-AzureRmIntuneiOSMAMPolicyGroup
* Set-AzureRmIntuneAndroidMAMPolicy
* Set-AzureRmIntuneiOSMAMPolicy

* ARM Storage:
* Fix alias missing issue


## 2015.11.09 version 1.0.1
* Azure Compute
* Added cmdlets for managing VM DiskEncryption extension
Expand Down
4 changes: 3 additions & 1 deletion build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@
<Scope Condition=" $(Scope) == '' " >all</Scope>
</PropertyGroup>
<ItemGroup>
<CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln" Condition=" '$(Scope)' == 'all' "/>
<CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln"
Exclude=".\src\ResourceManager\Intune\*.sln"
Condition=" '$(Scope)' == 'all' "/>
<CmdletSolutionsToBuild Include=".\src\ResourceManager\$(Scope)\*.sln"
Condition=" '$(Scope)' != 'all' and '$(Scope)' != 'ServiceManagement' and '$(Scope)' != 'AzureStorage' "/>
<CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"
Expand Down
4 changes: 2 additions & 2 deletions setup/azurecmd.wxs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">

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

<?define version="1.0.1" ?>
<?define version="1.0.2" ?>
<?define versionedStartMenuFolder="Microsoft Azure" ?>
<?define staleStartMenuFolder="Windows Azure" ?>

Expand Down
65 changes: 0 additions & 65 deletions setup/azurecmdfiles.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -1174,71 +1174,6 @@
<File Id="fil7A9F66CF061583CA28B0DA562E249A8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Newtonsoft.Json.dll" />
</Component>
</Directory>
<Directory Id="dirF8BB5CC2A8AA03F23D432B214F947ADA" Name="AzureRM.Intune">
<Component Id="cmp26757C9254980E46634DDBF7FA3DC0EE" Guid="*">
<File Id="fil15F8D200C8D0DEF2FBDEC493EDAB1BB4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\AzureRM.Intune.psd1" />
</Component>
<Component Id="cmp6A7508D641ABC42CBC47E8C71F5F7960" Guid="*">
<File Id="fil1C925E148CCDCEC0309363FC8D38D29F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Hyak.Common.dll" />
</Component>
<Component Id="cmpC40A93532FA1B6B3CC495C44287DD4FD" Guid="*">
<File Id="fil975F3E120A33EB1AD11D26AA54DC0E22" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.ApplicationInsights.dll" />
</Component>
<Component Id="cmpBA0E9AFF4B786F09AF8CA24A30DA0B3E" Guid="*">
<File Id="fil383BA66850249A60C6F43C9B50FE1975" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.Intune.dll" />
</Component>
<Component Id="cmpC329903507D2C760A07068087F01E0F0" Guid="*">
<File Id="fil6BD6B84E30BE331FEED4195F69F365FB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.Intune.dll-Help.xml" />
</Component>
<Component Id="cmpA98F34A253A4D33476481745DC338B72" Guid="*">
<File Id="fil2BB88DE9212FEEA5B5883B030C218237" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
</Component>
<Component Id="cmp3218E7B28F820C614786457C75F68FDE" Guid="*">
<File Id="fil2A8526A4DBACB5E1589A680FBBC5C68D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.Authentication.dll" />
</Component>
<Component Id="cmpD48ED88B3D289F81DFEB1BE8D8BDFDBB" Guid="*">
<File Id="fil469E93C3E227C1882BBC95DF2B8EF8E9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.dll" />
</Component>
<Component Id="cmp9D7D5FC99E7FB18787B78A246F386511" Guid="*">
<File Id="filBC526C0E7B432252967B14C5EDBE9ADE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Common.NetFramework.dll" />
</Component>
<Component Id="cmp01D375B8D50C7BB0584789AF3262E6EB" Guid="*">
<File Id="filCA529DB57BEA2658246C587E86778481" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Azure.Management.Intune.dll" />
</Component>
<Component Id="cmp75A4FEB22AE2D2B4A03F04A4C7E8D32E" Guid="*">
<File Id="fil61C8BE5CFE6844DFC7DA11E02D2F3820" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Bcl.Build.Tasks.dll" />
</Component>
<Component Id="cmp71E32FD24E0F5940BB92662C539A00BA" Guid="*">
<File Id="fil1FCD51FDA84726CA73598C710DCF91C9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
</Component>
<Component Id="cmpC0D2910F1E8DD94834985F8BBB1133A5" Guid="*">
<File Id="filD18744A14F342FBAF8AEEC84E7631535" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
</Component>
<Component Id="cmpB8F6CEC74DC065D2D08FB82A76CF7411" Guid="*">
<File Id="filB56D69688254BE5906767249216D4B5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
</Component>
<Component Id="cmpFF465588FB32BEF908242C7BC2621DF6" Guid="*">
<File Id="fil40E441D30C21729F47D1073C6C45C06E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.Azure.dll" />
</Component>
<Component Id="cmpDEF412B27E738D9D17F5B36668F8D91C" Guid="*">
<File Id="fil52611C34282A47F1829053BBE3A88C5C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Rest.ClientRuntime.dll" />
</Component>
<Component Id="cmp28E39E96F170CA278BC16412EA44C66B" Guid="*">
<File Id="filAFFBCF14874562DC60CBDBBD0023F27E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.Threading.Tasks.dll" />
</Component>
<Component Id="cmpD4CEF26E124B97CCF29E53FCEA63DF11" Guid="*">
<File Id="fil87975FFE36159391F2BFE90DC9870D1E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.WindowsAzure.Commands.Common.dll" />
</Component>
<Component Id="cmp91E4DB8DA0930C4EC30468BFA8F0C631" Guid="*">
<File Id="fil254001240A6A5CC7E60E12E8993C003E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Microsoft.WindowsAzure.Management.dll" />
</Component>
<Component Id="cmp5A44264503BFAF83A7DA76A44878BC02" Guid="*">
<File Id="fil9CFE883503A62070640B22AC40754BF7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\Newtonsoft.Json.dll" />
</Component>
<Component Id="cmp3C91684B2D48E072C9B84111E717AC26" Guid="*">
<File Id="fil3B384C03C867008DE2C9E8A0F7926E84" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Intune\System.Management.Automation.dll" />
</Component>
</Directory>
<Directory Id="dirA5BF4C5FC88CC5FD4E43A0FA840806C7" Name="AzureRM.KeyVault">
<Component Id="cmpFEE86D031CEC182D160B80C5EC00914F" Guid="*">
<File Id="fil6DABB515D371B3CE610505D7BF92C2F4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\AzureResourceManager.psd1" />
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commands.Common/AzurePowerShell.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class AzurePowerShell

public const string AssemblyVersion = "1.0.0";

public const string AssemblyFileVersion = "1.0.1";
public const string AssemblyFileVersion = "1.0.2";

public const string ProfileFile = "AzureProfile.json";

Expand Down
4 changes: 2 additions & 2 deletions src/Common/Storage/Azure.Storage.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.1'
ModuleVersion = '1.0.2'

# ID used to uniquely identify this module
GUID = '00612bca-fa22-401d-a671-9cc48b010e3b'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.1'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.2'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.1'
ModuleVersion = '1.0.2'

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

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.1'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.2'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1039,12 +1039,12 @@ public void PolicySetTenantLevel(PsApiManagementContext context, string format,

public void PolicySetProductLevel(PsApiManagementContext context, string format, Stream stream, string productId)
{
Client.ProductPolicy.Set(context.ResourceGroupName, context.ServiceName, productId, format, stream);
Client.ProductPolicy.Set(context.ResourceGroupName, context.ServiceName, productId, format, stream, "*");
}

public void PolicySetApiLevel(PsApiManagementContext context, string format, Stream stream, string apiId)
{
Client.ApiPolicy.Set(context.ResourceGroupName, context.ServiceName, apiId, format, stream);
Client.ApiPolicy.Set(context.ResourceGroupName, context.ServiceName, apiId, format, stream, "*");
}

public void PolicySetOperationLevel(PsApiManagementContext context, string format, Stream stream, string apiId, string operationId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.0-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.1-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public override void ExecuteApiManagementCmdlet()
{
if (ParameterSetName.Equals(GetAll))
{
var groups = Client.GroupsList(Context, null, null, null);
var groups = Client.GroupsList(Context, Name, null, null);
WriteObject(groups, true);
}
else if (ParameterSetName.Equals(GetById))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
using System.Reflection;
using System.Runtime.CompilerServices;
// ----------------------------------------------------------------------------------
//
// Copyright Microsoft Corporation
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// ----------------------------------------------------------------------------------

using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Commands.ApiManagement")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Hewlett-Packard Company")]
[assembly: AssemblyProduct("Commands.ApiManagement")]
[assembly: AssemblyCopyright("Copyright © Hewlett-Packard Company 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyTitle("Microsoft.Azure.Commands.ApiManagement.ServiceManagement")]
[assembly: AssemblyCompany(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCompany)]
[assembly: AssemblyProduct(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyProduct)]
[assembly: AssemblyCopyright(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCopyright)]


// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand All @@ -32,5 +42,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<package id="Microsoft.Azure.Common.Authentication" version="1.4.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.ApiManagement" version="2.0.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.ApiManagement" version="2.0.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@
</Reference>
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.0-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.2.0.1-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Authorization">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -156,6 +155,10 @@
<Compile Include="UnitTests\PsApiManagementTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
<Name>Commands.Common</Name>
</ProjectReference>
<ProjectReference Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj">
<Project>{3436a126-edc9-4060-8952-9a1be34cdd95}</Project>
<Name>Commands.ScenarioTests.ResourceManager.Common</Name>
Expand Down
Loading