Skip to content

Commit 2d14ea8

Browse files
author
Jianghao Lu
committed
Merge pull request #886 from ljhljh235/ogailpsget
Fix ResourceManager.sln
2 parents 2d1652f + 3855e64 commit 2d14ea8

36 files changed

+149
-244
lines changed

‎AzurePowershell.Test.targets

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
<ItemGroup>
4646
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
4747
<XUnitTests Include=".\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll"/>
48-
<XUnitTests Include=".\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>
48+
<!--<XUnitTests Include=".\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>-->
4949
<XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>
50-
<XUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
51-
<XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
50+
<!--<XUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>-->
51+
<!--<XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>-->
5252
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
5353
<XUnitTests Include=".\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll"/>
5454
<XUnitTests Include=".\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.Test.dll"/>
@@ -60,12 +60,12 @@
6060
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
6161
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
6262
<XUnitTests Include=".\src\ResourceManager\Commerce\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>
63-
<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
64-
<XUnitTests Include=".\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll"/>
65-
<XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
66-
<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
63+
<!--<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>-->
64+
<!--<XUnitTests Include=".\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll"/>-->
65+
<!--<XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>-->
66+
<!--<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>-->
6767
<XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
68-
<XUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
68+
<!--<XUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>-->
6969
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
7070
</ItemGroup>
7171

‎build.proj

Lines changed: 51 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
<BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<AzurePowerShellSln Include=".\src\AzurePowerShell.sln" />
23+
<AzureResourceManagerSln Include=".\src\ResourceManager.sln" />
24+
<AzureServiceManagementSln Include=".\src\ServiceManagement.sln" />
2425
<SetupSln Include=".\setup\azurepowershell.sln" />
2526
</ItemGroup>
2627

@@ -33,21 +34,31 @@
3334
<!-- Clean the solutions -->
3435
<Message Importance="high" Text="Cleaning Cmdlets..." ContinueOnError="false" />
3536
<MSBuild
36-
Projects="@(AzurePowerShellSln)"
37+
Projects="@(AzureResourceManagerSln)"
3738
Targets="Clean"
3839
Properties="$(DebugBuildConfig)"
3940
ContinueOnError="false" />
4041
<MSBuild
41-
Projects="@(AzurePowerShellSln)"
42+
Projects="@(AzureResourceManagerSln)"
4243
Targets="Clean"
4344
Properties="$(ReleaseBuildConfig)"
4445
ContinueOnError="false" />
46+
<!--<MSBuild
47+
Projects="@(AzureServiceManagementSln)"
48+
Targets="Clean"
49+
Properties="$(DebugBuildConfig)"
50+
ContinueOnError="false" />
51+
<MSBuild
52+
Projects="@(AzureServiceManagementSln)"
53+
Targets="Clean"
54+
Properties="$(ReleaseBuildConfig)"
55+
ContinueOnError="false" />-->
4556
<MSBuild
4657
Projects="@(SetupSln)"
4758
Targets="Clean"
4859
Properties="$(DebugBuildConfig)"
4960
ContinueOnError="false" />
50-
61+
5162
<!-- Delete the publish files -->
5263
<Message Importance="high" Text="Cleaning publish files..." ContinueOnError="false" />
5364
<ItemGroup>
@@ -74,9 +85,9 @@
7485
</Target>
7586

7687
<PropertyGroup>
77-
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
78-
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
79-
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
88+
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
89+
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
90+
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
8091
</PropertyGroup>
8192

8293
<!--
@@ -88,7 +99,7 @@
8899
<NuGetCache Include="$(LOCALAPPDATA)\NuGet\Cache\*.nupkg"/>
89100
</ItemGroup>
90101

91-
<!-- Delete NuGet cache-->
102+
<!-- Delete NuGet cache-->
92103
<Delete Files="@(NuGetCache)" />
93104

94105
<Delete Files="$(NuGetRestoreConfigFile)" />
@@ -113,17 +124,29 @@
113124
<Target Name="BuildCmdlets" DependsOnTargets="ForceRestorePackages">
114125
<Message Importance="high" Text="Building Cmdlets..." />
115126
<MSBuild
116-
Projects="@(AzurePowerShellSln)"
127+
Projects="@(AzureResourceManagerSln)"
117128
Targets="Build"
118129
Properties="$(DebugBuildConfig)"
119130
BuildInParallel="$(BuildInParallel)"
120131
ContinueOnError="false" />
121132
<MSBuild
122-
Projects="@(AzurePowerShellSln)"
133+
Projects="@(AzureResourceManagerSln)"
123134
Targets="Build"
124135
Properties="$(ReleaseBuildConfig)"
125136
BuildInParallel="$(BuildInParallel)"
126137
ContinueOnError="false" />
138+
<!--<MSBuild
139+
Projects="@(AzureServiceManagementSln)"
140+
Targets="Build"
141+
Properties="$(DebugBuildConfig)"
142+
BuildInParallel="$(BuildInParallel)"
143+
ContinueOnError="false" />
144+
<MSBuild
145+
Projects="@(AzureServiceManagementSln)"
146+
Targets="Build"
147+
Properties="$(ReleaseBuildConfig)"
148+
BuildInParallel="$(BuildInParallel)"
149+
ContinueOnError="false" />-->
127150
</Target>
128151

129152
<!-- Build the Setup -->
@@ -136,11 +159,11 @@
136159
Importance="high"
137160
Text="You are required to have installed the WiX Toolset at http://wix.codeplex.com/releases/view/115492 (Wix38.msi)"
138161
ContinueOnError="false" />
139-
<MSBuild
162+
<!--<MSBuild
140163
Projects="@(SetupSln)"
141164
Targets="Build"
142165
Properties="$(DebugBuildConfig)"
143-
ContinueOnError="false" />
166+
ContinueOnError="false" />-->
144167
</Target>
145168

146169
<!-- Build the Setup -->
@@ -153,11 +176,11 @@
153176
Importance="high"
154177
Text="You are required to have installed the WiX Toolset at http://wix.codeplex.com/releases/view/115492 (Wix38.msi)"
155178
ContinueOnError="false" />
156-
<MSBuild
179+
<!--<MSBuild
157180
Projects="@(SetupSln)"
158181
Targets="Build"
159182
Properties="$(ReleaseBuildConfig)"
160-
ContinueOnError="false" />
183+
ContinueOnError="false" />-->
161184
</Target>
162185

163186
<!-- Build the Cmdlets and Setup in all configurations -->
@@ -171,22 +194,34 @@
171194
<Target Name="BuildRelease" DependsOnTargets="ForceRestorePackages">
172195
<Message Importance="high" Text="Building Cmdlets in Release config..." />
173196
<MSBuild
174-
Projects="@(AzurePowerShellSln)"
197+
Projects="@(AzureResourceManagerSln)"
175198
Targets="Build"
176199
Properties="$(ReleaseBuildConfig)"
177200
BuildInParallel="$(BuildInParallel)"
178201
ContinueOnError="false" />
202+
<!--<MSBuild
203+
Projects="@(AzureServiceManagementSln)"
204+
Targets="Build"
205+
Properties="$(ReleaseBuildConfig)"
206+
BuildInParallel="$(BuildInParallel)"
207+
ContinueOnError="false" />-->
179208
</Target>
180209

181210
<!-- Build the Cmdlets in Debug configuration -->
182211
<Target Name="BuildDebug" DependsOnTargets="ForceRestorePackages">
183212
<Message Importance="high" Text="Building Cmdlets in Debug config..." />
184213
<MSBuild
185-
Projects="@(AzurePowerShellSln)"
214+
Projects="@(AzureResourceManagerSln)"
186215
Targets="Build"
187216
Properties="$(DebugBuildConfig)"
188217
BuildInParallel="$(BuildInParallel)"
189218
ContinueOnError="false" />
219+
<!--<MSBuild
220+
Projects="@(AzureServiceManagementSln)"
221+
Targets="Build"
222+
Properties="$(DebugBuildConfig)"
223+
BuildInParallel="$(BuildInParallel)"
224+
ContinueOnError="false" />-->
190225
</Target>
191226

192227
<PropertyGroup>

‎src/ResourceManager.sln

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.Comm
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Cmdlets", "ResourceManager\ResourceManager\Commands.ResourceManager\Cmdlets\Commands.ResourceManager.Cmdlets.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}"
2525
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}"
27-
EndProject
2826
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement", "ResourceManager\ApiManagement\Commands.ApiManagement\Commands.ApiManagement.csproj", "{DC0A9742-DF36-48C9-BD2F-68D01AED6257}"
2927
EndProject
3028
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation", "ResourceManager\Automation\Commands.Automation\Commands.ResourceManagement.Automation.csproj", "{90DEF35A-F7FF-40D0-B008-F489A4C092DB}"
@@ -115,6 +113,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Te
115113
EndProject
116114
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager2.Test", "ResourceManager\TrafficManager\Commands.TrafficManager2.Test\Commands.TrafficManager2.Test.csproj", "{5764A3A4-586C-4536-8481-13007CAC111B}"
117115
EndProject
116+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates.Test", "ResourceManager\Commerce\Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.csproj", "{F220C306-29A3-4511-8518-A58A55C60D07}"
117+
EndProject
118+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites.Test", "ResourceManager\Websites\Commands.Websites.Test\Commands.Websites.Test.csproj", "{13E031E4-8A43-4B87-9D72-D70180C31C11}"
119+
EndProject
120+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}"
121+
EndProject
118122
Global
119123
GlobalSection(SolutionConfigurationPlatforms) = preSolution
120124
Debug|Any CPU = Debug|Any CPU
@@ -145,10 +149,6 @@ Global
145149
{8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU
146150
{8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU
147151
{8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU
148-
{5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
149-
{5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU
150-
{5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU
151-
{5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU
152152
{DC0A9742-DF36-48C9-BD2F-68D01AED6257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153153
{DC0A9742-DF36-48C9-BD2F-68D01AED6257}.Debug|Any CPU.Build.0 = Debug|Any CPU
154154
{DC0A9742-DF36-48C9-BD2F-68D01AED6257}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -329,6 +329,18 @@ Global
329329
{5764A3A4-586C-4536-8481-13007CAC111B}.Debug|Any CPU.Build.0 = Debug|Any CPU
330330
{5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.ActiveCfg = Release|Any CPU
331331
{5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.Build.0 = Release|Any CPU
332+
{F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
333+
{F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.Build.0 = Debug|Any CPU
334+
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.ActiveCfg = Release|Any CPU
335+
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.Build.0 = Release|Any CPU
336+
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
337+
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
338+
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Release|Any CPU.ActiveCfg = Release|Any CPU
339+
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Release|Any CPU.Build.0 = Release|Any CPU
340+
{5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
341+
{5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU
342+
{5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU
343+
{5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU
332344
EndGlobalSection
333345
GlobalSection(SolutionProperties) = preSolution
334346
HideSolutionNode = FALSE
@@ -355,5 +367,7 @@ Global
355367
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
356368
{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
357369
{5764A3A4-586C-4536-8481-13007CAC111B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
370+
{F220C306-29A3-4511-8518-A58A55C60D07} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
371+
{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
358372
EndGlobalSection
359373
EndGlobal

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,6 @@
153153
<Compile Include="ScenarioTests\ApiManagementTests.cs" />
154154
</ItemGroup>
155155
<ItemGroup>
156-
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
157-
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
158-
<Name>Commands.Common</Name>
159-
</ProjectReference>
160156
<ProjectReference Include="..\..\..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
161157
<Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>
162158
<Name>Commands.ScenarioTests.Common</Name>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,6 @@
202202
<Project>{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}</Project>
203203
<Name>Commands.Common.Storage</Name>
204204
</ProjectReference>
205-
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
206-
<Project>{5EE72C53-1720-4309-B54B-5FB79703195F}</Project>
207-
<Name>Commands.Common</Name>
208-
</ProjectReference>
209205
<ProjectReference Include="..\..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
210206
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
211207
<Name>Commands.ResourceManager.Common</Name>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/NewAzureApiManagementHostnameConfiguration.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ namespace Microsoft.Azure.Commands.ApiManagement.Commands
1616
{
1717
using System.Management.Automation;
1818
using Microsoft.Azure.Commands.ApiManagement.Models;
19+
using ResourceManager.Common;
1920
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2021

2122
[Cmdlet(VerbsCommon.New, "AzureApiManagementHostnameConfiguration"), OutputType(typeof (PsApiManagementHostnameConfiguration))]
22-
public class NewAzureApiManagementHostnameConfiguration : AzureSMCmdlet
23+
public class NewAzureApiManagementHostnameConfiguration : AzureRMCmdlet
2324
{
2425
[Parameter(
2526
ValueFromPipelineByPropertyName = false,

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/NewAzureApiManagementVirtualNetwork.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ namespace Microsoft.Azure.Commands.ApiManagement.Commands
1818
using System;
1919
using System.Management.Automation;
2020
using Microsoft.Azure.Commands.ApiManagement.Models;
21+
using ResourceManager.Common;
2122
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2223

2324
[Cmdlet(VerbsCommon.New, "AzureApiManagementVirtualNetwork"), OutputType(typeof(PsApiManagementVirtualNetwork))]
24-
public class NewAzureApiManagementVirtualNetwork : AzureSMCmdlet
25+
public class NewAzureApiManagementVirtualNetwork : AzureRMCmdlet
2526
{
2627
[Parameter(
2728
ValueFromPipelineByPropertyName = false,

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,18 @@
116116
<SpecificVersion>False</SpecificVersion>
117117
<HintPath>..\..\..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
118118
</Reference>
119+
<Reference Include="Microsoft.Threading.Tasks">
120+
<SpecificVersion>False</SpecificVersion>
121+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
122+
</Reference>
123+
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
124+
<SpecificVersion>False</SpecificVersion>
125+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
126+
</Reference>
127+
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
128+
<SpecificVersion>False</SpecificVersion>
129+
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
130+
</Reference>
119131
<Reference Include="Moq">
120132
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
121133
</Reference>

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109
<Compile Include="ScenarioTests\UsageAggregatesTests.cs" />
110110
</ItemGroup>
111111
<ItemGroup>
112-
<ProjectReference Include="..\..\..\Common\Commands.Common.Test\Commands.Common.Test.csproj">
113-
<Project>{3b48a77b-5956-4a62-9081-92ba04b02b27}</Project>
114-
<Name>Commands.Common.Test</Name>
112+
<ProjectReference Include="..\..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
113+
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
114+
<Name>Commands.ResourceManager.Common</Name>
115115
</ProjectReference>
116116
<ProjectReference Include="..\..\..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
117117
<Project>{C1BDA476-A5CC-4394-914D-48B0EC31A710}</Project>

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.WindowsAzure.Commands.ScenarioTest;
16+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
1617
using Xunit;
1718

1819
namespace Microsoft.Azure.Commands.UsageAggregates.Test.ScenarioTests
1920
{
20-
public class UsageAggregatesTests
21+
public class UsageAggregatesTests : RMTestBase
2122
{
2223
[Fact]
2324
[Trait(Category.AcceptanceType, Category.CheckIn)]

0 commit comments

Comments
 (0)