Skip to content

Commit c591214

Browse files
Tiano2017Tiano2017
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into tiano-d2
2 parents b48adc2 + c92a051 commit c591214

File tree

111 files changed

+23022
-406
lines changed

Some content is hidden

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

111 files changed

+23022
-406
lines changed

‎AzurePowershell.Test.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@
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"/>
89+
<XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
90+
<XUnitTests Include=".\src\ResourceManager\CognitiveServices\CognitiveServices.Test\bin\Debug\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"/>
9091
<XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
9192
<XUnitTests Include="@(AsmXUnitTests)"/>
9293
</ItemGroup>

‎setup/azurecmdfiles.wxi

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,74 @@
573573
<File Id="filE46225E75692ACB5643F609EC0A0CA27" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Newtonsoft.Json.dll" />
574574
</Component>
575575
</Directory>
576+
<Directory Id="dirF44F362DF1071628A1DA11B575C80698" Name="AzureRM.CognitiveServices">
577+
<Component Id="cmpE522F5AF2198DE4458E754D72B17014C" Guid="*">
578+
<File Id="fil92CF3372E11946130363E614072D1997" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\AzureRM.CognitiveServices.psd1" />
579+
</Component>
580+
<Component Id="cmpBC6F53829FE44C084F26985EC2C1F363" Guid="*">
581+
<File Id="filF7E4FFD424BE3E3A5D3553B3B64C6A07" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Hyak.Common.dll" />
582+
</Component>
583+
<Component Id="cmp211CA4BBFFBC2B76FBDDE3A1D7EB978D" Guid="*">
584+
<File Id="filC738E5A17FE43D3B34373ABFEA7D2257" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.ApplicationInsights.dll" />
585+
</Component>
586+
<Component Id="cmpAB0497B72BD9C70172F9A5608B4D4C42" Guid="*">
587+
<File Id="fil08C10DC9B4DE514F1CB163074C853BCF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.Common.Authentication.dll" />
588+
</Component>
589+
<Component Id="cmp3AE6D8C2714804C35D4B013AEB4EC39B" Guid="*">
590+
<File Id="fil7BA91D4D0436172D383800C0533ECC57" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.Management.CognitiveServices.dll" />
591+
</Component>
592+
<Component Id="cmp5DDA2C54A743B0EFEF7F6CBDDF4213F7" Guid="*">
593+
<File Id="fil863D98027AD7CAC6E27D3462144F90C5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.Management.CognitiveServices.dll-Help.xml" />
594+
</Component>
595+
<Component Id="cmp56ACFA75119D58D21D6964EB62348C4B" Guid="*">
596+
<File Id="fil9D96C4594ABEEFA90D54AAE557E6D722" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
597+
</Component>
598+
<Component Id="cmp7BBCDAFE6966D2A36C3FB05CC90A9FE0" Guid="*">
599+
<File Id="fil61F57B61B8E51BE220E642F71C55B6D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Common.dll" />
600+
</Component>
601+
<Component Id="cmpC9A8DE5E47D2B1D89BB804E4FFCE416B" Guid="*">
602+
<File Id="fil7B859483FEB0627FD4926287DB855009" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Common.NetFramework.dll" />
603+
</Component>
604+
<Component Id="cmp662261A272390D74C6239ACEC0BB4332" Guid="*">
605+
<File Id="fil443221C3E400D30141765C13AE2FB566" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Management.CognitiveServices.dll" />
606+
</Component>
607+
<Component Id="cmpB309A169665AB10BD9FAAB9CBF886624" Guid="*">
608+
<File Id="fil15857097CFC8CD308FE2D6591A9277CF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
609+
</Component>
610+
<Component Id="cmpC80EE8D06B66E9F3CD85EBC3A10B5493" Guid="*">
611+
<File Id="fil4862255DF3C5211E7256211A38B7720B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
612+
</Component>
613+
<Component Id="cmp4A001BF4111E6A14BA06EFFA57721AF8" Guid="*">
614+
<File Id="fil2B2DE7A7D7599D1A7DAFCF1DDC6624EE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
615+
</Component>
616+
<Component Id="cmp9C4EF169DF708C9160CCE8A85381C0F2" Guid="*">
617+
<File Id="fil94F786A5D5E5D0077819178408137CED" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Rest.ClientRuntime.Azure.dll" />
618+
</Component>
619+
<Component Id="cmp90CA956B6201BC401242CC2E4987FAB4" Guid="*">
620+
<File Id="filDD52D586F7B50293F94BC5FC92B97E80" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Rest.ClientRuntime.dll" />
621+
</Component>
622+
<Component Id="cmpBC33B6EC7A6FA729B93B7E14E192CC00" Guid="*">
623+
<File Id="filC4CDB81C3DF37B168AB26E1084E428EA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Threading.Tasks.dll" />
624+
</Component>
625+
<Component Id="cmp3D58B962D34D7710C927C7EE5254A217" Guid="*">
626+
<File Id="filC078194E794054BC5F95E4D2B3F25DD5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
627+
</Component>
628+
<Component Id="cmp7124CC32DA120E499C7DEF72B8D2F1B7" Guid="*">
629+
<File Id="fil7AC6BC928AB4233A456406A5E8AB93F2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Threading.Tasks.Extensions.dll" />
630+
</Component>
631+
<Component Id="cmp173DB5569693331DDD906A1533C348B5" Guid="*">
632+
<File Id="filFEF8AE0562121D7C712692B0F8853B57" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.WindowsAzure.Commands.Common.dll" />
633+
</Component>
634+
<Component Id="cmp1FF62694705D7532FA50D0C4FDB38146" Guid="*">
635+
<File Id="filE7BF2C990FC70A7D19AE35DC68AB64CF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Newtonsoft.Json.dll" />
636+
</Component>
637+
<Component Id="cmp3D82D19F427B152BB3BB2BAD217958C2" Guid="*">
638+
<File Id="filE1912088D484A5582D6DC13AE9E8D207" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\System.Net.Http.Extensions.dll" />
639+
</Component>
640+
<Component Id="cmpFDA0979F65585F21A39465A3177C778A" Guid="*">
641+
<File Id="filC3C2E5FE1D173E3712F1404429786B8F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\System.Net.Http.Primitives.dll" />
642+
</Component>
643+
</Directory>
576644
<Directory Id="dir470D08462380F56397F9D0288EEA2E52" Name="AzureRM.Compute">
577645
<Component Id="cmpD2516E302D41812368A84BD6010FB066" Guid="*">
578646
<File Id="filEBA6A8A31DD00604D785E38F8379CCC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AutoMapper.dll" />
@@ -5536,6 +5604,28 @@
55365604
<ComponentRef Id="cmp6519C0CCA1A55C0C4F71A2D84CB100DA" />
55375605
<ComponentRef Id="cmp86B6BE57BD32B926D472B8064DAE1EB5" />
55385606
<ComponentRef Id="cmpBFE50702869E7E4BC74489AACC090CC8" />
5607+
<ComponentRef Id="cmpE522F5AF2198DE4458E754D72B17014C" />
5608+
<ComponentRef Id="cmpBC6F53829FE44C084F26985EC2C1F363" />
5609+
<ComponentRef Id="cmp211CA4BBFFBC2B76FBDDE3A1D7EB978D" />
5610+
<ComponentRef Id="cmpAB0497B72BD9C70172F9A5608B4D4C42" />
5611+
<ComponentRef Id="cmp3AE6D8C2714804C35D4B013AEB4EC39B" />
5612+
<ComponentRef Id="cmp5DDA2C54A743B0EFEF7F6CBDDF4213F7" />
5613+
<ComponentRef Id="cmp56ACFA75119D58D21D6964EB62348C4B" />
5614+
<ComponentRef Id="cmp7BBCDAFE6966D2A36C3FB05CC90A9FE0" />
5615+
<ComponentRef Id="cmpC9A8DE5E47D2B1D89BB804E4FFCE416B" />
5616+
<ComponentRef Id="cmp662261A272390D74C6239ACEC0BB4332" />
5617+
<ComponentRef Id="cmpB309A169665AB10BD9FAAB9CBF886624" />
5618+
<ComponentRef Id="cmpC80EE8D06B66E9F3CD85EBC3A10B5493" />
5619+
<ComponentRef Id="cmp4A001BF4111E6A14BA06EFFA57721AF8" />
5620+
<ComponentRef Id="cmp9C4EF169DF708C9160CCE8A85381C0F2" />
5621+
<ComponentRef Id="cmp90CA956B6201BC401242CC2E4987FAB4" />
5622+
<ComponentRef Id="cmpBC33B6EC7A6FA729B93B7E14E192CC00" />
5623+
<ComponentRef Id="cmp3D58B962D34D7710C927C7EE5254A217" />
5624+
<ComponentRef Id="cmp7124CC32DA120E499C7DEF72B8D2F1B7" />
5625+
<ComponentRef Id="cmp173DB5569693331DDD906A1533C348B5" />
5626+
<ComponentRef Id="cmp1FF62694705D7532FA50D0C4FDB38146" />
5627+
<ComponentRef Id="cmp3D82D19F427B152BB3BB2BAD217958C2" />
5628+
<ComponentRef Id="cmpFDA0979F65585F21A39465A3177C778A" />
55395629
<ComponentRef Id="cmpD2516E302D41812368A84BD6010FB066" />
55405630
<ComponentRef Id="cmpD288F9671FEAE346EF3A1FAF2D98C7EC" />
55415631
<ComponentRef Id="cmp594709EB2E69BD7173BC8833BE2061B4" />

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupVaultTests/AzureBackupVaultScenarioTests.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@
495495
"RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/certificates/IdMgmtInternalCert?api-version=2015-03-15",
496496
"EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NlcnRpZmljYXRlcy9JZE1nbXRJbnRlcm5hbENlcnQ/YXBpLXZlcnNpb249MjAxNS0wMy0xNQ==",
497497
"RequestMethod": "PUT",
498+
//[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
498499
"RequestBody": "{\r\n \"properties\": {\r\n \"certificate\": \"MIIC3TCCAcWgAwIBAgIQHIbfGvFylpdMv1odbf2pAzANBgkqhkiG9w0BAQUFADAeMRwwGgYDVQQDExNXaW5kb3dzIEF6dXJlIFRvb2xzMB4XDTE1MDgxNjE5MDYxNVoXDTE1MDgxODE5MTYxNVowHjEcMBoGA1UEAxMTV2luZG93cyBBenVyZSBUb29sczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvTUfRMRX4SHXTdAARMy94ZamGNvxNAyillUp4t/zaH4Ug0T8Hs3ahdhS/CLCdrocZwrOqcTwVslPHJNW3IN6/GEsYT+j8JjnHj78G4XEiTAah3hHczXRVfNF2tXYC2StuQ/8OnTA42kcArqBhKmS5oifbpxD0OVmWejwNf3NFf3/RJDWTOH8/6ifwCUA1zkKWjnEtM0w4T7iQGPc+1Os6N6ZAVfdjV++fcL2q+T/nMnwGpofkgtie1YKaqfwTdi57G2HCuU3nWfUg7/y+w0CL5mTkQMzyBz178Qcvb2CaBTmtPkUCbT3ixi2YiFX4p0To3OGzK4MYUWrBeQxNnqtMCAwEAAaMXMBUwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQEFBQADggEBALgUyJginWRLWq1gDsz8xp7Zps9SXNeFB94JKy9Qtz5Cr+KgrA0xvhcUAjXxHCnjsvrb6PHSFz5iT9CUrkFEO97sVDyRXOArUlAK5/tFUn6AAPkRSCI/RlhrNUHp/vKK+BgL6R694dJLc1kUbW/haULofDb+Fbh0+4M95EcNwqfvhuWf1nbr58icFEzkTuvHUH+QvmnC2kSyrC58OGShe+VwFyjAHCmPUEVSCWHKxi7v+NFktx/WDOYbeQjZn4K+UR5VmwYf95jArkZZZIUAf+zhRH52o3NZRcISp4H6ybFqp60wujqzzIUSosOm8jWLBaL0gt9HiWzANjTQicO/9Wc=\"\r\n }\r\n}",
499500
"RequestHeaders": {
500501
"Content-Type": [
@@ -513,6 +514,7 @@
513514
"Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
514515
]
515516
},
517+
//[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
516518
"ResponseBody": "{\r\n \"properties\": {\r\n \"certificate\": \"MIIC3TCCAcWgAwIBAgIQHIbfGvFylpdMv1odbf2pAzANBgkqhkiG9w0BAQUFADAeMRwwGgYDVQQDExNXaW5kb3dzIEF6dXJlIFRvb2xzMB4XDTE1MDgxNjE5MDYxNVoXDTE1MDgxODE5MTYxNVowHjEcMBoGA1UEAxMTV2luZG93cyBBenVyZSBUb29sczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvTUfRMRX4SHXTdAARMy94ZamGNvxNAyillUp4t/zaH4Ug0T8Hs3ahdhS/CLCdrocZwrOqcTwVslPHJNW3IN6/GEsYT+j8JjnHj78G4XEiTAah3hHczXRVfNF2tXYC2StuQ/8OnTA42kcArqBhKmS5oifbpxD0OVmWejwNf3NFf3/RJDWTOH8/6ifwCUA1zkKWjnEtM0w4T7iQGPc+1Os6N6ZAVfdjV++fcL2q+T/nMnwGpofkgtie1YKaqfwTdi57G2HCuU3nWfUg7/y+w0CL5mTkQMzyBz178Qcvb2CaBTmtPkUCbT3ixi2YiFX4p0To3OGzK4MYUWrBeQxNnqtMCAwEAAaMXMBUwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQEFBQADggEBALgUyJginWRLWq1gDsz8xp7Zps9SXNeFB94JKy9Qtz5Cr+KgrA0xvhcUAjXxHCnjsvrb6PHSFz5iT9CUrkFEO97sVDyRXOArUlAK5/tFUn6AAPkRSCI/RlhrNUHp/vKK+BgL6R694dJLc1kUbW/haULofDb+Fbh0+4M95EcNwqfvhuWf1nbr58icFEzkTuvHUH+QvmnC2kSyrC58OGShe+VwFyjAHCmPUEVSCWHKxi7v+NFktx/WDOYbeQjZn4K+UR5VmwYf95jArkZZZIUAf+zhRH52o3NZRcISp4H6ybFqp60wujqzzIUSosOm8jWLBaL0gt9HiWzANjTQicO/9Wc=\",\r\n \"resourceId\": 768844042967475437,\r\n \"globalAcsNamespace\": \"seabvtiaasrrp1users\",\r\n \"globalAcsHostName\": \"accesscontrol.windows.net\",\r\n \"globalAcsRPRealm\": \"http://windowscloudbackup/m3\",\r\n \"subject\": \"CN=Windows Azure Tools\",\r\n \"validFrom\": \"2015-08-17T00:36:15+05:30\",\r\n \"validTo\": \"2015-08-19T00:46:15+05:30\",\r\n \"thumbprint\": \"133E5FE93E6153F060B365F883BB7881724B9385\",\r\n \"friendlyName\": \"\",\r\n \"issuer\": \"CN=Windows Azure Tools\"\r\n }\r\n}",
517519
"ResponseHeaders": {
518520
"Content-Length": [

0 commit comments

Comments
 (0)