Skip to content

Commit

Permalink
skipping building clientruntime if publishing test projects
Browse files Browse the repository at this point in the history
  • Loading branch information
shahabhijeet committed Jan 7, 2017
1 parent 0e59d48 commit c49dd04
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@
<LibrariesToBuild Include="$(LibrarySourceFolder)\**\*.sln" Condition=" '$(Scope)' == 'all' " />
<LibraryFxTargetList Include="$(FxTargetList)" />
<AutoRestLibraryFxTargetList Include="portable;net45" />
<ClientRuntimeProjects Include="$(LibrarySourceFolder)\ClientRuntime\**\*.xproj" />
<ClientRuntimeTests Include="$(LibrarySourceFolder)\ClientRuntime\*.Tests\*.xproj" />
<ClientRuntimeProjects Include="$(LibrarySourceFolder)\ClientRuntime\**\*.xproj"/>
<ClientRuntimeTests Include="$(LibrarySourceFolder)\ClientRuntime\*.Tests\*.xproj"/>
<ClientRuntimeRootDir Include="%(ClientRuntimeProjects.RootDir)"/>
</ItemGroup>

<Import Condition="$(PublishTestProjects) == 'true'" Project="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks\Build.Tasks.Tests\PublishNugetPackageTests.proj" />
Expand All @@ -80,7 +81,7 @@
<UsingTask TaskName="BuildProjectTemplatesTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" />

<!-- Building ClientRuntime projects -->
<Target Name="BuildClientRuntime">
<Target Name="BuildClientRuntime" Condition="Exists($(ClientRuntimeRootDir))">
<Exec Command="dotnet restore" WorkingDirectory="%(ClientRuntimeProjects.RootDir)\%(ClientRuntimeProjects.Directory)"/>
<Exec Command="dotnet build --configuration $(Configuration)" WorkingDirectory="%(ClientRuntimeProjects.RootDir)\%(ClientRuntimeProjects.Directory)"/>
</Target>
Expand Down Expand Up @@ -130,16 +131,11 @@

<!--Do not build old libraries except Authentication, which Azure PowerShell still uses-->
<ItemGroup>
<NonAutoRestLibraries Include="$(LibrarySourceFolder)\Authentication\Authentication.sln"
Condition=" '$(Scope)' == 'all' or '$(Scope)' == 'Authentication' " />
<!--
<NonAutoRestLibraries Include="$(LibrarySourceFolder)\Authentication\Authentication.sln"
Condition=" ('$(Scope)' == 'all' or '$(Scope)' == 'Authentication') and Exists('$(LibrarySourceFolder)\Authentication\Authentication.sln')" />
-->

<NonAutoRestLibraries Include="$(LibrarySourceFolder)\Authentication\Authentication.sln"
Condition=" '$(Scope)' == 'all' or '$(Scope)' == 'Authentication' " />
</ItemGroup>
<Message Text="Non-AutoRest Libraries: @(NonAutoRestLibraries)" />

<Message Text="Non-AutoRest Libraries: @(NonAutoRestLibraries)" />
<Message Text="Ensure 7zip is available" />
<Exec
Command="$(LibraryToolsFolder)\AzCopy\AzCopy.exe /Source:https://azuresdktools.blob.core.windows.net/7-zip /S /Dest:$(ZipExeFolder) /Y"
Expand Down

0 comments on commit c49dd04

Please sign in to comment.