Skip to content

Commit cc00673

Browse files
author
Jianghao Lu
committed
Re-enable ASM tests
1 parent c3b4bf5 commit cc00673

File tree

10 files changed

+19
-49
lines changed

10 files changed

+19
-49
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

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,6 @@
208208
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
209209
<Name>Commands.Common</Name>
210210
</ProjectReference>
211-
212-
<ProjectReference Include="..\Commands.Profile\Commands.Profile.csproj">
213-
<Project>{c60342b1-47d3-4a0e-8081-9b97ce60b7af}</Project>
214-
<Name>Commands.Profile</Name>
215-
</ProjectReference>
216211
<ProjectReference Include="..\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
217212
<Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>
218213
<Name>Commands.ScenarioTests.Common</Name>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,6 @@
188188
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\DscExtensionSettingsSerializer.cs">
189189
<Link>Extension\DSC\DscExtensionSettingsSerializer.cs</Link>
190190
</Compile>
191-
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Exceptions\GetDscResourceException.cs">
192-
<Link>Extension\DSC\GetDscResourceException.cs</Link>
193-
</Compile>
194191
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\ConfigurationParseResult.cs">
195192
<Link>Extension\DSC\ConfigurationParseResult.cs</Link>
196193
</Compile>
@@ -216,6 +213,7 @@
216213
<Compile Include="Extension\Diagnostics\GetAzureVMDiagnosticsExtension.cs" />
217214
<Compile Include="Extension\Diagnostics\RemoveAzureVMDiagnosticsExtension.cs" />
218215
<Compile Include="Extension\Diagnostics\SetAzureVMDiagnosticsExtension.cs" />
216+
<Compile Include="Extension\DSC\GetDscResourceException.cs" />
219217
<Compile Include="Extension\DSC\DscExtensionPublishCmdletCommonBase.cs" />
220218
<Compile Include="Extension\DSC\DscExtensionCmdletCommonBase.cs" />
221219
<Compile Include="Extension\DSC\PublishAzureVMDscConfigurationCommand.cs" />

‎src/ServiceManagement.sln

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
2+
# Visual Studio 14
3+
VisualStudioVersion = 14.0.23107.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}"
66
ProjectSection(SolutionItems) = preProject
@@ -67,9 +67,6 @@ EndProject
6767
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Test", "Common\Commands.Common.Test\Commands.Common.Test.csproj", "{3B48A77B-5956-4A62-9081-92BA04B02B27}"
6868
EndProject
6969
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}"
70-
ProjectSection(SolutionItems) = preProject
71-
ServiceManagement\StorSimple\Commands.StorSimple.Test\Commands.StorSimple.Test.csproj = ServiceManagement\StorSimple\Commands.StorSimple.Test\Commands.StorSimple.Test.csproj
72-
EndProjectSection
7370
EndProject
7471
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager", "ServiceManagement\TrafficManager\Commands.TrafficManager\Commands.TrafficManager.csproj", "{94E96A5C-B5AD-4E10-B13A-3BC16D102AED}"
7572
EndProject
@@ -105,7 +102,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.Comm
105102
EndProject
106103
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}"
107104
EndProject
108-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SMProfile", "Common\Commands.SMProfile\Commands.SMProfile.csproj", "{C60342B1-47D3-4A0E-8081-9B97CE60B7AF}"
105+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "Common\Commands.Profile\Commands.Profile.csproj", "{C60342B1-47D3-4A0E-8081-9B97CE60B7AF}"
106+
EndProject
107+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StorSimple.Test", "ServiceManagement\StorSimple\Commands.StorSimple.Test\Commands.StorSimple.Test.csproj", "{0FA676D5-1349-4086-B33F-65EC2CB7DA41}"
109108
EndProject
110109
Global
111110
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -277,6 +276,10 @@ Global
277276
{C60342B1-47D3-4A0E-8081-9B97CE60B7AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
278277
{C60342B1-47D3-4A0E-8081-9B97CE60B7AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
279278
{C60342B1-47D3-4A0E-8081-9B97CE60B7AF}.Release|Any CPU.Build.0 = Release|Any CPU
279+
{0FA676D5-1349-4086-B33F-65EC2CB7DA41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
280+
{0FA676D5-1349-4086-B33F-65EC2CB7DA41}.Debug|Any CPU.Build.0 = Debug|Any CPU
281+
{0FA676D5-1349-4086-B33F-65EC2CB7DA41}.Release|Any CPU.ActiveCfg = Release|Any CPU
282+
{0FA676D5-1349-4086-B33F-65EC2CB7DA41}.Release|Any CPU.Build.0 = Release|Any CPU
280283
EndGlobalSection
281284
GlobalSection(SolutionProperties) = preSolution
282285
HideSolutionNode = FALSE
@@ -302,5 +305,6 @@ Global
302305
{CA82D500-1940-4068-A076-D7A8AD459FB0} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
303306
{C1BDA476-A5CC-4394-914D-48B0EC31A710} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
304307
{3819D8A7-C62C-4C47-8DDD-0332D9CE1252} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
308+
{0FA676D5-1349-4086-B33F-65EC2CB7DA41} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
305309
EndGlobalSection
306310
EndGlobal

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,6 @@
608608
<Project>{65c3a86a-716d-4e7d-ab67-1db00b3bf72d}</Project>
609609
<Name>Commands.Common.Storage</Name>
610610
</ProjectReference>
611-
<ProjectReference Include="..\..\..\Common\Commands.Profile\Commands.Profile.csproj">
612-
<Project>{c60342b1-47d3-4a0e-8081-9b97ce60b7af}</Project>
613-
<Name>Commands.Profile</Name>
614-
</ProjectReference>
615611
<ProjectReference Include="..\..\..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
616612
<Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>
617613
<Name>Commands.ScenarioTests.Common</Name>

‎src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,6 @@
196196
<Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>
197197
<Name>Commands.ScenarioTests.Common</Name>
198198
</ProjectReference>
199-
<ProjectReference Include="..\..\..\Common\Commands.SMProfile\Commands.SMProfile.csproj">
200-
<Project>{c60342b1-47d3-4a0e-8081-9b97ce60b7af}</Project>
201-
<Name>Commands.SMProfile</Name>
202-
</ProjectReference>
203199
<ProjectReference Include="..\..\Services\Commands.Test.Utilities\Commands.Test.Utilities.csproj">
204200
<Project>{bc420543-c04e-4bf3-96e1-cd81b823bdd7}</Project>
205201
<Name>Commands.Test.Utilities</Name>

‎src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,6 @@
212212
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
213213
<Name>Commands.Common</Name>
214214
</ProjectReference>
215-
216-
<ProjectReference Include="..\..\..\Common\Commands.Profile\Commands.Profile.csproj">
217-
<Project>{c60342b1-47d3-4a0e-8081-9b97ce60b7af}</Project>
218-
<Name>Commands.Profile</Name>
219-
</ProjectReference>
220215
<ProjectReference Include="..\..\..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
221216
<Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>
222217
<Name>Commands.ScenarioTests.Common</Name>

‎src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,10 +416,6 @@
416416
<Project>{45c2d687-e0ce-4c97-b731-335834dc2bf2}</Project>
417417
<Name>Commands.ExpressRoute</Name>
418418
</ProjectReference>
419-
<ProjectReference Include="..\..\..\Common\Commands.Profile\Commands.Profile.csproj">
420-
<Project>{c60342b1-47d3-4a0e-8081-9b97ce60b7af}</Project>
421-
<Name>Commands.Profile</Name>
422-
</ProjectReference>
423419
<ProjectReference Include="..\Commands.Test.Utilities\Commands.Test.Utilities.csproj">
424420
<Project>{bc420543-c04e-4bf3-96e1-cd81b823bdd7}</Project>
425421
<Name>Commands.Test.Utilities</Name>

‎src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -696,11 +696,6 @@
696696
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
697697
<Name>Commands.Common</Name>
698698
</ProjectReference>
699-
700-
<ProjectReference Include="..\..\..\Common\Commands.Profile\Commands.Profile.csproj">
701-
<Project>{c60342b1-47d3-4a0e-8081-9b97ce60b7af}</Project>
702-
<Name>Commands.Profile</Name>
703-
</ProjectReference>
704699
</ItemGroup>
705700
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
706701
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />

‎src/ServiceManagement/Services/Commands/Commands.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,11 +350,6 @@
350350
<None Include="Performance\Microsoft.ServiceBus.MessagingPerformanceCounters.man" />
351351
</ItemGroup>
352352
<ItemGroup>
353-
354-
<ProjectReference Include="..\..\..\Common\Commands.Profile\Commands.Profile.csproj">
355-
<Project>{c60342b1-47d3-4a0e-8081-9b97ce60b7af}</Project>
356-
<Name>Commands.Profile</Name>
357-
</ProjectReference>
358353
<ProjectReference Include="..\Commands.Utilities\Commands.Utilities.csproj">
359354
<Project>{4900ec4e-8deb-4412-9108-0bc52f81d457}</Project>
360355
<Name>Commands.Utilities</Name>

0 commit comments

Comments
 (0)