Skip to content

HPF PR: dev <- Azure:dev #548

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.

Sign up for GitHub

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 22 commits into from
Jun 8, 2016
Merged

HPF PR: dev <- Azure:dev #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3fbcdc1
Allow updating BGP settings in vnet/local gateways
lamchester May 19, 2016
51df4fa
Prevent unhandled exception if EnableBgp is not specified (issue #2280)
lamchester May 19, 2016
771234e
Add test for SetVirtualNetworkGateway
lamchester May 23, 2016
073e054
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
lamchester May 25, 2016
b50872a
Add AddNewVnetGatewayIpConfigBase
DeepakRajendranMsft May 28, 2016
34099d6
fix vnetgateway test
DeepakRajendranMsft May 28, 2016
732f804
Recored TestVirtualNetworkGateway
lamchester May 28, 2016
d0332c1
Change ADAL prompt behavior to Never
seanbamsft Apr 12, 2016
ba596e8
Get ADAL token cache from AzureContext
seanbamsft Jun 2, 2016
b0ca7ac
Introducing Cognitive Services Resource Management to Azure SDK
daniel-ms Jun 2, 2016
7d91452
Record data for SetVirtualNetworkGateway test
lamchester Jun 2, 2016
9fdea88
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
lamchester Jun 2, 2016
79ee489
Add test coverage for Set-AzureRmLocalNetworkGateway
lamchester Jun 3, 2016
634ac71
Update Module Version and sync with DLL version
daniel-ms Jun 3, 2016
98a8774
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
daniel-ms Jun 3, 2016
de392b8
Added exceptions after running scan tool
kirthik Jun 6, 2016
01d9ba7
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
lamchester Jun 6, 2016
e690dd6
Update help for Set-AzureRmVirtualNetworkGateway
lamchester Jun 7, 2016
fd6ca08
Merge pull request #2382 from seanbamsft/authfix
Jun 7, 2016
7a23b38
Merge pull request #2383 from lamchester/dev
Jun 7, 2016
c179165
Merge pull request #2379 from daniel-ms/dev
Jun 7, 2016
f407f0f
Merge pull request #2409 from kirthik/dev
Jun 7, 2016
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
3 changes: 2 additions & 1 deletion AzurePowershell.Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@
<XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
<XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
<XUnitTests Include=".\src\ResourceManager\CognitiveServices\CognitiveServices.Test\bin\Debug\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"/>
<XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
<XUnitTests Include="@(AsmXUnitTests)"/>
</ItemGroup>
Expand Down
90 changes: 90 additions & 0 deletions setup/azurecmdfiles.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,74 @@
<File Id="filE46225E75692ACB5643F609EC0A0CA27" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Cdn\Newtonsoft.Json.dll" />
</Component>
</Directory>
<Directory Id="dirF44F362DF1071628A1DA11B575C80698" Name="AzureRM.CognitiveServices">
<Component Id="cmpE522F5AF2198DE4458E754D72B17014C" Guid="*">
<File Id="fil92CF3372E11946130363E614072D1997" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\AzureRM.CognitiveServices.psd1" />
</Component>
<Component Id="cmpBC6F53829FE44C084F26985EC2C1F363" Guid="*">
<File Id="filF7E4FFD424BE3E3A5D3553B3B64C6A07" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Hyak.Common.dll" />
</Component>
<Component Id="cmp211CA4BBFFBC2B76FBDDE3A1D7EB978D" Guid="*">
<File Id="filC738E5A17FE43D3B34373ABFEA7D2257" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.ApplicationInsights.dll" />
</Component>
<Component Id="cmpAB0497B72BD9C70172F9A5608B4D4C42" Guid="*">
<File Id="fil08C10DC9B4DE514F1CB163074C853BCF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.Common.Authentication.dll" />
</Component>
<Component Id="cmp3AE6D8C2714804C35D4B013AEB4EC39B" Guid="*">
<File Id="fil7BA91D4D0436172D383800C0533ECC57" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.Management.CognitiveServices.dll" />
</Component>
<Component Id="cmp5DDA2C54A743B0EFEF7F6CBDDF4213F7" Guid="*">
<File Id="fil863D98027AD7CAC6E27D3462144F90C5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.Management.CognitiveServices.dll-Help.xml" />
</Component>
<Component Id="cmp56ACFA75119D58D21D6964EB62348C4B" Guid="*">
<File Id="fil9D96C4594ABEEFA90D54AAE557E6D722" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
</Component>
<Component Id="cmp7BBCDAFE6966D2A36C3FB05CC90A9FE0" Guid="*">
<File Id="fil61F57B61B8E51BE220E642F71C55B6D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Common.dll" />
</Component>
<Component Id="cmpC9A8DE5E47D2B1D89BB804E4FFCE416B" Guid="*">
<File Id="fil7B859483FEB0627FD4926287DB855009" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Common.NetFramework.dll" />
</Component>
<Component Id="cmp662261A272390D74C6239ACEC0BB4332" Guid="*">
<File Id="fil443221C3E400D30141765C13AE2FB566" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Azure.Management.CognitiveServices.dll" />
</Component>
<Component Id="cmpB309A169665AB10BD9FAAB9CBF886624" Guid="*">
<File Id="fil15857097CFC8CD308FE2D6591A9277CF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
</Component>
<Component Id="cmpC80EE8D06B66E9F3CD85EBC3A10B5493" Guid="*">
<File Id="fil4862255DF3C5211E7256211A38B7720B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
</Component>
<Component Id="cmp4A001BF4111E6A14BA06EFFA57721AF8" Guid="*">
<File Id="fil2B2DE7A7D7599D1A7DAFCF1DDC6624EE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
</Component>
<Component Id="cmp9C4EF169DF708C9160CCE8A85381C0F2" Guid="*">
<File Id="fil94F786A5D5E5D0077819178408137CED" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Rest.ClientRuntime.Azure.dll" />
</Component>
<Component Id="cmp90CA956B6201BC401242CC2E4987FAB4" Guid="*">
<File Id="filDD52D586F7B50293F94BC5FC92B97E80" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Rest.ClientRuntime.dll" />
</Component>
<Component Id="cmpBC33B6EC7A6FA729B93B7E14E192CC00" Guid="*">
<File Id="filC4CDB81C3DF37B168AB26E1084E428EA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Threading.Tasks.dll" />
</Component>
<Component Id="cmp3D58B962D34D7710C927C7EE5254A217" Guid="*">
<File Id="filC078194E794054BC5F95E4D2B3F25DD5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
</Component>
<Component Id="cmp7124CC32DA120E499C7DEF72B8D2F1B7" Guid="*">
<File Id="fil7AC6BC928AB4233A456406A5E8AB93F2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.Threading.Tasks.Extensions.dll" />
</Component>
<Component Id="cmp173DB5569693331DDD906A1533C348B5" Guid="*">
<File Id="filFEF8AE0562121D7C712692B0F8853B57" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Microsoft.WindowsAzure.Commands.Common.dll" />
</Component>
<Component Id="cmp1FF62694705D7532FA50D0C4FDB38146" Guid="*">
<File Id="filE7BF2C990FC70A7D19AE35DC68AB64CF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\Newtonsoft.Json.dll" />
</Component>
<Component Id="cmp3D82D19F427B152BB3BB2BAD217958C2" Guid="*">
<File Id="filE1912088D484A5582D6DC13AE9E8D207" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\System.Net.Http.Extensions.dll" />
</Component>
<Component Id="cmpFDA0979F65585F21A39465A3177C778A" Guid="*">
<File Id="filC3C2E5FE1D173E3712F1404429786B8F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.CognitiveServices\System.Net.Http.Primitives.dll" />
</Component>
</Directory>
<Directory Id="dir470D08462380F56397F9D0288EEA2E52" Name="AzureRM.Compute">
<Component Id="cmpD2516E302D41812368A84BD6010FB066" Guid="*">
<File Id="filEBA6A8A31DD00604D785E38F8379CCC0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AutoMapper.dll" />
Expand Down Expand Up @@ -5536,6 +5604,28 @@
<ComponentRef Id="cmp6519C0CCA1A55C0C4F71A2D84CB100DA" />
<ComponentRef Id="cmp86B6BE57BD32B926D472B8064DAE1EB5" />
<ComponentRef Id="cmpBFE50702869E7E4BC74489AACC090CC8" />
<ComponentRef Id="cmpE522F5AF2198DE4458E754D72B17014C" />
<ComponentRef Id="cmpBC6F53829FE44C084F26985EC2C1F363" />
<ComponentRef Id="cmp211CA4BBFFBC2B76FBDDE3A1D7EB978D" />
<ComponentRef Id="cmpAB0497B72BD9C70172F9A5608B4D4C42" />
<ComponentRef Id="cmp3AE6D8C2714804C35D4B013AEB4EC39B" />
<ComponentRef Id="cmp5DDA2C54A743B0EFEF7F6CBDDF4213F7" />
<ComponentRef Id="cmp56ACFA75119D58D21D6964EB62348C4B" />
<ComponentRef Id="cmp7BBCDAFE6966D2A36C3FB05CC90A9FE0" />
<ComponentRef Id="cmpC9A8DE5E47D2B1D89BB804E4FFCE416B" />
<ComponentRef Id="cmp662261A272390D74C6239ACEC0BB4332" />
<ComponentRef Id="cmpB309A169665AB10BD9FAAB9CBF886624" />
<ComponentRef Id="cmpC80EE8D06B66E9F3CD85EBC3A10B5493" />
<ComponentRef Id="cmp4A001BF4111E6A14BA06EFFA57721AF8" />
<ComponentRef Id="cmp9C4EF169DF708C9160CCE8A85381C0F2" />
<ComponentRef Id="cmp90CA956B6201BC401242CC2E4987FAB4" />
<ComponentRef Id="cmpBC33B6EC7A6FA729B93B7E14E192CC00" />
<ComponentRef Id="cmp3D58B962D34D7710C927C7EE5254A217" />
<ComponentRef Id="cmp7124CC32DA120E499C7DEF72B8D2F1B7" />
<ComponentRef Id="cmp173DB5569693331DDD906A1533C348B5" />
<ComponentRef Id="cmp1FF62694705D7532FA50D0C4FDB38146" />
<ComponentRef Id="cmp3D82D19F427B152BB3BB2BAD217958C2" />
<ComponentRef Id="cmpFDA0979F65585F21A39465A3177C778A" />
<ComponentRef Id="cmpD2516E302D41812368A84BD6010FB066" />
<ComponentRef Id="cmpD288F9671FEAE346EF3A1FAF2D98C7EC" />
<ComponentRef Id="cmp594709EB2E69BD7173BC8833BE2061B4" />
Expand Down
2 changes: 2 additions & 0 deletions ...s.AzureBackup.Test.ScenarioTests.AzureBackupVaultTests/AzureBackupVaultScenarioTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@
"RequestUri": "/Subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/certificates/IdMgmtInternalCert?api-version=2015-03-15",
"EncodedRequestUri": "L1N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL2NlcnRpZmljYXRlcy9JZE1nbXRJbnRlcm5hbENlcnQ/YXBpLXZlcnNpb249MjAxNS0wMy0xNQ==",
"RequestMethod": "PUT",
//[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
"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}",
"RequestHeaders": {
"Content-Type": [
Expand All @@ -513,6 +514,7 @@
"Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
]
},
//[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine")]
"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}",
"ResponseHeaders": {
"Content-Length": [
Expand Down
Loading