Skip to content

Commit 1b6f792

Browse files
markcowlmarkcowl
authored
Merge pull request #4070 from markcowl/storcmk
Storage CMK feature
2 parents 0295f92 + cb97fd0 commit 1b6f792

File tree

30 files changed

+216623
-3551
lines changed

30 files changed

+216623
-3551
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="Microsoft.Azure.Management.Storage, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.6.3.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
65-
<Private>True</Private>
64+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.6.4.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
6665
</Reference>
6766
<Reference Include="Microsoft.Azure.Test.Framework">
6867
<SpecificVersion>False</SpecificVersion>
@@ -81,12 +80,10 @@
8180
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
8281
</Reference>
8382
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.6\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
85-
<Private>True</Private>
83+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
8684
</Reference>
8785
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.5\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
89-
<Private>True</Private>
86+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.7\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
9087
</Reference>
9188
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9289
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.12\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>

‎src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/SessionRecords/Microsoft.Azure.Commands.ContainerRegistry.Test.ScenarioTests.ContainerRegistryTests/TestAzureContainerRegistry.json

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

‎src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/SessionRecords/Microsoft.Azure.Commands.ContainerRegistry.Test.ScenarioTests.ContainerRegistryTests/TestAzureContainerRegistryCredential.json

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

‎src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/SessionRecords/Microsoft.Azure.Commands.ContainerRegistry.Test.ScenarioTests.ContainerRegistryTests/TestAzureContainerRegistryNameAvailability.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/subscriptions/3eb31d8d-2879-4706-89b4-4dc4047726c6/providers/Microsoft.ContainerRegistry/checkNameAvailability?api-version=2017-03-01",
5-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvM2ViMzFkOGQtMjg3OS00NzA2LTg5YjQtNGRjNDA0NzcyNmM2L3Byb3ZpZGVycy9NaWNyb3NvZnQuQ29udGFpbmVyUmVnaXN0cnkvY2hlY2tOYW1lQXZhaWxhYmlsaXR5P2FwaS12ZXJzaW9uPTIwMTctMDMtMDE=",
4+
"RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/providers/Microsoft.ContainerRegistry/checkNameAvailability?api-version=2017-03-01",
5+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Byb3ZpZGVycy9NaWNyb3NvZnQuQ29udGFpbmVyUmVnaXN0cnkvY2hlY2tOYW1lQXZhaWxhYmlsaXR5P2FwaS12ZXJzaW9uPTIwMTctMDMtMDE=",
66
"RequestMethod": "POST",
7-
"RequestBody": "{\r\n \"name\": \"onesdk1123\",\r\n \"type\": \"Microsoft.ContainerRegistry/registries\"\r\n}",
7+
"RequestBody": "{\r\n \"name\": \"onesdk5889\",\r\n \"type\": \"Microsoft.ContainerRegistry/registries\"\r\n}",
88
"RequestHeaders": {
99
"Content-Type": [
1010
"application/json; charset=utf-8"
@@ -13,16 +13,16 @@
1313
"81"
1414
],
1515
"x-ms-client-request-id": [
16-
"24862aaa-c95b-43ee-917b-79ee4fef7072"
16+
"d5c0d22e-4fcf-45e7-8cf0-5fb06ea53926"
1717
],
1818
"accept-language": [
1919
"en-US"
2020
],
2121
"User-Agent": [
22-
"FxVersion/4.6.1637.0",
23-
"OSName/Windows_10_Enterprise",
22+
"FxVersion/4.6.1648.0",
23+
"OSName/Windows10Enterprise",
2424
"OSVersion/6.3.14393",
25-
"Microsoft.Azure.Management.ContainerRegistry.ContainerRegistryManagementClient/1.2.0-preview"
25+
"Microsoft.Azure.Management.ContainerRegistry.ContainerRegistryManagementClient/1.2.0.0"
2626
]
2727
},
2828
"ResponseBody": "{\r\n \"nameAvailable\": true\r\n}",
@@ -43,22 +43,22 @@
4343
"max-age=31536000; includeSubDomains"
4444
],
4545
"x-ms-ratelimit-remaining-subscription-reads": [
46-
"14996"
46+
"14997"
4747
],
4848
"x-ms-request-id": [
49-
"494371ee-2d83-430d-afeb-88884b6b457b"
49+
"f5a24b72-ba0c-4201-aa78-cef4b7b9c425"
5050
],
5151
"x-ms-correlation-request-id": [
52-
"494371ee-2d83-430d-afeb-88884b6b457b"
52+
"f5a24b72-ba0c-4201-aa78-cef4b7b9c425"
5353
],
5454
"x-ms-routing-request-id": [
55-
"WESTUS2:20170428T160212Z:494371ee-2d83-430d-afeb-88884b6b457b"
55+
"JAPANEAST:20170531T112018Z:f5a24b72-ba0c-4201-aa78-cef4b7b9c425"
5656
],
5757
"Cache-Control": [
5858
"no-cache"
5959
],
6060
"Date": [
61-
"Fri, 28 Apr 2017 16:02:11 GMT"
61+
"Wed, 31 May 2017 11:20:18 GMT"
6262
],
6363
"Server": [
6464
"Microsoft-HTTPAPI/2.0"
@@ -67,8 +67,8 @@
6767
"StatusCode": 200
6868
},
6969
{
70-
"RequestUri": "/subscriptions/3eb31d8d-2879-4706-89b4-4dc4047726c6/providers/Microsoft.ContainerRegistry/checkNameAvailability?api-version=2017-03-01",
71-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvM2ViMzFkOGQtMjg3OS00NzA2LTg5YjQtNGRjNDA0NzcyNmM2L3Byb3ZpZGVycy9NaWNyb3NvZnQuQ29udGFpbmVyUmVnaXN0cnkvY2hlY2tOYW1lQXZhaWxhYmlsaXR5P2FwaS12ZXJzaW9uPTIwMTctMDMtMDE=",
70+
"RequestUri": "/subscriptions/ce4a7590-4722-4bcf-a2c6-e473e9f11778/providers/Microsoft.ContainerRegistry/checkNameAvailability?api-version=2017-03-01",
71+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvY2U0YTc1OTAtNDcyMi00YmNmLWEyYzYtZTQ3M2U5ZjExNzc4L3Byb3ZpZGVycy9NaWNyb3NvZnQuQ29udGFpbmVyUmVnaXN0cnkvY2hlY2tOYW1lQXZhaWxhYmlsaXR5P2FwaS12ZXJzaW9uPTIwMTctMDMtMDE=",
7272
"RequestMethod": "POST",
7373
"RequestBody": "{\r\n \"name\": \"Microsoft\",\r\n \"type\": \"Microsoft.ContainerRegistry/registries\"\r\n}",
7474
"RequestHeaders": {
@@ -79,16 +79,16 @@
7979
"80"
8080
],
8181
"x-ms-client-request-id": [
82-
"6993fc1d-f619-404b-a721-7452b35a3144"
82+
"34157363-168b-4acf-b68d-f50fb9e3ae6b"
8383
],
8484
"accept-language": [
8585
"en-US"
8686
],
8787
"User-Agent": [
88-
"FxVersion/4.6.1637.0",
89-
"OSName/Windows_10_Enterprise",
88+
"FxVersion/4.6.1648.0",
89+
"OSName/Windows10Enterprise",
9090
"OSVersion/6.3.14393",
91-
"Microsoft.Azure.Management.ContainerRegistry.ContainerRegistryManagementClient/1.2.0-preview"
91+
"Microsoft.Azure.Management.ContainerRegistry.ContainerRegistryManagementClient/1.2.0.0"
9292
]
9393
},
9494
"ResponseBody": "{\r\n \"nameAvailable\": false,\r\n \"reason\": \"Invalid\",\r\n \"message\": \"The specified registry name is disallowed\"\r\n}",
@@ -109,22 +109,22 @@
109109
"max-age=31536000; includeSubDomains"
110110
],
111111
"x-ms-ratelimit-remaining-subscription-reads": [
112-
"14995"
112+
"14996"
113113
],
114114
"x-ms-request-id": [
115-
"bb0f4b3e-7fa5-4676-a704-ef7d8b3e8540"
115+
"7bace20c-46d6-4ca5-8cce-ceb05c3cf5cb"
116116
],
117117
"x-ms-correlation-request-id": [
118-
"bb0f4b3e-7fa5-4676-a704-ef7d8b3e8540"
118+
"7bace20c-46d6-4ca5-8cce-ceb05c3cf5cb"
119119
],
120120
"x-ms-routing-request-id": [
121-
"WESTUS2:20170428T160212Z:bb0f4b3e-7fa5-4676-a704-ef7d8b3e8540"
121+
"JAPANEAST:20170531T112019Z:7bace20c-46d6-4ca5-8cce-ceb05c3cf5cb"
122122
],
123123
"Cache-Control": [
124124
"no-cache"
125125
],
126126
"Date": [
127-
"Fri, 28 Apr 2017 16:02:12 GMT"
127+
"Wed, 31 May 2017 11:20:18 GMT"
128128
],
129129
"Server": [
130130
"Microsoft-HTTPAPI/2.0"
@@ -135,10 +135,10 @@
135135
],
136136
"Names": {
137137
"Test-AzureContainerRegistryNameAvailability": [
138-
"onesdk1123"
138+
"onesdk5889"
139139
]
140140
},
141141
"Variables": {
142-
"SubscriptionId": "3eb31d8d-2879-4706-89b4-4dc4047726c6"
142+
"SubscriptionId": "ce4a7590-4722-4bcf-a2c6-e473e9f11778"
143143
}
144144
}

‎src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Management.ContainerRegistry" version="1.2.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.ResourceManager" version="1.6.0-preview" targetFramework="net452" />
8-
<package id="Microsoft.Azure.Management.Storage" version="6.3.0-preview" targetFramework="net452" />
8+
<package id="Microsoft.Azure.Management.Storage" version="6.4.0-preview" targetFramework="net452" />
99
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.7.0" targetFramework="net45" />
1111
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
1212
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1313
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
1414
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1515
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
16-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.6" targetFramework="net45" />
17-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net45" />
16+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
17+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.7" targetFramework="net452" />
1818
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.12" targetFramework="net45" />
1919
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.6.0" targetFramework="net45" />
2020
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />

‎src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/Commands.ContainerRegistry.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,13 @@
6969
<Private>True</Private>
7070
</Reference>
7171
<Reference Include="Microsoft.Azure.Management.Storage, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.6.3.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
73-
<Private>True</Private>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.6.4.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
7473
</Reference>
7574
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.6\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
77-
<Private>True</Private>
75+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
7876
</Reference>
7977
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.5\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
81-
<Private>True</Private>
78+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.7\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
8279
</Reference>
8380
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8481
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Management.ContainerRegistry" version="1.2.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.ResourceManager" version="1.6.0-preview" targetFramework="net452" />
8-
<package id="Microsoft.Azure.Management.Storage" version="6.3.0-preview" targetFramework="net452" />
8+
<package id="Microsoft.Azure.Management.Storage" version="6.4.0-preview" targetFramework="net452" />
99
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
1212
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
13-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.6" targetFramework="net45" />
14-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net45" />
13+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
14+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.7" targetFramework="net452" />
1515
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1616
</packages>

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
<Reference Include="Microsoft.Azure.Management.ServiceFabric">
9494
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ServiceFabric.1.0.0-preview\lib\net45\Microsoft.Azure.Management.ServiceFabric.dll</HintPath>
9595
</Reference>
96-
<Reference Include="Microsoft.Azure.Management.Storage">
97-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.6.3.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
96+
<Reference Include="Microsoft.Azure.Management.Storage, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.6.4.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
9898
</Reference>
9999
<Reference Include="Microsoft.CSharp" />
100100
<Reference Include="Microsoft.Data.Edm">
@@ -107,12 +107,10 @@
107107
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
108108
</Reference>
109109
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.6\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
111-
<Private>True</Private>
110+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
112111
</Reference>
113112
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.5\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
115-
<Private>True</Private>
113+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.7\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
116114
</Reference>
117115
<Reference Include="Microsoft.Threading.Tasks.Extensions">
118116
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>

0 commit comments

Comments
 (0)