Skip to content

Commit 02dc1db

Browse files
QingChenmsftQingChenmsft
committed
Merge branch 'preview' into sfrp
2 parents d0a3a85 + e03a876 commit 02dc1db

File tree

171 files changed

+23334
-14761
lines changed

Some content is hidden

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

171 files changed

+23334
-14761
lines changed

‎build.proj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
'AzureStorage': storage data plane cmdlets
2525
'Subfolder under src\ResourceManager': An individual cmdlet module
2626
By default, it builds all
27+
28+
/p:SkipHelp=True
29+
Skips help generation and installer creation, mainly for local builds to save time.
2730
-->
2831

2932
<!-- Define build properties -->
@@ -44,6 +47,7 @@
4447
<BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
4548
<NuGetPublishingSource Condition=" '$(NuGetPublishingSource)' == '' ">http://psget/PSGallery/api/v2/</NuGetPublishingSource>
4649
<Scope Condition=" $(Scope) == '' " >all</Scope>
50+
<SkipHelp Condition =" '$(SkipHelp)' == '' ">false</SkipHelp>
4751
</PropertyGroup>
4852
<ItemGroup>
4953
<CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln;.\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln;"
@@ -186,15 +190,17 @@
186190
BuildInParallel="$(BuildInParallel)"
187191
ContinueOnError="false" />
188192

189-
<Exec Command="$(PowerShellCommand) -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) &quot;" ContinueOnError="false"/>
193+
<Exec Command="$(PowerShellCommand) -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) &quot;"
194+
ContinueOnError="false"
195+
Condition=" '$(SkipHelp)' == 'false' "/>
190196
<CallTarget Targets="BuildSetupTest"/>
191197
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
192-
<CallTarget Targets="BuildSetup"/>
198+
<CallTarget Targets="BuildSetup" Condition=" '$(SkipHelp)' == 'false' "/>
193199
<CallTarget Targets="CodeSignInstaller"
194200
Condition=" '$(CodeSign)' == 'true' and '$(Scope)' == 'all'" />
195201
<Message Importance="high" Text="Running Static Analyser" />
196-
<CallTarget targets="DependencyAnalysis" />
197-
<Exec Command="$(PowerShellCommand) -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;"/>
202+
<CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
203+
<Exec Command="$(PowerShellCommand) -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
198204
</Target>
199205

200206
<!-- Do everything possible -->

‎setup/azurecmdfiles.wxi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5587,6 +5587,9 @@
55875587
<Component Id="cmpF16F05791511515D1EDED9CD9871A270" Guid="*">
55885588
<File Id="fil0E2DE426019E02A4B3DA0FA157E8EE8F" KeyPath="yes" Source="$(var.sourceDir)\Storage\Azure.Storage\Microsoft.WindowsAzure.Commands.Storage.types.ps1xml" />
55895589
</Component>
5590+
<Component Id="cmp5C553F43C13AF3486D63AA57CA520BB3" Guid="*">
5591+
<File Id="fil722FD0E85A7D13F52966D6523BC39BA2" KeyPath="yes" Source="$(var.sourceDir)\Storage\Azure.Storage\Microsoft.WindowsAzure.Configuration.dll" />
5592+
</Component>
55905593
<Component Id="cmpC98CE45CC73A0A544B5BF52559069BD9" Guid="*">
55915594
<File Id="fil3E03E1D346134CFF92D6A2AFA66DD184" KeyPath="yes" Source="$(var.sourceDir)\Storage\Azure.Storage\Microsoft.WindowsAzure.Management.dll" />
55925595
</Component>
@@ -7429,6 +7432,7 @@
74297432
<ComponentRef Id="cmpC4F475EF1B04109793D0176DBAAF71C9" />
74307433
<ComponentRef Id="cmpF8E19B713525002D6C0A6D1AE52711E0" />
74317434
<ComponentRef Id="cmpF16F05791511515D1EDED9CD9871A270" />
7435+
<ComponentRef Id="cmp5C553F43C13AF3486D63AA57CA520BB3" />
74327436
<ComponentRef Id="cmpC98CE45CC73A0A544B5BF52559069BD9" />
74337437
<ComponentRef Id="cmpDF4F2AE71669B4516296111AA83D8973" />
74347438
<ComponentRef Id="cmpA010F76325D67AFBB924716EC6B0158F" />

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,20 @@
6767
<SpecificVersion>False</SpecificVersion>
6868
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.20.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
6969
</Reference>
70-
<Reference Include="Microsoft.Data.Edm">
70+
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
72+
<HintPath>..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
73+
<Private>True</Private>
7374
</Reference>
74-
<Reference Include="Microsoft.Data.OData">
75+
<Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7576
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
77+
<HintPath>..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
78+
<Private>True</Private>
7779
</Reference>
78-
<Reference Include="Microsoft.Data.Services.Client">
80+
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7981
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
82+
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
83+
<Private>True</Private>
8184
</Reference>
8285
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8386
<SpecificVersion>False</SpecificVersion>
@@ -114,9 +117,10 @@
114117
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
115118
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
116119
</Reference>
117-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
120+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118121
<SpecificVersion>False</SpecificVersion>
119-
<HintPath>..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
122+
<HintPath>..\..\packages\WindowsAzure.Storage.8.1.1\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
123+
<Private>True</Private>
120124
</Reference>
121125
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
122126
<SpecificVersion>False</SpecificVersion>
@@ -139,9 +143,10 @@
139143
<Reference Include="System.Runtime.Serialization" />
140144
<Reference Include="System.ServiceModel" />
141145
<Reference Include="System.ServiceModel.Channels" />
142-
<Reference Include="System.Spatial">
146+
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
143147
<SpecificVersion>False</SpecificVersion>
144-
<HintPath>..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
148+
<HintPath>..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
149+
<Private>True</Private>
145150
</Reference>
146151
<Reference Include="System.Xml.Linq" />
147152
<Reference Include="System.Data.DataSetExtensions" />
@@ -196,4 +201,4 @@
196201
</ProjectReference>
197202
</ItemGroup>
198203
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
199-
</Project>
204+
</Project>

‎src/Common/Commands.Common.Storage/packages.config

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
12-
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
13-
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
14-
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
12+
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net45" />
13+
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net45" />
14+
<package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net45" />
1515
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1616
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net45" />
@@ -20,6 +20,10 @@
2020
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management.Storage" version="6.0.0" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
23-
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
24-
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
25-
</packages>
23+
<package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net45" />
24+
<package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net45" />
25+
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />
26+
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
27+
<package id="System.Spatial" version="5.8.2" targetFramework="net45" />
28+
<package id="WindowsAzure.Storage" version="8.1.1" targetFramework="net45" />
29+
</packages>

‎src/ResourceManager/ApiManagement/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Added support for configuring external groups in New-AzureRmApiManagementGroup.
2122

2223
## Version 3.6.0
2324

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

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,13 +1059,33 @@ private static QueryParameters CreateQueryUserParameters(string firstName, strin
10591059
#endregion
10601060

10611061
#region Groups
1062-
public PsApiManagementGroup GroupCreate(PsApiManagementContext context, string groupId, string name, string description)
1062+
public PsApiManagementGroup GroupCreate(
1063+
PsApiManagementContext context,
1064+
string groupId,
1065+
string name,
1066+
string description,
1067+
PsApiManagementGroupType? type,
1068+
string externalId)
10631069
{
10641070
var groupCreateParameters = new GroupCreateParameters(name)
10651071
{
10661072
Description = description
10671073
};
10681074

1075+
if (type.HasValue)
1076+
{
1077+
groupCreateParameters.Type = Mapper.Map<GroupTypeContract>(type.Value);
1078+
}
1079+
else
1080+
{
1081+
groupCreateParameters.Type = Mapper.Map<GroupTypeContract>(PsApiManagementGroupType.Custom);
1082+
}
1083+
1084+
if (!string.IsNullOrEmpty(externalId))
1085+
{
1086+
groupCreateParameters.ExternalId = externalId;
1087+
}
1088+
10691089
Client.Groups.Create(context.ResourceGroupName, context.ServiceName, groupId, groupCreateParameters);
10701090

10711091
var response = Client.Groups.Get(context.ResourceGroupName, context.ServiceName, groupId);
@@ -1118,17 +1138,23 @@ public void GroupRemove(PsApiManagementContext context, string groupId)
11181138
Client.Groups.Delete(context.ResourceGroupName, context.ServiceName, groupId, "*");
11191139
}
11201140

1121-
public void GroupSet(PsApiManagementContext context, string groupId, string name, string description)
1141+
public void GroupSet(
1142+
PsApiManagementContext context,
1143+
string groupId,
1144+
string name,
1145+
string description)
11221146
{
1147+
var groupUpdate = new GroupUpdateParameters
1148+
{
1149+
Name = name,
1150+
Description = description
1151+
};
1152+
11231153
Client.Groups.Update(
11241154
context.ResourceGroupName,
11251155
context.ServiceName,
11261156
groupId,
1127-
new GroupUpdateParameters
1128-
{
1129-
Name = name,
1130-
Description = description
1131-
},
1157+
groupUpdate,
11321158
"*");
11331159
}
11341160
#endregion

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@
7575
<SpecificVersion>False</SpecificVersion>
7676
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.20.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7777
</Reference>
78-
<Reference Include="Microsoft.Data.Edm">
79-
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
78+
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79+
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
80+
<Private>True</Private>
8181
</Reference>
82-
<Reference Include="Microsoft.Data.OData">
83-
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
82+
<Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
84+
<Private>True</Private>
8585
</Reference>
86-
<Reference Include="Microsoft.Data.Services.Client">
87-
<SpecificVersion>False</SpecificVersion>
88-
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
86+
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87+
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
88+
<Private>True</Private>
8989
</Reference>
9090
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9191
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
@@ -109,9 +109,9 @@
109109
<SpecificVersion>False</SpecificVersion>
110110
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
111111
</Reference>
112-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113-
<SpecificVersion>False</SpecificVersion>
114-
<HintPath>..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
112+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=8.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113+
<HintPath>..\..\..\packages\WindowsAzure.Storage.8.1.1\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
114+
<Private>True</Private>
115115
</Reference>
116116
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
117117
<SpecificVersion>False</SpecificVersion>
@@ -129,9 +129,9 @@
129129
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
130130
</Reference>
131131
<Reference Include="System.Net.Http.WebRequest" />
132-
<Reference Include="System.Spatial">
133-
<SpecificVersion>False</SpecificVersion>
134-
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
132+
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133+
<HintPath>..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
134+
<Private>True</Private>
135135
</Reference>
136136
<Reference Include="System.Xml.Linq" />
137137
<Reference Include="System.Data.DataSetExtensions" />

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,29 @@ public class NewAzureApiManagementGroup : AzureApiManagementCmdletBase
4848
HelpMessage = "Group description. This parameter is optional.")]
4949
public String Description { get; set; }
5050

51+
[Parameter(
52+
ValueFromPipelineByPropertyName = true,
53+
Mandatory = false,
54+
HelpMessage = "Group Type." +
55+
" Custom Group is User defined Group." +
56+
" System Group includes Administrator, Developers and Guests. You cannot create or update a System Group. " +
57+
" External Group is groups from External Identity Provider like Azure Active Directory." +
58+
" This parameter is optional and by default assumed to be a Custom Group.")]
59+
public PsApiManagementGroupType? Type { get; set; }
60+
61+
[Parameter(
62+
ValueFromPipelineByPropertyName = false,
63+
Mandatory = false,
64+
HelpMessage = "For external groups, this property contains the id of the group from the external identity provider," +
65+
" e.g. Azure Active Directory aad://contoso5api.onmicrosoft.com/groups/12ad42b1-592f-4664-a77b4250-2f2e82579f4c;" +
66+
" otherwise the value is null.")]
67+
public String ExternalId { get; set; }
68+
5169
public override void ExecuteApiManagementCmdlet()
5270
{
5371
string groupId = GroupId ?? Guid.NewGuid().ToString("N");
5472

55-
var group = Client.GroupCreate(Context, groupId, Name, Description);
73+
var group = Client.GroupCreate(Context, groupId, Name, Description, Type, ExternalId);
5674

5775
WriteObject(group);
5876
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ public class SetAzureApiManagementPolicy : AzureApiManagementCmdletBase
4141
[Parameter(
4242
ValueFromPipelineByPropertyName = true,
4343
Mandatory = false,
44-
HelpMessage = "Format of the policy. This parameter is optional. Default value is 'application/vnd.ms-azure-apim.policy+xml'.")]
44+
HelpMessage = "Format of the policy. This parameter is optional." +
45+
"When using application/vnd.ms-azure-apim.policy+xml, expressions contained within the policy must be XML-escaped." +
46+
"When using application/vnd.ms-azure-apim.policy.raw+xml no escaping is necessary." +
47+
"Default value is 'application/vnd.ms-azure-apim.policy+xml'.")]
4548
public String Format { get; set; }
4649

4750
[Parameter(

0 commit comments

Comments
 (0)