Skip to content

Commit 6dfd2b6

Browse files
huangpfhuangpf
committed
Merge pull request Azure#495 from Azure/dev
HPF PR: dev <- Azure:dev
2 parents 78d06b5 + 954ec40 commit 6dfd2b6

File tree

306 files changed

+61617
-23197
lines changed

Some content is hidden

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

306 files changed

+61617
-23197
lines changed

‎AzurePowershell.Test.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
<XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
8787
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
8888
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
89+
<XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
8990
<XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
9091
<XUnitTests Include="@(AsmXUnitTests)"/>
9192
</ItemGroup>

‎build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<Scope Condition=" $(Scope) == '' " >all</Scope>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln;.\src\Storage\Storage.sln"
48+
<CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln;.\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln"
4949
Exclude=".\src\ResourceManager\Intune\*.sln"
5050
Condition=" '$(Scope)' == 'all' "/>
5151
<CmdletSolutionsToBuild Include=".\src\ResourceManager\$(Scope)\*.sln"

‎setup/azurecmdfiles.wxi

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,74 @@
499499
<File Id="fil9D065E8E5B3E5AF98B57D1F44F6C8698" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\System.Spatial.dll" />
500500
</Component>
501501
</Directory>
502+
<Directory Id="dir75F2C4F350248207C418DE5A1C651FB6" Name="AzureRM.Cdn">
503+
<Component Id="cmpD18084727DDF26BDFCE36BE4EF3E3FBC" Guid="*">
504+
<File Id="fil94E16717A827E81C325C0FF864D01FFC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\AzureRm.Cdn.psd1" />
505+
</Component>
506+
<Component Id="cmp87DFE6BA28632B552074C8A05968ED49" Guid="*">
507+
<File Id="filB29D13A0412832DF84301430FAF5C2EB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\AzureRM.Tags.psd1" />
508+
</Component>
509+
<Component Id="cmpFCC54BA077C7C12B0A49F42DD3039435" Guid="*">
510+
<File Id="filD253995C681D155F4A3BAED9AC075F4D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Hyak.Common.dll" />
511+
</Component>
512+
<Component Id="cmp984FE30B4A873A5B1BC8F7E85B1CEF85" Guid="*">
513+
<File Id="fil43DC81F2DC5C7E63E90FE796C701DAB0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.ApplicationInsights.dll" />
514+
</Component>
515+
<Component Id="cmp2F3E4B9B10BAC8DA1FA711C6B756E1D1" Guid="*">
516+
<File Id="fil5C7E4A0AAABAF43D3EE40210E8293406" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Azure.Commands.Cdn.dll" />
517+
</Component>
518+
<Component Id="cmpCCEFEAF7E9F568DCE42A92D1F88073E9" Guid="*">
519+
<File Id="filD972105870B71EAB5F20C02E177C482C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Azure.Commands.Cdn.dll-help.xml" />
520+
</Component>
521+
<Component Id="cmp8117892AB4985527257E1CB4EF41A743" Guid="*">
522+
<File Id="fil65188B813C8456002AAE81CF06487BD6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Azure.Commands.Common.Authentication.dll" />
523+
</Component>
524+
<Component Id="cmpDD697CE5686294AEE2F1E584E100CE73" Guid="*">
525+
<File Id="filFF3B5EA80A1511BA9FCF607CBFA314B7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
526+
</Component>
527+
<Component Id="cmp252272B69613A5F710C5E88958DA919A" Guid="*">
528+
<File Id="filD6400F20F16F20CFF35E05C225E43B61" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Azure.Commands.Tags.dll" />
529+
</Component>
530+
<Component Id="cmpEBD89E99E08A04D8E09A56DF02850E93" Guid="*">
531+
<File Id="fil98A4BBFAA273464F2C94EED00F90F842" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Azure.Commands.Tags.dll-help.xml" />
532+
</Component>
533+
<Component Id="cmp4ACEED299D2E78B0966C9D9AF5B11294" Guid="*">
534+
<File Id="fil00F84FDAB6C3D2898D8DE7428F096738" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Azure.Commands.Tags.format.ps1xml" />
535+
</Component>
536+
<Component Id="cmpA5CE394C9942D9D4ADAEACFF06789D1B" Guid="*">
537+
<File Id="fil1F02F9993EC0DC7476460E83C43D1448" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Azure.Common.dll" />
538+
</Component>
539+
<Component Id="cmp19A96D3D033345B43FC2C44361B32868" Guid="*">
540+
<File Id="filD1C51868057B7D6AC2300D31E46AC6A4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Azure.Common.NetFramework.dll" />
541+
</Component>
542+
<Component Id="cmp4AACC4C33AF20DAFD9C6699AD976D228" Guid="*">
543+
<File Id="fil61662A39754213EE6B9B4B653463030E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Azure.Management.Cdn.dll" />
544+
</Component>
545+
<Component Id="cmp3F28B47ADA76A3639E59F48BDB522E0A" Guid="*">
546+
<File Id="filA49870A1F211F82C2DAD4F990CDA7E0D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Azure.ResourceManager.dll" />
547+
</Component>
548+
<Component Id="cmpA172AC1ECDF20C8AFF036626150559A5" Guid="*">
549+
<File Id="fil15DBB5066432463739208A1084EFC2DC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
550+
</Component>
551+
<Component Id="cmp0A8178CC44A697B0FB171FC30E93287A" Guid="*">
552+
<File Id="fil7E71D1F5F558C4087AFFD6C29F684C02" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
553+
</Component>
554+
<Component Id="cmpE1FF60A60B506C43C8B03708882127E7" Guid="*">
555+
<File Id="fil890F77F04ED6F08F4974514B44DA38F5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Rest.ClientRuntime.Azure.dll" />
556+
</Component>
557+
<Component Id="cmpD61BF241990D4031E507A459B75EB137" Guid="*">
558+
<File Id="filA72498FA5FD757838A3759A3596D3633" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Rest.ClientRuntime.dll" />
559+
</Component>
560+
<Component Id="cmp6519C0CCA1A55C0C4F71A2D84CB100DA" Guid="*">
561+
<File Id="fil725DEB7F20EE5A560D523EFEA33B7040" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.Threading.Tasks.dll" />
562+
</Component>
563+
<Component Id="cmp86B6BE57BD32B926D472B8064DAE1EB5" Guid="*">
564+
<File Id="filA5509DD259F05D0D90BE76841A29F479" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Microsoft.WindowsAzure.Commands.Common.dll" />
565+
</Component>
566+
<Component Id="cmpBFE50702869E7E4BC74489AACC090CC8" Guid="*">
567+
<File Id="filE46225E75692ACB5643F609EC0A0CA27" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Newtonsoft.Json.dll" />
568+
</Component>
569+
</Directory>
502570
<Directory Id="dir470D08462380F56397F9D0288EEA2E52" Name="AzureRM.Compute">
503571
<Component Id="cmpD2516E302D41812368A84BD6010FB066" Guid="*">
504572
<File Id="filEBA6A8A31DD00604D785E38F8379CCC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AutoMapper.dll" />
@@ -3029,6 +3097,9 @@
30293097
<Component Id="cmpF7ADD37722F45985B5323202F35958F2" Guid="*">
30303098
<File Id="fil0FA91D9C31AF07DCD03BFB842FE2B77E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll" />
30313099
</Component>
3100+
<Component Id="cmp9D64A1111722F25BC100121E73BE039E" Guid="*">
3101+
<File Id="filD9BAD7BE2D8E9E1E7DDA9BAED346E4B7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll-Help.xml" />
3102+
</Component>
30323103
<Component Id="cmpE52498FB0431A601DD9FDE6F082DF1D4" Guid="*">
30333104
<File Id="fil1C2DE4A7227BA117EC30E177CDE33EBA" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.WindowsAzure.Commands.ServiceManagement.Preview.dll" />
30343105
</Component>
@@ -3092,6 +3163,9 @@
30923163
<Component Id="cmp7F9F978DBE7D6715FA75FFB3BE40806E" Guid="*">
30933164
<File Id="filD8D9BC2D74630E2A6A9438D81BEBFE40" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Newtonsoft.Json.dll" />
30943165
</Component>
3166+
<Component Id="cmp4AA539549D58FD2D5DD3C404556F3DBB" Guid="*">
3167+
<File Id="fil4D8DA0FB6E8B4E47BD5A37E758BFC156" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\PIR.psd1" />
3168+
</Component>
30953169
<Component Id="cmp348131C92750A7166DCA75757E409378" Guid="*">
30963170
<File Id="fil4C89A8A3AA200315DD08D7FD6DA12286" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\ServiceManagementStartup.ps1" />
30973171
</Component>
@@ -5011,6 +5085,28 @@
50115085
<ComponentRef Id="cmp8E6B2CBC9EF2E6C9012C5090F2932C68" />
50125086
<ComponentRef Id="cmp30F0EC1B207C0F4C59F81099974C18E3" />
50135087
<ComponentRef Id="cmp22BC5873E0018F5801CD486C6CBCE0C5" />
5088+
<ComponentRef Id="cmpD18084727DDF26BDFCE36BE4EF3E3FBC" />
5089+
<ComponentRef Id="cmp87DFE6BA28632B552074C8A05968ED49" />
5090+
<ComponentRef Id="cmpFCC54BA077C7C12B0A49F42DD3039435" />
5091+
<ComponentRef Id="cmp984FE30B4A873A5B1BC8F7E85B1CEF85" />
5092+
<ComponentRef Id="cmp2F3E4B9B10BAC8DA1FA711C6B756E1D1" />
5093+
<ComponentRef Id="cmpCCEFEAF7E9F568DCE42A92D1F88073E9" />
5094+
<ComponentRef Id="cmp8117892AB4985527257E1CB4EF41A743" />
5095+
<ComponentRef Id="cmpDD697CE5686294AEE2F1E584E100CE73" />
5096+
<ComponentRef Id="cmp252272B69613A5F710C5E88958DA919A" />
5097+
<ComponentRef Id="cmpEBD89E99E08A04D8E09A56DF02850E93" />
5098+
<ComponentRef Id="cmp4ACEED299D2E78B0966C9D9AF5B11294" />
5099+
<ComponentRef Id="cmpA5CE394C9942D9D4ADAEACFF06789D1B" />
5100+
<ComponentRef Id="cmp19A96D3D033345B43FC2C44361B32868" />
5101+
<ComponentRef Id="cmp4AACC4C33AF20DAFD9C6699AD976D228" />
5102+
<ComponentRef Id="cmp3F28B47ADA76A3639E59F48BDB522E0A" />
5103+
<ComponentRef Id="cmpA172AC1ECDF20C8AFF036626150559A5" />
5104+
<ComponentRef Id="cmp0A8178CC44A697B0FB171FC30E93287A" />
5105+
<ComponentRef Id="cmpE1FF60A60B506C43C8B03708882127E7" />
5106+
<ComponentRef Id="cmpD61BF241990D4031E507A459B75EB137" />
5107+
<ComponentRef Id="cmp6519C0CCA1A55C0C4F71A2D84CB100DA" />
5108+
<ComponentRef Id="cmp86B6BE57BD32B926D472B8064DAE1EB5" />
5109+
<ComponentRef Id="cmpBFE50702869E7E4BC74489AACC090CC8" />
50145110
<ComponentRef Id="cmpD2516E302D41812368A84BD6010FB066" />
50155111
<ComponentRef Id="cmpD288F9671FEAE346EF3A1FAF2D98C7EC" />
50165112
<ComponentRef Id="cmp594709EB2E69BD7173BC8833BE2061B4" />
@@ -5836,6 +5932,7 @@
58365932
<ComponentRef Id="cmp70D1D6B3A151E5DA4EBA09BA3F9FAD5F" />
58375933
<ComponentRef Id="cmpAC5C284B13829839B2AD819221131DB0" />
58385934
<ComponentRef Id="cmpF7ADD37722F45985B5323202F35958F2" />
5935+
<ComponentRef Id="cmp9D64A1111722F25BC100121E73BE039E" />
58395936
<ComponentRef Id="cmpE52498FB0431A601DD9FDE6F082DF1D4" />
58405937
<ComponentRef Id="cmpFD1814D8F2D73854649A52268A2C2A83" />
58415938
<ComponentRef Id="cmp9DF26170AD3B0860AAFF291D39DD9FC5" />
@@ -5857,6 +5954,7 @@
58575954
<ComponentRef Id="cmpBFA5705441B7DF4264EFE1632A830DF1" />
58585955
<ComponentRef Id="cmpA7662EDC9DDCCFD0290DDB9350660A6B" />
58595956
<ComponentRef Id="cmp7F9F978DBE7D6715FA75FFB3BE40806E" />
5957+
<ComponentRef Id="cmp4AA539549D58FD2D5DD3C404556F3DBB" />
58605958
<ComponentRef Id="cmp348131C92750A7166DCA75757E409378" />
58615959
<ComponentRef Id="cmp289352966E5E4647DF24D7FFCEA4200F" />
58625960
<ComponentRef Id="cmpA497DCDAF4262858EF7BF8F3E4A03F30" />

‎src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,21 @@
166166
<Compile Include="Models\MemoryDataStore.cs" />
167167
<Compile Include="Models\XmlProfileSerializer.cs" />
168168
<Compile Include="Properties\AssemblyInfo.cs" />
169-
<Compile Include="Properties\Resources.Designer.cs" />
169+
<Compile Include="Properties\Resources.Designer.cs">
170+
<AutoGen>True</AutoGen>
171+
<DesignTime>True</DesignTime>
172+
<DependentUpon>Resources.resx</DependentUpon>
173+
</Compile>
170174
<Compile Include="Utilities\DictionaryExtensions.cs" />
171175
<Compile Include="Utilities\FileUtilities.cs" />
172176
<Compile Include="Utilities\JsonUtilities.cs" />
173177
<Compile Include="Utilities\XmlUtilities.cs" />
174178
</ItemGroup>
175179
<ItemGroup>
176-
<EmbeddedResource Include="Properties\Resources.resx" />
180+
<EmbeddedResource Include="Properties\Resources.resx">
181+
<Generator>PublicResXFileCodeGenerator</Generator>
182+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
183+
</EmbeddedResource>
177184
</ItemGroup>
178185
<ItemGroup>
179186
<None Include="packages.config" />

‎src/Common/Commands.Common.Authentication/Factories/AuthenticationFactory.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,24 @@ private AdalConfiguration GetAdalConfiguration(AzureEnvironment environment, str
287287
{
288288
throw new ArgumentNullException("environment");
289289
}
290+
290291
var adEndpoint = environment.Endpoints[AzureEnvironment.Endpoint.ActiveDirectory];
292+
if (string.IsNullOrWhiteSpace(adEndpoint))
293+
{
294+
throw new ArgumentOutOfRangeException("environment", string.Format("No Active Directory endpoint specified for environment '{0}'", environment.Name));
295+
}
296+
297+
var audience = environment.Endpoints[resourceId];
298+
if (string.IsNullOrWhiteSpace(audience))
299+
{
300+
string message = Resources.InvalidManagementTokenAudience;
301+
if (resourceId == AzureEnvironment.Endpoint.GraphEndpointResourceId)
302+
{
303+
message = Resources.InvalidGraphTokenAudience;
304+
}
305+
306+
throw new ArgumentOutOfRangeException("environment", string.Format(message, environment.Name));
307+
}
291308

292309
return new AdalConfiguration
293310
{

‎src/Common/Commands.Common.Authentication/Properties/Resources.Designer.cs

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Common/Commands.Common.Authentication/Properties/Resources.resx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,4 +300,10 @@
300300
<data name="UnsupportedCredentialType" xml:space="preserve">
301301
<value>Certificate authentication is not supported for account type {0}.</value>
302302
</data>
303+
<data name="InvalidGraphTokenAudience" xml:space="preserve">
304+
<value>No value was specified for the token audience for the graph endpoint in environment '{0}'. Please use Set-AzureRmEnvironment -Name {0} -GraphAudience token-audience-value</value>
305+
</data>
306+
<data name="InvalidManagementTokenAudience" xml:space="preserve">
307+
<value>No value was specified for the token audience for the management endpoint in environment '{0}'. Please use Set-AzureRmEnvironment -Name {0} -ActiveDirectoryServiceEndpointResourceId token-audience-value</value>
308+
</data>
303309
</root>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
<Reference Include="System.Xml" />
134134
</ItemGroup>
135135
<ItemGroup>
136+
<Compile Include="StringExtensions.cs" />
136137
<Compile Include="AzureDataCmdlet.cs" />
137138
<Compile Include="AzurePSCmdlet.cs" />
138139
<Compile Include="AzurePSDataCollectionProfile.cs" />

0 commit comments

Comments
 (0)