Skip to content

Commit e2090e9

Browse files
author
Vlad Cananau
committed
Fix DNS cmdlets build after pull from upstream
1 parent bf51418 commit e2090e9

File tree

7 files changed

+69
-51
lines changed

7 files changed

+69
-51
lines changed

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

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,28 +42,39 @@
4242
<RunCodeAnalysis>false</RunCodeAnalysis>
4343
</PropertyGroup>
4444
<ItemGroup>
45-
<Reference Include="Microsoft.Azure.Gallery, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46-
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.2.1-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
45+
<Reference Include="Hyak.Common">
46+
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll</HintPath>
47+
</Reference>
48+
<Reference Include="Microsoft.Azure.Common">
49+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.dll</HintPath>
50+
</Reference>
51+
<Reference Include="Microsoft.Azure.Common.Authentication">
52+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.17-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
53+
</Reference>
54+
<Reference Include="Microsoft.Azure.Management.Authorization">
55+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.17.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
4856
</Reference>
4957
<Reference Include="Microsoft.Azure.Monitoring, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5058
<SpecificVersion>False</SpecificVersion>
5159
<HintPath>..\..\..\packages\Microsoft.Azure.Monitoring.2.2.1-preview\lib\net40\Microsoft.Azure.Monitoring.dll</HintPath>
5260
</Reference>
53-
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61+
<Reference Include="Microsoft.Azure.ResourceManager">
62+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.14.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
63+
</Reference>
64+
<Reference Include="Microsoft.Azure.Test.Framework, Version=1.0.5513.27084, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5465
<SpecificVersion>False</SpecificVersion>
55-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.7.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.5513.27084-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
5667
</Reference>
57-
<Reference Include="Microsoft.Azure.Utilities.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5869
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\..\packages\Hydra.HttpRecorder.1.0.5417.13285-prerelease\lib\net45\Microsoft.Azure.Utilities.HttpRecorder.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5513.27084-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
6071
</Reference>
6172
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6273
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
74+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
6475
</Reference>
65-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform">
66-
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.0.110281957-alpha\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
76+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms">
77+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
6778
</Reference>
6879
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6980
<SpecificVersion>False</SpecificVersion>
@@ -77,22 +88,9 @@
7788
<SpecificVersion>False</SpecificVersion>
7889
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
7990
</Reference>
80-
<Reference Include="Microsoft.WindowsAzure.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81-
<SpecificVersion>False</SpecificVersion>
91+
<Reference Include="Microsoft.WindowsAzure.Common">
8292
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.dll</HintPath>
8393
</Reference>
84-
<Reference Include="Microsoft.WindowsAzure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85-
<SpecificVersion>False</SpecificVersion>
86-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll</HintPath>
87-
</Reference>
88-
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89-
<SpecificVersion>False</SpecificVersion>
90-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.2.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
91-
</Reference>
92-
<Reference Include="Microsoft.WindowsAzure.Testing, Version=1.0.5417.13285, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93-
<SpecificVersion>False</SpecificVersion>
94-
<HintPath>..\..\..\packages\Hydra.SpecTestSupport.1.0.5417.13285-prerelease\lib\net45\Microsoft.WindowsAzure.Testing.dll</HintPath>
95-
</Reference>
9694
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
9795
<SpecificVersion>False</SpecificVersion>
9896
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>

‎src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/DnsTestsBase.cs

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

15+
using Microsoft.Azure.Common.Authentication;
1516
using Microsoft.Azure.Management.Resources;
17+
using Microsoft.Azure.Test;
1618
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1719
using Microsoft.WindowsAzure.Commands.Utilities.Common;
18-
using Microsoft.WindowsAzure.Management.Storage;
19-
using Microsoft.WindowsAzure.Testing;
2020

2121
namespace Microsoft.Azure.Commands.ScenarioTest.DnsTests
2222
{

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Hydra.HttpRecorder" version="1.0.5417.13285-prerelease" targetFramework="net45" />
4-
<package id="Hydra.SpecTestSupport" version="1.0.5417.13285-prerelease" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Gallery" version="2.2.1-preview" targetFramework="net45" />
6-
<package id="Microsoft.Azure.Management.Resources" version="2.7.1-preview" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.Sql" version="0.11.1-prerelease" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Monitoring" version="2.2.1-preview" targetFramework="net45" />
3+
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
4+
<package id="Microsoft.Azure.Common" version="2.0.4" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.17-preview" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.Authorization" version="0.17.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.Resources" version="2.14.1-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Test.Framework" version="1.0.5513.27084-prerelease" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5513.27084-prerelease" targetFramework="net45" />
911
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1012
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1113
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
12-
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.11.10918.1222" targetFramework="net45" />
14+
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.12.111071459" targetFramework="net45" />
1315
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
14-
<package id="Microsoft.WindowsAzure.Common" version="1.4.1" targetFramework="net45" />
15-
<package id="Microsoft.WindowsAzure.Common.Dependencies" version="1.1.1" targetFramework="net45" />
16-
<package id="Microsoft.WindowsAzure.Management.Storage" version="2.0.1" targetFramework="net45" />
16+
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
1717
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
1818
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
1919
<package id="xunit" version="1.9.2" targetFramework="net45" />
2020
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
21+
<package id="xunit.runner.visualstudio" version="0.99.9-build1021" targetFramework="net45" />
2122
</packages>

‎src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,18 @@
8484
</EmbeddedResource>
8585
</ItemGroup>
8686
<ItemGroup>
87+
<Reference Include="Hyak.Common">
88+
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll</HintPath>
89+
</Reference>
90+
<Reference Include="Microsoft.Azure.Common">
91+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.dll</HintPath>
92+
</Reference>
93+
<Reference Include="Microsoft.Azure.Common.Authentication">
94+
<HintPath>..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.17-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
95+
</Reference>
96+
<Reference Include="Microsoft.Azure.Management.Authorization">
97+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.17.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
98+
</Reference>
8799
<Reference Include="Microsoft.Azure.Management.Dns, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88100
<SpecificVersion>False</SpecificVersion>
89101
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.1.1.0-preview\lib\net40\Microsoft.Azure.Management.Dns.dll</HintPath>
@@ -101,6 +113,10 @@
101113
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
102114
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
103115
</Reference>
116+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117+
<SpecificVersion>False</SpecificVersion>
118+
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
119+
</Reference>
104120
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
105121
<SpecificVersion>False</SpecificVersion>
106122
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
@@ -167,7 +183,9 @@
167183
<Name>Commands.Common.ResourceManager</Name>
168184
</ProjectReference>
169185
</ItemGroup>
170-
<ItemGroup />
186+
<ItemGroup>
187+
<WCFMetadata Include="Service References\" />
188+
</ItemGroup>
171189
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
172190
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
173191
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />

‎src/ResourceManager/Dns/Commands.Dns/Models/DnsBaseCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public DnsClient DnsClient
2626
{
2727
if (dnsClient == null)
2828
{
29-
dnsClient = new DnsClient(CurrentContext);
29+
dnsClient = new DnsClient(this.Profile);
3030
}
3131
return dnsClient;
3232
}

‎src/ResourceManager/Dns/Commands.Dns/Models/DnsClient.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
using System.Linq;
1919
using System.Text;
2020

21+
using Microsoft.Azure.Common.Authentication;
22+
using Microsoft.Azure.Common.Authentication.Models;
2123
using Microsoft.Azure.Management.Dns;
2224
using Microsoft.Azure.Management.Dns.Models;
2325
using Microsoft.WindowsAzure.Commands.Common;
24-
using Microsoft.WindowsAzure.Commands.Common.Models;
2526
using Microsoft.WindowsAzure;
2627
using Microsoft.Azure.Commands.Resources.Models;
2728

@@ -31,8 +32,8 @@ public class DnsClient
3132
{
3233
public const string DnsResourceLocation = "global";
3334

34-
public DnsClient(AzureContext context)
35-
: this(AzureSession.ClientFactory.CreateClient<DnsManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager))
35+
public DnsClient(AzureProfile profile)
36+
: this(AzureSession.ClientFactory.CreateClient<DnsManagementClient>(profile, AzureEnvironment.Endpoint.ResourceManager))
3637
{
3738
}
3839

@@ -102,7 +103,7 @@ public DnsZone UpdateDnsZone(DnsZone zone, bool ignoreEtag)
102103

103104
public bool DeleteDnsZone(DnsZone zone, bool ignoreEtag)
104105
{
105-
OperationResponse resp = this.DnsManagementClient.Zones.Delete(
106+
AzureOperationResponse resp = this.DnsManagementClient.Zones.Delete(
106107
zone.ResourceGroupName,
107108
zone.Name,
108109
new ZoneDeleteParameters
@@ -209,7 +210,7 @@ public DnsRecordSet UpdateDnsRecordSet(DnsRecordSet recordSet, bool ignoreEtag)
209210

210211
public bool DeleteDnsRecordSet(DnsRecordSet recordSet, bool ignoreEtag)
211212
{
212-
OperationResponse response = this.DnsManagementClient.Records.Delete(
213+
AzureOperationResponse response = this.DnsManagementClient.Records.Delete(
213214
recordSet.ResourceGroupName,
214215
recordSet.ZoneName,
215216
recordSet.Name,

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
4+
<package id="Microsoft.Azure.Common" version="2.0.4" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.17-preview" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.Authorization" version="0.17.0-preview" targetFramework="net45" />
38
<package id="Microsoft.Azure.Management.Dns" version="1.1.0-preview" targetFramework="net45" />
4-
<package id="Microsoft.Azure.Management.Resources" version="2.7.0-preview" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Management.Sql" version="0.11.1-prerelease" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.Resources" version="2.14.1-preview" targetFramework="net45" />
610
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
711
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
812
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
913
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
1014
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
1115
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
16+
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.12.111071459" targetFramework="net45" />
1217
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
13-
<package id="Microsoft.WindowsAzure.Common" version="1.4.1" targetFramework="net45" />
14-
<package id="Microsoft.WindowsAzure.Common.Dependencies" version="1.1.1" targetFramework="net45" />
15-
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
16-
<package id="Microsoft.WindowsAzure.Management" version="1.2.0" targetFramework="net45" />
17-
<package id="Microsoft.WindowsAzure.Management.Storage" version="2.0.0" targetFramework="net45" />
18+
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
1819
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
1920
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
20-
<package id="WindowsAzure.Storage" version="4.2.1" targetFramework="net45" />
2121
</packages>

0 commit comments

Comments
 (0)