Skip to content

Commit 9918576

Browse files
ryanvogryanvog
committed
Update based on feedback
1 parent 41664de commit 9918576

File tree

7 files changed

+17
-21
lines changed

7 files changed

+17
-21
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DevTestLabs.2.0.1\lib\net452\Microsoft.Azure.Management.DevTestLabs.dll</HintPath>
6060
</Reference>
6161
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.2.0-preview\lib\net45\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
62+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
6363
</Reference>
6464
<Reference Include="Microsoft.Azure.Management.Storage, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6565
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.3.0.0\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
@@ -75,7 +75,7 @@
7575
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.6179.26854-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
7676
</Reference>
7777
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.8.0\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
78+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.8.1\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
7979
</Reference>
8080
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8181
<SpecificVersion>False</SpecificVersion>
@@ -92,16 +92,17 @@
9292
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.7\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
9393
</Reference>
9494
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.0\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
95+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.1\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
9696
</Reference>
9797
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.0\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
98+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.1\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
9999
</Reference>
100100
<Reference Include="Moq">
101101
<HintPath>..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
102102
</Reference>
103-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
104-
<HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
103+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
104+
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
105+
<Private>True</Private>
105106
</Reference>
106107
<Reference Include="System" />
107108
<Reference Include="System.Core" />
@@ -147,7 +148,6 @@
147148
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Storage.ps1">
148149
<Link>ScenarioTests\AzureRM.Storage.ps1</Link>
149150
</None>
150-
<None Include="app.config" />
151151
<None Include="MSSharedLibKey.snk" />
152152
<None Include="packages.config">
153153
<SubType>Designer</SubType>

‎src/ResourceManager/DevTestLabs/Commands.DevTestLabs.Test/ScenarioTests/Common.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function Setup-Test-ResourceGroup
6969
New-AzureRmResourceGroup -Name $rgname -Location $location
7070
New-AzureRmResourceGroupDeployment -Name $labName -ResourceGroupName $rgname `
7171
-TemplateParameterObject @{ newLabName = "$labName" } `
72-
-TemplateFile https://raw.githubusercontent.com/Azure/azure-devtestlab/master/ARMTemplates/101-dtl-create-lab/azuredeploy.json
72+
-TemplateFile https://raw.githubusercontent.com/Azure/azure-devtestlab/master/Samples/101-dtl-create-lab/azuredeploy.json
7373
}
7474

7575
<#

‎src/ResourceManager/DevTestLabs/Commands.DevTestLabs.Test/ScenarioTests/DevTestLabsController.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ private void SetupManagementClients(MockContext context)
153153
helper.SetupManagementClients(ResourceManagementClient,
154154
SubscriptionClient,
155155
DevTestLabsClient,
156-
//AuthorizationManagementClient,
157156
GalleryClient,
158157
armStorageManagementClient
159158
);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.DevTestLabs" version="2.0.1" targetFramework="net452" />
8-
<package id="Microsoft.Azure.Management.ResourceManager" version="1.2.0-preview" targetFramework="net452" />
8+
<package id="Microsoft.Azure.Management.ResourceManager" version="1.6.0-preview" targetFramework="net452" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
12-
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.0" targetFramework="net452" />
12+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
1313
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
1414
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1515
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
1616
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1717
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
1818
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
1919
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.7" targetFramework="net452" />
20-
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.0" targetFramework="net452" />
21-
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.7.0" targetFramework="net452" />
20+
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.1" targetFramework="net452" />
21+
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.7.1" targetFramework="net452" />
2222
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
23-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
23+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
2424
<package id="xunit" version="2.1.0" targetFramework="net45" />
2525
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
2626
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />

‎src/ResourceManager/DevTestLabs/Commands.DevTestLabs/Commands.DevTestLabs.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
<Link>AzureRM.DevTestLabs.psd1</Link>
7474
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7575
</None>
76-
<None Include="app.config" />
7776
<None Include="Microsoft.Azure.Commands.DevTestLabs.format.ps1xml">
7877
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7978
</None>
@@ -124,8 +123,9 @@
124123
<SpecificVersion>False</SpecificVersion>
125124
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
126125
</Reference>
127-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
128-
<HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
126+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
127+
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
128+
<Private>True</Private>
129129
</Reference>
130130
<Reference Include="System" />
131131
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />

‎src/ResourceManager/DevTestLabs/Commands.DevTestLabs/Commands/DevTestLabsCmdletBase.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
using Microsoft.Azure.Commands.Common.Authentication;
1616
using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
17-
using Microsoft.Azure.Commands.Common.Authentication.Models;
1817
using Microsoft.Azure.Commands.ResourceManager.Common;
1918
using Microsoft.Azure.Management.DevTestLabs;
2019
using System.Management.Automation;
@@ -59,8 +58,6 @@ internal IDevTestLabsClient DataServiceClient
5958
{
6059
_dataServiceClient = AzureSession.Instance.ClientFactory.CreateArmClient<DevTestLabsClient>(DefaultContext,
6160
AzureEnvironment.Endpoint.ResourceManager);
62-
63-
WriteInformation(new InformationRecord($"Resource Group = {ResourceGroupName}", nameof(DevTestLabsCmdletBase)));
6461
_dataServiceClient.ResourceGroupName = ResourceGroupName;
6562
}
6663

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
<package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
1414
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.7" targetFramework="net452" />
1515
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.12" targetFramework="net452" />
16-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
16+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
1717
</packages>

0 commit comments

Comments
 (0)