Skip to content

Commit 167cb31

Browse files
sethusrinivasansethusrinivasan
committed
Merge pull request #32 from Azure/dev
PR from parent
2 parents 593b24c + 85f2f47 commit 167cb31

File tree

273 files changed

+32270
-73332
lines changed

Some content is hidden

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

273 files changed

+32270
-73332
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 4 additions & 276 deletions
Large diffs are not rendered by default.

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@
6464
<SpecificVersion>False</SpecificVersion>
6565
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Microsoft.Azure.ResourceManager">
68-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.4-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
67+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<SpecificVersion>False</SpecificVersion>
69+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.6-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
6970
</Reference>
7071
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7172
<SpecificVersion>False</SpecificVersion>
@@ -187,4 +188,4 @@
187188
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
188189
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
189190
</Target>
190-
</Project>
191+
</Project>

‎src/Common/Commands.Common.Storage/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.1.3-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.Resources" version="2.18.4-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.Resources" version="2.18.6-preview" targetFramework="net45" />
88
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
99
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
1111
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
1212
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
1313
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
1414
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
15+
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1516
<package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
1617
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
17-
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@
6363
<Reference Include="Microsoft.Azure.Common.NetFramework">
6464
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6565
</Reference>
66-
<Reference Include="Microsoft.Azure.ResourceManager">
67-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.4-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
66+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67+
<SpecificVersion>False</SpecificVersion>
68+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.6-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
6869
</Reference>
6970
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7071
<HintPath>..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5687.28567-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
@@ -136,7 +137,6 @@
136137
<Reference Include="System" />
137138
<Reference Include="System.Core" />
138139
<Reference Include="System.Data.Services.Client" />
139-
<Reference Include="System.IO.Compression.FileSystem" />
140140
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
141141
<Reference Include="System.Net" />
142142
<Reference Include="System.Net.Http" />
@@ -175,8 +175,6 @@
175175
<Compile Include="Common\GeneralTests.cs" />
176176
<Compile Include="Common\IdnUtilitiesTests.cs" />
177177
<Compile Include="Common\JsonUtilitiesTests.cs" />
178-
<Compile Include="Extensions\DSC\DscExtensionConfigurationParsingHelperTests.cs" />
179-
<Compile Include="Extensions\DSC\DscExtensionSettingsSerializerTests.cs" />
180178
<Compile Include="Mocks\ClientMocks.cs" />
181179
<Compile Include="Common\PSObjectExtensions.cs" />
182180
<Compile Include="Common\RemoveAzurePublishSettings.cs" />
@@ -314,4 +312,4 @@
314312
</PropertyGroup>
315313
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
316314
</Target>
317-
</Project>
315+
</Project>

‎src/Common/Commands.Common.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.1.3-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.Resources" version="2.18.4-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.Resources" version="2.18.6-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5687.28567-prerelease" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/Common/Commands.Common/Commands.Common.csproj

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,7 @@
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7070
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.4-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
72-
</Reference>
73-
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
75-
</Reference>
76-
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
78-
</Reference>
79-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
71+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.6-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
8172
</Reference>
8273
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
8374
<SpecificVersion>False</SpecificVersion>
@@ -103,9 +94,6 @@
10394
<SpecificVersion>False</SpecificVersion>
10495
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
10596
</Reference>
106-
<Reference Include="Microsoft.WindowsAzure.Storage">
107-
<HintPath>..\..\packages\WindowsAzure.Storage.4.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
108-
</Reference>
10997
<Reference Include="Newtonsoft.Json">
11098
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
11199
<Private>True</Private>
@@ -120,7 +108,6 @@
120108
</Reference>
121109
<Reference Include="System" />
122110
<Reference Include="System.Core" />
123-
<Reference Include="System.IO.Compression.FileSystem" />
124111
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
125112
<Reference Include="System.Net" />
126113
<Reference Include="System.Net.Http" />
@@ -142,9 +129,6 @@
142129
<Reference Include="System.ServiceModel" />
143130
<Reference Include="System.ServiceModel.Channels" />
144131
<Reference Include="System.ServiceModel.Web" />
145-
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
146-
<HintPath>..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
147-
</Reference>
148132
<Reference Include="System.Web.Extensions" />
149133
<Reference Include="System.Windows.Forms" />
150134
<Reference Include="System.Xml.Linq" />
@@ -157,14 +141,6 @@
157141
<Compile Include="AzurePowerShell.cs" />
158142
<Compile Include="ComputeCloudException.cs" />
159143
<Compile Include="Constants.cs" />
160-
<Compile Include="Extensions\DSC\DscExtensionCmdletConstants.cs" />
161-
<Compile Include="Extensions\DSC\DscExtensionPrivateSettings.cs" />
162-
<Compile Include="Extensions\DSC\DscExtensionPublicSettings.cs" />
163-
<Compile Include="Extensions\DSC\DscExtensionSettingsSerializer.cs" />
164-
<Compile Include="Extensions\DSC\Exceptions\GetDscResourceException.cs" />
165-
<Compile Include="Extensions\DSC\Publish\ConfigurationParseResult.cs" />
166-
<Compile Include="Extensions\DSC\Publish\ConfigurationParsingHelper.cs" />
167-
<Compile Include="Extensions\DSC\Publish\DscExtensionPublishCmdletCommonBase.cs" />
168144
<Compile Include="Properties\Resources.Designer.cs">
169145
<AutoGen>True</AutoGen>
170146
<DesignTime>True</DesignTime>
@@ -219,4 +195,4 @@
219195
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
220196
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
221197
</Target>
222-
</Project>
198+
</Project>

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@
55
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Authentication" version="1.1.3-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.Resources" version="2.18.4-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.Resources" version="2.18.6-preview" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
12-
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
13-
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
14-
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
1512
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1613
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1714
<package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
1815
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
1916
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2017
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
21-
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
22-
<package id="WindowsAzure.Storage" version="4.0.0" targetFramework="net45" />
2318
</packages>

‎src/Common/Commands.Profile/Commands.Profile.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@
6060
<Reference Include="Microsoft.Azure.Common.NetFramework">
6161
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Microsoft.Azure.ResourceManager">
64-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.4-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
63+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<SpecificVersion>False</SpecificVersion>
65+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.6-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
6566
</Reference>
6667
<Reference Include="Microsoft.Build" />
6768
<Reference Include="Microsoft.Build.Framework" />

‎src/Common/Commands.Profile/Profile/NewAzureProfile.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,9 @@ private void InitializeAzureProfile(AzureProfile profile, string parameterSet, A
175175
var servicePrincipalAccount = new AzureAccount
176176
{
177177
Id = settings.Credential.UserName,
178-
Type = AzureAccount.AccountType.ServicePrincipal
178+
Type = AzureAccount.AccountType.ServicePrincipal,
179179
};
180+
servicePrincipalAccount.SetOrAppendProperty(AzureAccount.Property.Tenants, settings.Tenant);
180181
profileClient.InitializeProfile(settings.Environment, new Guid(settings.SubscriptionId),
181182
servicePrincipalAccount,
182183
settings.Credential.Password, settings.StorageAccount);

‎src/Common/Commands.Profile/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.1.3-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.Resources" version="2.18.4-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.Resources" version="2.18.6-preview" targetFramework="net45" />
88
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
99
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

‎src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@
5353
<Reference Include="Microsoft.Azure.Common.NetFramework">
5454
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
5555
</Reference>
56-
<Reference Include="Microsoft.Azure.ResourceManager">
57-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.4-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
56+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57+
<SpecificVersion>False</SpecificVersion>
58+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.6-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
5859
</Reference>
5960
<Reference Include="Microsoft.Azure.Test.Framework">
6061
<HintPath>..\..\packages\Microsoft.Azure.Test.Framework.1.0.5687.28567-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>

‎src/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,15 @@ function Run-ServiceExtensionSetCmdletTests
484484
try
485485
{
486486
# New-AzureDeployment (in Azure.psd1)
487-
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
487+
$testMode = Get-ComputeTestMode;
488+
if ($testMode.ToLower() -ne 'playback')
489+
{
490+
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
491+
}
492+
else
493+
{
494+
$cspkg = "https://${storageName}.blob.azure.windows.net/blob/OneWebOneWorker.cspkg";
495+
}
488496
$cscfg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cscfg';
489497

490498
# Staging 1st
@@ -538,7 +546,15 @@ function Run-ServiceDeploymentExtensionCmdletTests
538546
try
539547
{
540548
# New-AzureDeployment (in Azure.psd1)
541-
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
549+
$testMode = Get-ComputeTestMode;
550+
if ($testMode.ToLower() -ne 'playback')
551+
{
552+
$cspkg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cspkg';
553+
}
554+
else
555+
{
556+
$cspkg = "https://${storageName}.blob.azure.windows.net/blob/OneWebOneWorker.cspkg";
557+
}
542558
$cscfg = '.\Resources\ServiceManagement\Files\OneWebOneWorker.cscfg';
543559

544560
$rdpCfg1 = New-AzureServiceRemoteDesktopExtensionConfig -Credential $credential -Role WebRole1

‎src/Common/Commands.ScenarioTest/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.1.3-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.Resources" version="2.18.4-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.Resources" version="2.18.6-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Test.Framework" version="1.0.5687.28567-prerelease" targetFramework="net45" />
99
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5687.28567-prerelease" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@
5252
<Reference Include="Microsoft.Azure.Common.NetFramework">
5353
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
5454
</Reference>
55-
<Reference Include="Microsoft.Azure.ResourceManager">
56-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.4-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
55+
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<SpecificVersion>False</SpecificVersion>
57+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.6-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
5758
</Reference>
5859
<Reference Include="Microsoft.Azure.Test.Framework">
5960
<HintPath>..\..\packages\Microsoft.Azure.Test.Framework.1.0.5687.28567-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>

0 commit comments

Comments
 (0)