Skip to content

Commit 08cb6ab

Browse files
author
Radhika Kashyap
committed
Merge branch 'dev' of github.com:Azure/azure-powershell into GetRoleDefinitions
Conflicts: src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config src/ResourceManager/KeyVault/Commands.KeyVault/packages.config
2 parents 6a563b8 + 537ec69 commit 08cb6ab

34 files changed

+1879
-1758
lines changed

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@
6060
<SpecificVersion>False</SpecificVersion>
6161
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.26-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Microsoft.Azure.KeyVault, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.0.9.1-preview\lib\net45\Microsoft.Azure.KeyVault.dll</HintPath>
66-
</Reference>
6763
<Reference Include="Microsoft.Azure.Gallery, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6864
<SpecificVersion>False</SpecificVersion>
6965
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
@@ -75,9 +71,13 @@
7571
<SpecificVersion>False</SpecificVersion>
7672
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.1-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7773
</Reference>
78-
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
74+
<Reference Include="Microsoft.Azure.KeyVault, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<SpecificVersion>False</SpecificVersion>
76+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.1.0.0\lib\net45\Microsoft.Azure.KeyVault.dll</HintPath>
77+
</Reference>
78+
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7979
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.0.9.1-preview\lib\net40\Microsoft.Azure.Management.KeyVault.dll</HintPath>
80+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.1.0.0\lib\net40\Microsoft.Azure.Management.KeyVault.dll</HintPath>
8181
</Reference>
8282
<Reference Include="Microsoft.Azure.Common.NetFramework">
8383
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestCreateDeleteVaultWithPiping.json

Lines changed: 77 additions & 77 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestCreateNewPremiumVaultEnabledForDeployment.json

Lines changed: 44 additions & 44 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestCreateNewVault.json

Lines changed: 53 additions & 53 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestCreateVaultInUnknownResGrpFails.json

Lines changed: 35 additions & 35 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestCreateVaultPositionalParams.json

Lines changed: 44 additions & 44 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestDeleteUnknownVaultFails.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/subscriptions/86193581-bb76-44a9-9110-8cf6dbcbfea5/resources?$filter=resourceType%20eq%20'Microsoft.KeyVault%2Fvaults'&api-version=2014-04-01-preview",
5-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvODYxOTM1ODEtYmI3Ni00NGE5LTkxMTAtOGNmNmRiY2JmZWE1L3Jlc291cmNlcz8kZmlsdGVyPXJlc291cmNlVHlwZSUyMGVxJTIwJ01pY3Jvc29mdC5LZXlWYXVsdCUyRnZhdWx0cycmYXBpLXZlcnNpb249MjAxNC0wNC0wMS1wcmV2aWV3",
4+
"RequestUri": "/subscriptions/31bdf18e-b058-4d3a-838c-e123ac60bc43/resources?$filter=resourceType%20eq%20'Microsoft.KeyVault%2Fvaults'&api-version=2014-04-01-preview",
5+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMzFiZGYxOGUtYjA1OC00ZDNhLTgzOGMtZTEyM2FjNjBiYzQzL3Jlc291cmNlcz8kZmlsdGVyPXJlc291cmNlVHlwZSUyMGVxJTIwJ01pY3Jvc29mdC5LZXlWYXVsdCUyRnZhdWx0cycmYXBpLXZlcnNpb249MjAxNC0wNC0wMS1wcmV2aWV3",
66
"RequestMethod": "GET",
77
"RequestBody": "",
88
"RequestHeaders": {
99
"User-Agent": [
1010
"Microsoft.Azure.Management.Resources.ResourceManagementClient/2.0.0.0"
1111
]
1212
},
13-
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/86193581-bb76-44a9-9110-8cf6dbcbfea5/resourceGroups/pshtestrg2690/providers/Microsoft.KeyVault/vaults/onesdk1172\",\r\n \"name\": \"onesdk1172\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"northcentralus\",\r\n \"tags\": {}\r\n },\r\n {\r\n \"id\": \"/subscriptions/86193581-bb76-44a9-9110-8cf6dbcbfea5/resourceGroups/pshtestrg2690/providers/Microsoft.KeyVault/vaults/onesdk5000\",\r\n \"name\": \"onesdk5000\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"northcentralus\",\r\n \"tags\": {\r\n \"testtag\": \"testvalue\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/86193581-bb76-44a9-9110-8cf6dbcbfea5/resourceGroups/pshtestrg2690/providers/Microsoft.KeyVault/vaults/onesdk568\",\r\n \"name\": \"onesdk568\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"northcentralus\",\r\n \"tags\": {}\r\n },\r\n {\r\n \"id\": \"/subscriptions/86193581-bb76-44a9-9110-8cf6dbcbfea5/resourceGroups/pshtestrg2690/providers/Microsoft.KeyVault/vaults/pshtestvault2489\",\r\n \"name\": \"pshtestvault2489\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"northcentralus\",\r\n \"tags\": {}\r\n }\r\n ]\r\n}",
13+
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/31bdf18e-b058-4d3a-838c-e123ac60bc43/resourceGroups/DivyagResourceGroup1/providers/Microsoft.KeyVault/vaults/DivyaGVault1\",\r\n \"name\": \"DivyaGVault1\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"eastus\",\r\n \"tags\": {}\r\n },\r\n {\r\n \"id\": \"/subscriptions/31bdf18e-b058-4d3a-838c-e123ac60bc43/resourceGroups/divyagresourcegroup1/providers/Microsoft.KeyVault/vaults/pshvault7\",\r\n \"name\": \"pshvault7\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"eastus\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/31bdf18e-b058-4d3a-838c-e123ac60bc43/resourceGroups/DivyagResourceGroup2/providers/Microsoft.KeyVault/vaults/DivyaGVault2\",\r\n \"name\": \"DivyaGVault2\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"eastus\",\r\n \"tags\": {}\r\n },\r\n {\r\n \"id\": \"/subscriptions/31bdf18e-b058-4d3a-838c-e123ac60bc43/resourceGroups/pshexamplerg/providers/Microsoft.KeyVault/vaults/pshexamplevault\",\r\n \"name\": \"pshexamplevault\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"eastus\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/31bdf18e-b058-4d3a-838c-e123ac60bc43/resourceGroups/pshexamplerg/providers/Microsoft.KeyVault/vaults/pshexamplevault2\",\r\n \"name\": \"pshexamplevault2\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"eastus\",\r\n \"tags\": {\r\n \"owner\": \"divyag\",\r\n \"project\": \"powershell example\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/31bdf18e-b058-4d3a-838c-e123ac60bc43/resourceGroups/pshtestrg6355/providers/Microsoft.KeyVault/vaults/onesdk6382\",\r\n \"name\": \"onesdk6382\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"northcentralus\",\r\n \"tags\": {}\r\n },\r\n {\r\n \"id\": \"/subscriptions/31bdf18e-b058-4d3a-838c-e123ac60bc43/resourceGroups/pshtestrg6355/providers/Microsoft.KeyVault/vaults/pshtestvault4651\",\r\n \"name\": \"pshtestvault4651\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"northcentralus\",\r\n \"tags\": {}\r\n },\r\n {\r\n \"id\": \"/subscriptions/31bdf18e-b058-4d3a-838c-e123ac60bc43/resourceGroups/rg1/providers/Microsoft.KeyVault/vaults/dgtestdirvault1\",\r\n \"name\": \"dgtestdirvault1\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"eastus\",\r\n \"tags\": {}\r\n },\r\n {\r\n \"id\": \"/subscriptions/31bdf18e-b058-4d3a-838c-e123ac60bc43/resourceGroups/rg1/providers/Microsoft.KeyVault/vaults/testdirvault1\",\r\n \"name\": \"testdirvault1\",\r\n \"type\": \"Microsoft.KeyVault/vaults\",\r\n \"location\": \"eastus\",\r\n \"tags\": {}\r\n }\r\n ]\r\n}",
1414
"ResponseHeaders": {
1515
"Content-Length": [
16-
"962"
16+
"2107"
1717
],
1818
"Content-Type": [
1919
"application/json; charset=utf-8"
@@ -25,16 +25,16 @@
2525
"no-cache"
2626
],
2727
"x-ms-ratelimit-remaining-subscription-reads": [
28-
"14962"
28+
"14999"
2929
],
3030
"x-ms-request-id": [
31-
"6896b7a2-ed76-4230-b878-7b734c65777f"
31+
"6c1d5f57-2202-4110-9539-cf087bf7bf16"
3232
],
3333
"x-ms-correlation-request-id": [
34-
"6896b7a2-ed76-4230-b878-7b734c65777f"
34+
"6c1d5f57-2202-4110-9539-cf087bf7bf16"
3535
],
3636
"x-ms-routing-request-id": [
37-
"WESTUS:20150515T233949Z:6896b7a2-ed76-4230-b878-7b734c65777f"
37+
"WESTUS:20150616T173806Z:6c1d5f57-2202-4110-9539-cf087bf7bf16"
3838
],
3939
"Strict-Transport-Security": [
4040
"max-age=31536000; includeSubDomains"
@@ -43,24 +43,24 @@
4343
"no-cache"
4444
],
4545
"Date": [
46-
"Fri, 15 May 2015 23:39:49 GMT"
46+
"Tue, 16 Jun 2015 17:38:05 GMT"
4747
]
4848
},
4949
"StatusCode": 200
5050
}
5151
],
5252
"Names": {
5353
"Test-DeleteUnknownVaultFails": [
54-
"onesdk9376"
54+
"onesdk2190"
5555
]
5656
},
5757
"Variables": {
58-
"ResourceGroupName": "pshtestrg2690",
58+
"ResourceGroupName": "pshtestrg6355",
5959
"Location": "northcentralus",
60-
"PreCreatedVault": "pshtestvault2489",
61-
"SubscriptionId": "86193581-bb76-44a9-9110-8cf6dbcbfea5",
62-
"TenantId": "71ecaf6c-7521-4953-ba5f-e55c260af004",
63-
"Domain": "yuhuizhotmail.onmicrosoft.com",
64-
"User": "kvtest@yuhuizhotmail.onmicrosoft.com"
60+
"PreCreatedVault": "pshtestvault4651",
61+
"SubscriptionId": "31bdf18e-b058-4d3a-838c-e123ac60bc43",
62+
"TenantId": "8448c020-6abd-43d5-8ebc-410f7b59ffa9",
63+
"Domain": "keyvaultsdktestdg.onmicrosoft.com",
64+
"User": "keyvaultsdktester1@keyvaultsdktestdg.onmicrosoft.com"
6565
}
6666
}

0 commit comments

Comments
 (0)