Fixed dnx test issue for empty test list.

AzureSDKAutomation · Apr 27, 2016 · 20f0f4f · 20f0f4f
1 parent 1cdfd3f
commit 20f0f4f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/build.proj b/build.proj
@@ -134,7 +134,7 @@
     -->
     <!-- Restoring everyting from the root folder wipes out Storage nuget references and adds Storage project reference to all projects. -->
     <Exec Command="dnu restore $(_TemporaryDnxFeeds)" WorkingDirectory="%(Dnx_AutoRestLibraries.Library)" Condition=" @(Dnx_AutoRestLibraries) != '' "/>
-    <Exec Command="dnu restore $(_TemporaryDnxFeeds)" WorkingDirectory="%(Dnx_AutoRestLibraries.Test)" Condition=" @(Dnx_AutoRestLibraries) != '' and '$(Configuration)' != 'Release' "/>
+    <Exec Command="dnu restore $(_TemporaryDnxFeeds)" WorkingDirectory="%(Dnx_AutoRestLibraries.Test)" Condition=" @(Dnx_AutoRestLibraries) != '' and '%(Dnx_AutoRestLibraries.Test)' != '' and '$(Configuration)' != 'Release' "/>
 
     <CallTarget Targets="BuildDnxLibraries" Condition=" @(Dnx_AutoRestLibraries) != '' " />
     <CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
@@ -177,7 +177,7 @@
     <!--Based on https://github.com/xunit/xunit/issues/653, only xml is supported -->
     <Exec Command="dnx test -xml &quot;$(MSBuildProjectDirectory)\TestResults\%(Dnx_AutoRestLibraries.Filename).xml&quot;" 
           WorkingDirectory="%(Dnx_AutoRestLibraries.Test)"
-          Condition=" @(Dnx_AutoRestLibraries) != '' "/>
+          Condition=" @(Dnx_AutoRestLibraries) != '' and '%(Dnx_AutoRestLibraries.Test)' != '' "/>
   </Target>
 
   <PropertyGroup>