Skip to content

Commit 5e0b761

Browse files
cormacpaynecormacpayne
authored
Merge pull request #4402 from Azure/Update-AuthorizationPackage-second
Update authorization package to 2.5.0-preview
2 parents 7342590 + 2927c85 commit 5e0b761

File tree

12 files changed

+1628
-253
lines changed

12 files changed

+1628
-253
lines changed

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Commands.ScenarioTests.ResourceManager.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
7474
</Reference>
7575
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
76+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
7777
<Private>True</Private>
7878
</Reference>
7979
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
1212
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1313
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
14-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net45" />
14+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
1515
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net45" />
1616
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.9-preview" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@
6767
<Reference Include="Microsoft.Azure.KeyVault.Core">
6868
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
6969
</Reference>
70-
<Reference Include="Microsoft.Azure.Management.Authorization">
71-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
72-
</Reference>
7370
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7471
<SpecificVersion>False</SpecificVersion>
7572
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
@@ -106,8 +103,7 @@
106103
<Private>True</Private>
107104
</Reference>
108105
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
110-
<Private>True</Private>
106+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
111107
</Reference>
112108
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113109
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.5\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>

‎src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public void RaUserPermissions()
219219

220220
if (resourceGroup != null)
221221
{
222-
controllerAdmin.AuthorizationManagementClient.RoleAssignments.Delete(resourceGroup.Id, new Guid(roleAssignmentId).ToString());
222+
controllerAdmin.AuthorizationManagementClient.RoleAssignments.Delete(resourceGroup.Id, roleAssignmentId).ToString();
223223
}
224224
},
225225
TestUtilities.GetCallingClass(),

‎src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceTests/TestGetResourceWithCollection.json

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

‎src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.RoleDefinitionTests/RdNegativeScenarios.json

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,17 @@
66
"RequestMethod": "GET",
77
"RequestBody": "",
88
"RequestHeaders": {
9+
"x-ms-client-request-id": [
10+
"b0472bec-4e43-4ff2-899a-2649470ea8c1"
11+
],
12+
"accept-language": [
13+
"en-US"
14+
],
915
"User-Agent": [
10-
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/2.0.0.0"
16+
"FxVersion/4.7.2101.1",
17+
"OSName/Windows10Enterprise",
18+
"OSVersion/6.3.15063",
19+
"Microsoft.Azure.Management.Authorization.Version2015_07_01.AuthorizationManagementClient/1.0.0.0"
1120
]
1221
},
1322
"ResponseBody": "{\r\n \"value\": []\r\n}",
@@ -25,7 +34,7 @@
2534
"no-cache"
2635
],
2736
"x-ms-request-id": [
28-
"0a4a0249-b0f5-4115-bda7-19cbf472e4e5"
37+
"07fe39ca-83a2-4778-9e11-a8ef418c10c0"
2938
],
3039
"X-Content-Type-Options": [
3140
"nosniff"
@@ -34,19 +43,19 @@
3443
"max-age=31536000; includeSubDomains"
3544
],
3645
"x-ms-ratelimit-remaining-subscription-reads": [
37-
"14999"
46+
"14995"
3847
],
3948
"x-ms-correlation-request-id": [
40-
"6622f6a3-d32b-4a59-904d-efeb3275c5f4"
49+
"df6e2219-4aa3-4193-b1c6-7f3b09d157ef"
4150
],
4251
"x-ms-routing-request-id": [
43-
"WESTUS:20170726T000622Z:6622f6a3-d32b-4a59-904d-efeb3275c5f4"
52+
"SOUTHEASTASIA:20170804T065019Z:df6e2219-4aa3-4193-b1c6-7f3b09d157ef"
4453
],
4554
"Cache-Control": [
4655
"no-cache"
4756
],
4857
"Date": [
49-
"Wed, 26 Jul 2017 00:06:21 GMT"
58+
"Fri, 04 Aug 2017 06:50:19 GMT"
5059
],
5160
"Set-Cookie": [
5261
"x-ms-gateway-slice=productionb; path=/; secure; HttpOnly"
@@ -66,8 +75,17 @@
6675
"RequestMethod": "GET",
6776
"RequestBody": "",
6877
"RequestHeaders": {
78+
"x-ms-client-request-id": [
79+
"61edcf4b-3f83-4cc5-b69c-d8d2b70f4ff0"
80+
],
81+
"accept-language": [
82+
"en-US"
83+
],
6984
"User-Agent": [
70-
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/2.0.0.0"
85+
"FxVersion/4.7.2101.1",
86+
"OSName/Windows10Enterprise",
87+
"OSVersion/6.3.15063",
88+
"Microsoft.Azure.Management.Authorization.Version2015_07_01.AuthorizationManagementClient/1.0.0.0"
7189
]
7290
},
7391
"ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"RoleDefinitionDoesNotExist\",\r\n \"message\": \"The specified role definition with ID '85e460b3-89e9-48ba-9dcd-a8a99d64a674' does not exist.\"\r\n }\r\n}",
@@ -85,7 +103,7 @@
85103
"no-cache"
86104
],
87105
"x-ms-request-id": [
88-
"166c7b49-2e68-4b07-bd5e-af1ff9d9b5a5"
106+
"fa34cc62-e8b9-40ee-85b9-a70f025ad33a"
89107
],
90108
"X-Content-Type-Options": [
91109
"nosniff"
@@ -94,19 +112,19 @@
94112
"max-age=31536000; includeSubDomains"
95113
],
96114
"x-ms-ratelimit-remaining-subscription-reads": [
97-
"14998"
115+
"14994"
98116
],
99117
"x-ms-correlation-request-id": [
100-
"3f8d3219-7b00-49c4-a616-dff19cd0a1aa"
118+
"71ec29c5-3a49-4329-9527-063e0575e1bc"
101119
],
102120
"x-ms-routing-request-id": [
103-
"WESTUS:20170726T000623Z:3f8d3219-7b00-49c4-a616-dff19cd0a1aa"
121+
"SOUTHEASTASIA:20170804T065020Z:71ec29c5-3a49-4329-9527-063e0575e1bc"
104122
],
105123
"Cache-Control": [
106124
"no-cache"
107125
],
108126
"Date": [
109-
"Wed, 26 Jul 2017 00:06:22 GMT"
127+
"Fri, 04 Aug 2017 06:50:19 GMT"
110128
],
111129
"Set-Cookie": [
112130
"x-ms-gateway-slice=productionb; path=/; secure; HttpOnly"
@@ -126,8 +144,17 @@
126144
"RequestMethod": "GET",
127145
"RequestBody": "",
128146
"RequestHeaders": {
147+
"x-ms-client-request-id": [
148+
"2d17d214-3ddd-4d27-a44c-92c681d9a876"
149+
],
150+
"accept-language": [
151+
"en-US"
152+
],
129153
"User-Agent": [
130-
"Microsoft.Azure.Management.Authorization.AuthorizationManagementClient/2.0.0.0"
154+
"FxVersion/4.7.2101.1",
155+
"OSName/Windows10Enterprise",
156+
"OSVersion/6.3.15063",
157+
"Microsoft.Azure.Management.Authorization.Version2015_07_01.AuthorizationManagementClient/1.0.0.0"
131158
]
132159
},
133160
"ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"RoleDefinitionDoesNotExist\",\r\n \"message\": \"The specified role definition with ID '85e460b3-89e9-48ba-9dcd-a8a99d64a674' does not exist.\"\r\n }\r\n}",
@@ -145,7 +172,7 @@
145172
"no-cache"
146173
],
147174
"x-ms-request-id": [
148-
"f6ee36e6-67c1-424b-b419-83a553b1ca31"
175+
"4e2af146-8de4-461e-b7f4-376793e13922"
149176
],
150177
"X-Content-Type-Options": [
151178
"nosniff"
@@ -154,19 +181,19 @@
154181
"max-age=31536000; includeSubDomains"
155182
],
156183
"x-ms-ratelimit-remaining-subscription-reads": [
157-
"14997"
184+
"14993"
158185
],
159186
"x-ms-correlation-request-id": [
160-
"82d93576-ad9f-4e0a-82e8-8788b25a15ee"
187+
"ce43af75-e832-4146-84b8-c7318a6480eb"
161188
],
162189
"x-ms-routing-request-id": [
163-
"WESTUS:20170726T000623Z:82d93576-ad9f-4e0a-82e8-8788b25a15ee"
190+
"SOUTHEASTASIA:20170804T065020Z:ce43af75-e832-4146-84b8-c7318a6480eb"
164191
],
165192
"Cache-Control": [
166193
"no-cache"
167194
],
168195
"Date": [
169-
"Wed, 26 Jul 2017 00:06:22 GMT"
196+
"Fri, 04 Aug 2017 06:50:19 GMT"
170197
],
171198
"Set-Cookie": [
172199
"x-ms-gateway-slice=productionb; path=/; secure; HttpOnly"

0 commit comments

Comments
 (0)