Skip to content

Commit 66a605e

Browse files
cormacpaynecormacpayne
committed
Merge branch 'preview' of github.com:Azure/azure-powershell into clientruntime-update
# Conflicts: # src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/SessionRecords/Microsoft.Azure.Commands.ContainerRegistry.Test.ScenarioTests.ContainerRegistryTests/TestAzureContainerRegistry.json # src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/SessionRecords/Microsoft.Azure.Commands.ContainerRegistry.Test.ScenarioTests.ContainerRegistryTests/TestAzureContainerRegistryCredential.json # src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/SessionRecords/Microsoft.Azure.Commands.ContainerRegistry.Test.ScenarioTests.ContainerRegistryTests/TestAzureContainerRegistryNameAvailability.json # src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/SessionRecords/Microsoft.Azure.Commands.ContainerRegistry.Test.ScenarioTests.ContainerRegistryTests/TestAzureContainerRegistryReplication.json # src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/SessionRecords/Microsoft.Azure.Commands.ContainerRegistry.Test.ScenarioTests.ContainerRegistryTests/TestAzureContainerRegistryWebhook.json
2 parents 7be1063 + 8e701cf commit 66a605e

File tree

65 files changed

+27390
-32169
lines changed

Some content is hidden

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

65 files changed

+27390
-32169
lines changed

‎build.proj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@
298298
<Delete Files="@(ExtraPsdFiles->'%(FullPath)')"/>
299299

300300
<!-- Update module manifests. -->
301-
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) AzureRM.Netcore -Profile Latest &quot; " Condition="'$(Latest)' == 'true' and '$(CodeSign)' == 'false'" ContinueOnError="false" />
301+
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) AzureRM.Netcore -Profile Latest &quot; " Condition="'$(Latest)' == 'true'" ContinueOnError="false" />
302302

303303
<!-- Generate the help. -->
304304
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;Set-Variable -Name ProgressPreference -Value 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -GenerateMamlHelp -BuildConfig $(Configuration) &quot;" ContinueOnError="true" Condition=" '$(SkipHelp)' == 'false' and '$(Latest)' == 'true'"/>
@@ -372,8 +372,8 @@
372372
ContinueOnError="false"
373373
Condition="!$(DelaySign) and '@(DelaySignedAssembliesToSign)' != ''"/>
374374

375-
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) -Profile Latest &quot; " Condition="'$(Latest)' == 'true' "/>
376-
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) -Profile Stack &quot; " Condition="'$(Stack)' == 'true' "/>
375+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) -Profile Latest &quot; " Condition="'$(Latest)' == 'true' and '$(NetCore)' == 'false' "/>
376+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) -Profile Stack &quot; " Condition="'$(Stack)' == 'true' and '$(NetCore)' == 'false' "/>
377377

378378
<!-- Copying shortcut to be signed -->
379379
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"

‎src/Common/Commands.Common.Compute/Commands.Common.Compute.Netcore.csproj

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,36 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="..\..\..\tools\Common.Netcore.Dependencies.targets" />
4+
35
<PropertyGroup>
46
<TargetFramework>netcoreapp2.0</TargetFramework>
57
<AssemblyName>Microsoft.Azure.Commands.Common.Compute</AssemblyName>
68
<RootNamespace>Microsoft.Azure.Commands.Common.Compute</RootNamespace>
79
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
810
</PropertyGroup>
911

12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
13+
<SignAssembly>True</SignAssembly>
14+
<DelaySign>True</DelaySign>
15+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
16+
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
17+
</PropertyGroup>
18+
19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
20+
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
21+
<DelaySign>false</DelaySign>
22+
</PropertyGroup>
23+
24+
<ItemGroup >
25+
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
26+
<PackageReference Include="System.Reflection" Version="4.3.0" />
27+
<PackageReference Include="System.Security.SecureString" Version="4.3.0" />
28+
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
29+
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
30+
</ItemGroup>
31+
1032
<ItemGroup>
33+
<ProjectReference Include="..\Commands.Common\Common.Netcore.csproj" />
1134
<ProjectReference Include="..\..\ResourceManager\Common\Commands.ResourceManager.Common\Common.ResourceManager.Netcore.csproj" />
1235
</ItemGroup>
1336

‎src/ResourceManager/Aks/Commands.Aks/Commands.Aks.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
3333
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
3434
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.1.1" />
35-
<PackageReference Include="YamlDotNet" Version="4.2.2" />
35+
<PackageReference Include="YamlDotNet.Signed" Version="4.2.2" />
3636
<PackageReference Include="AutoMapper" Version="6.2.2" />
3737
</ItemGroup>
3838
<ItemGroup>

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="17.5.0" />
3434
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.3.0-preview" />
3535
<PackageReference Include="Microsoft.Azure.Management.Network" Version="10.1.0-preview" />
36+
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
3637
<PackageReference Include="AutoMapper" Version="6.0.2" />
3738
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
3839
<PackageReference Include="System.Reflection" Version="4.3.0" />

‎src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/Scripts/AzureDiskEncryptionPreRequisiteSetup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,5 +189,5 @@ $ErrorActionPreference = "Stop"
189189
########################################################################################################################
190190
# For each VM you want to encrypt, run the below cmdlet
191191
# $vmName = 'Name of VM to encrypt';
192-
# Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $resourceGroupName -VMName $vmName -AadClientID $aadClientID -AadClientSecret $aadClientSecret -DiskEncryptionKeyVaultUrl $diskEncryptionKeyVaultUrl -DiskEncryptionKeyVaultId $keyVaultResourceId -VolumeType $volumeType
192+
# Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $resourceGroupName -VMName $vmName -AadClientID $aadClientID -AadClientSecret $aadClientSecret -DiskEncryptionKeyVaultUrl $diskEncryptionKeyVaultUrl -DiskEncryptionKeyVaultId $keyVaultResourceId -VolumeType All
193193
########################################################################################################################

‎src/ResourceManager/ContainerRegistry/AzureRM.ContainerRegistry.psd1

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ CLRVersion = '4.0'
5454
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.5.0'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
57-
RequiredAssemblies = '.\Microsoft.Azure.Management.ContainerRegistry.dll',
58-
'.\Microsoft.Azure.Management.ResourceManager.dll',
59-
'.\Microsoft.Azure.Management.Storage.dll',
60-
'.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll'
57+
RequiredAssemblies = '.\Microsoft.Azure.Management.ContainerRegistry.dll'
6158

6259
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
6360
# ScriptsToProcess = @()
@@ -75,7 +72,8 @@ NestedModules = @('.\Microsoft.Azure.Commands.ContainerRegistry.dll')
7572
FunctionsToExport = @()
7673

7774
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
78-
CmdletsToExport = 'New-AzureRmContainerRegistry', 'Get-AzureRmContainerRegistry',
75+
CmdletsToExport = 'New-AzureRmContainerRegistry',
76+
'Get-AzureRmContainerRegistry',
7977
'Update-AzureRmContainerRegistry',
8078
'Remove-AzureRmContainerRegistry',
8179
'Get-AzureRmContainerRegistryCredential',

‎src/ResourceManager/ContainerRegistry/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Decouple reliance on Commands.Resources.Rest and ARM/Storage SDKs.
2122

2223
## Version 1.0.3
2324
* Fix issue with Default Resource Group in CloudShell

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="Microsoft.Azure.Management.Storage, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.6.5.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
64-
</Reference>
6562
<Reference Include="Microsoft.Azure.Test.Framework">
6663
<SpecificVersion>False</SpecificVersion>
6764
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.6179.26854-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>

‎src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/ScenarioTests/ContainerRegistryTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ public void TestAzureContainerRegistryReplication()
5858
TestController.NewInstance.RunPowerShellTest("Test-AzureContainerRegistryReplication");
5959
}
6060

61-
[Fact]
61+
[Fact(Skip = "Need service team to re-record test after changes to the ClientRuntime.")]
6262
[Trait(Category.AcceptanceType, Category.CheckIn)]
63+
[Trait("Re-record", "ClientRuntime changes")]
6364
public void TestAzureContainerRegistryWebhook()
6465
{
6566
TestController.NewInstance.RunPowerShellTest("Test-AzureContainerRegistryWebhook");

‎src/ResourceManager/ContainerRegistry/Commands.ContainerRegistry.Test/ScenarioTests/TestController.cs

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,26 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
16-
using System.IO;
17-
using System.Linq;
15+
using Microsoft.Azure.Commands.Common.Authentication;
1816
using Microsoft.Azure.Management.ContainerRegistry;
19-
using Microsoft.Azure.Management.Storage;
20-
using Microsoft.Azure.Management.ResourceManager;
2117
using Microsoft.Azure.Test.HttpRecorder;
22-
using Microsoft.Azure.Commands.Common.Authentication;
2318
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
2419
using Microsoft.WindowsAzure.Commands.ScenarioTest;
20+
using System;
21+
using System.Collections.Generic;
22+
using System.IO;
23+
using System.Linq;
24+
using InternalResourceManagementClient = Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient;
25+
using ResourceManagementClient = Microsoft.Azure.Management.ResourceManager.ResourceManagementClient;
2526
using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory;
2627
using TestUtilities = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestUtilities;
27-
using System.Collections.Generic;
2828

2929
namespace Microsoft.Azure.Commands.ContainerRegistry.Test.ScenarioTests
3030
{
3131
public class TestController
3232
{
3333
private EnvironmentSetupHelper helper;
3434

35-
public ContainerRegistryManagementClient ContainerRegistryClient { get; private set; }
36-
37-
public StorageManagementClient StorageClient { get; private set; }
38-
39-
public ResourceManagementClient ResourceClient { get; private set; }
40-
4135
public TestController()
4236
{
4337
helper = new EnvironmentSetupHelper();
@@ -53,10 +47,10 @@ public static TestController NewInstance
5347

5448
private void SetupManagementClients(MockContext context)
5549
{
56-
ContainerRegistryClient = GetContainerRegistryManagementClient(context);
57-
StorageClient = GetStorageManagementClient(context);
58-
ResourceClient = GetResourceManagementClient(context);
59-
helper.SetupManagementClients(ContainerRegistryClient, StorageClient, ResourceClient);
50+
helper.SetupManagementClients(
51+
context.GetServiceClient<ContainerRegistryManagementClient>(TestEnvironmentFactory.GetTestEnvironment()),
52+
context.GetServiceClient<ResourceManagementClient>(TestEnvironmentFactory.GetTestEnvironment()),
53+
context.GetServiceClient<InternalResourceManagementClient>(TestEnvironmentFactory.GetTestEnvironment()));
6054
}
6155

6256
public void RunPowerShellTest(params string[] scripts)
@@ -68,7 +62,6 @@ public void RunPowerShellTest(params string[] scripts)
6862
d.Add("Microsoft.Resources", null);
6963
d.Add("Microsoft.Features", null);
7064
d.Add("Microsoft.Authorization", null);
71-
d.Add("Microsoft.Compute", null);
7265
var providersToIgnore = new Dictionary<string, string>();
7366
providersToIgnore.Add("Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01");
7467
HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);
@@ -94,20 +87,5 @@ public void RunPowerShellTest(params string[] scripts)
9487
}
9588
}
9689
}
97-
98-
private ContainerRegistryManagementClient GetContainerRegistryManagementClient(MockContext context)
99-
{
100-
return context.GetServiceClient<ContainerRegistryManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
101-
}
102-
103-
private StorageManagementClient GetStorageManagementClient(MockContext context)
104-
{
105-
return context.GetServiceClient<StorageManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
106-
}
107-
108-
private ResourceManagementClient GetResourceManagementClient(MockContext context)
109-
{
110-
return context.GetServiceClient<ResourceManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
111-
}
11290
}
11391
}

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

Lines changed: 628 additions & 30229 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: 354 additions & 804 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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"RequestUri": "/subscriptions/c9cbd920-c00c-427c-852b-8aaf38badaeb/providers/Microsoft.ContainerRegistry/checkNameAvailability?api-version=2017-10-01",
55
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYzljYmQ5MjAtYzAwYy00MjdjLTg1MmItOGFhZjM4YmFkYWViL3Byb3ZpZGVycy9NaWNyb3NvZnQuQ29udGFpbmVyUmVnaXN0cnkvY2hlY2tOYW1lQXZhaWxhYmlsaXR5P2FwaS12ZXJzaW9uPTIwMTctMTAtMDE=",
66
"RequestMethod": "POST",
7-
"RequestBody": "{\r\n \"name\": \"regps5050\",\r\n \"type\": \"Microsoft.ContainerRegistry/registries\"\r\n}",
7+
"RequestBody": "{\r\n \"name\": \"regps4453\",\r\n \"type\": \"Microsoft.ContainerRegistry/registries\"\r\n}",
88
"RequestHeaders": {
99
"Content-Type": [
1010
"application/json; charset=utf-8"
@@ -13,7 +13,7 @@
1313
"80"
1414
],
1515
"x-ms-client-request-id": [
16-
"46fadb35-8d0e-47a7-8bbc-dd1dfb2e0819"
16+
"95986755-07f8-4901-801d-8ccdfce95f7f"
1717
],
1818
"accept-language": [
1919
"en-US"
@@ -43,16 +43,16 @@
4343
"max-age=31536000; includeSubDomains"
4444
],
4545
"x-ms-ratelimit-remaining-subscription-reads": [
46-
"14998"
46+
"14999"
4747
],
4848
"x-ms-request-id": [
49-
"117fd2f6-89ac-4901-b4d3-0b95dbaff4e6"
49+
"c8f33334-a0c9-4575-b547-10e73f4dc9a8"
5050
],
5151
"x-ms-correlation-request-id": [
52-
"117fd2f6-89ac-4901-b4d3-0b95dbaff4e6"
52+
"c8f33334-a0c9-4575-b547-10e73f4dc9a8"
5353
],
5454
"x-ms-routing-request-id": [
55-
"WESTUS:20180321T154412Z:117fd2f6-89ac-4901-b4d3-0b95dbaff4e6"
55+
"WESTUS2:20180328T001856Z:c8f33334-a0c9-4575-b547-10e73f4dc9a8"
5656
],
5757
"X-Content-Type-Options": [
5858
"nosniff"
@@ -61,7 +61,7 @@
6161
"no-cache"
6262
],
6363
"Date": [
64-
"Wed, 21 Mar 2018 15:44:11 GMT"
64+
"Wed, 28 Mar 2018 00:18:56 GMT"
6565
],
6666
"Server": [
6767
"Microsoft-HTTPAPI/2.0"
@@ -82,7 +82,7 @@
8282
"80"
8383
],
8484
"x-ms-client-request-id": [
85-
"ae6b1d5e-04a8-4a20-8ad3-68c70f0aa0eb"
85+
"e29ccea8-4df0-4f70-bf2c-68f9c980d6b1"
8686
],
8787
"accept-language": [
8888
"en-US"
@@ -112,16 +112,16 @@
112112
"max-age=31536000; includeSubDomains"
113113
],
114114
"x-ms-ratelimit-remaining-subscription-reads": [
115-
"14997"
115+
"14998"
116116
],
117117
"x-ms-request-id": [
118-
"a45c2008-5df5-4883-8427-94b44db8b1aa"
118+
"c98e4a68-bb1c-4b89-9b2b-8289ecc427ba"
119119
],
120120
"x-ms-correlation-request-id": [
121-
"a45c2008-5df5-4883-8427-94b44db8b1aa"
121+
"c98e4a68-bb1c-4b89-9b2b-8289ecc427ba"
122122
],
123123
"x-ms-routing-request-id": [
124-
"WESTUS:20180321T154412Z:a45c2008-5df5-4883-8427-94b44db8b1aa"
124+
"WESTUS2:20180328T001857Z:c98e4a68-bb1c-4b89-9b2b-8289ecc427ba"
125125
],
126126
"X-Content-Type-Options": [
127127
"nosniff"
@@ -130,7 +130,7 @@
130130
"no-cache"
131131
],
132132
"Date": [
133-
"Wed, 21 Mar 2018 15:44:12 GMT"
133+
"Wed, 28 Mar 2018 00:18:56 GMT"
134134
],
135135
"Server": [
136136
"Microsoft-HTTPAPI/2.0"
@@ -141,7 +141,7 @@
141141
],
142142
"Names": {
143143
"Test-AzureContainerRegistryNameAvailability": [
144-
"ps5050"
144+
"ps4453"
145145
]
146146
},
147147
"Variables": {

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

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Management.ContainerRegistry" version="2.0.0" targetFramework="net452" />
77
<package id="Microsoft.Azure.Management.ResourceManager" version="1.6.0-preview" targetFramework="net452" />
8-
<package id="Microsoft.Azure.Management.Storage" version="6.5.0-preview" targetFramework="net452" />
98
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
109
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.7.0" targetFramework="net45" />
1110
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,6 @@
5151
<Reference Include="Microsoft.Azure.Management.ContainerRegistry, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5252
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ContainerRegistry.2.0.0\lib\net452\Microsoft.Azure.Management.ContainerRegistry.dll</HintPath>
5353
</Reference>
54-
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
56-
<Private>True</Private>
57-
</Reference>
58-
<Reference Include="Microsoft.Azure.Management.Storage, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.6.5.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
60-
</Reference>
6154
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
6255
</ItemGroup>
6356
<ItemGroup>
@@ -118,10 +111,6 @@
118111
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
119112
<Name>Commands.ResourceManager.Common</Name>
120113
</ProjectReference>
121-
<ProjectReference Include="..\..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj">
122-
<Project>{8058d403-06e3-4bed-8924-d166ce303961}</Project>
123-
<Name>Commands.Resources.Rest</Name>
124-
</ProjectReference>
125114
</ItemGroup>
126115
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
127116
<Import Project="..\..\..\..\tools\Common.Dependencies.targets" />

0 commit comments

Comments
 (0)