Decompose Crossgen, remove CleanPublishOutput, replace ExtractArchive…

… with *FileExtractToDirectory (#3927) * Eliminate CleanPublishOutput * Decompose Crossgen Task * WiP * TarGzFileExtractToDirectory * FixModeFlags --> CHMod Also various eliminations of dead code * Tasks cleanup Move all tasks to .tasks file. There is little value in keepint them in each source file as they are already being used assumptively by files that happen to get executed later. Also eliminating uses of <Exec> for DotNet invocations * Move to BuildTools implementation of TarGzCreateFromDirectory * Eliminate Command.cs and helpers * Remove dead code * Revert TarGz from BuildTools Latest build tools package has not picked up the task, though it is checked in. * Disable ChMod on Windows * Windows bug fix * PR Feedback * Finish changing Chmod caps
dotnet · Jul 26, 2016 · 5ebc6a1 · 5ebc6a1
1 parent ee8a01b
commit 5ebc6a1
Show file tree

Hide file tree

Showing 50 changed files with 827 additions and 1,645 deletions.
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
@@ -1 +1 @@
-1.0.26-prerelease-00607-01
+1.0.26-prerelease-00621-06
diff --git a/build.proj b/build.proj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="BuildTheWholeCli" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="build/Microsoft.DotNet.Cli.Monikers.props" />
-  
+
   <PropertyGroup>
     <!--
       $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
@@ -29,10 +29,11 @@
     <CoreCLRVersion>1.0.2</CoreCLRVersion>
     <JitVersion>1.0.2</JitVersion>
 
-    <Stage0Path>$(RepoRoot)/.dotnet_stage0/$(Architecture)</Stage0Path>
     <ExeExtension>.exe</ExeExtension>
     <ExeExtension Condition=" '$(OS)' != 'Windows_NT' "></ExeExtension>
-    <DotnetStage0>$(Stage0Path)/dotnet$(ExeExtension)</DotnetStage0>
+
+    <Stage0Directory>$(RepoRoot)/.dotnet_stage0/$(Architecture)</Stage0Directory>
+    <DotnetStage0>$(Stage0Directory)/dotnet$(ExeExtension)</DotnetStage0>
 
     <DotnetCliBuildDirectory>$(RepoRoot)/build_projects/dotnet-cli-build</DotnetCliBuildDirectory>
   </PropertyGroup>
@@ -56,7 +57,7 @@
                             RestoreDotnetCliBuildFramework">
 
     <ItemGroup>
-      <DotnetSdkDirectories Include="$([System.IO.Directory]::GetDirectories(&quot;$(Stage0Path)/sdk&quot;))" />
+      <DotnetSdkDirectories Include="$([System.IO.Directory]::GetDirectories(&quot;$(Stage0Directory)/sdk&quot;))" />
       <AzureStorageToCopy Include="@(DotnetSdkDirectories)">
         <Source>$(DotnetCliBuildDirectory)/bin/Microsoft.WindowsAzure.Storage.dll</Source>
         <Destination>%(Identity)/Microsoft.WindowsAzure.Storage.dll</Destination>
@@ -82,6 +83,6 @@
   <Import Project="build/Microsoft.DotNet.Cli.Prepare.targets" />
   <Import Project="build/Microsoft.DotNet.Cli.Compile.targets" />
   <Import Project="build/Microsoft.DotNet.Cli.Package.targets" />
-  <Import Project="build/Microsoft.DotNet.Cli.Test.targets" /> 
+  <Import Project="build/Microsoft.DotNet.Cli.Test.targets" />
   <Import Project="build/Microsoft.DotNet.Cli.Publish.targets" />
 </Project>
diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="compile/Microsoft.DotNet.Cli.LzmaArchive.targets" />
+  <Import Project="crossgen/Microsoft.DotNet.Cli.Crossgen.targets" />
 
-  <UsingTask TaskName="FixModeFlags" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="ChangeEntryPointLibraryName" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="RemoveAssetFromDepsPackages" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="CleanPublishOutput" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="CrossgenDirectory" AssemblyFile="$(CLIBuildDll)" />    
+  <ItemGroup>
+    <PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
+  </ItemGroup>
 
   <Target Name="Compile" DependsOnTargets="Prepare;
                                            SetupStage;
                                            CompileStage;
                                            BuildProjectsForNuGetPackages;
                                            GenerateNuGetPackagesArchive" />
 
-  <Target Name="SetupStage">
+  <Target Name="SetupStage"
+          DependsOnTargets="Prepare">
     <PropertyGroup>
       <SrcDirectory>$(RepoRoot)/src</SrcDirectory>
     </PropertyGroup>
@@ -27,18 +27,20 @@
         <Inputs>@(CompileStageInputs)</Inputs>
         <StageDirectory>$(Stage1Directory)</StageDirectory>
         <StageSymbolsDirectory>$(Stage1SymbolsDirectory)</StageSymbolsDirectory>
-        <DotnetExe>$(DotnetStage0)</DotnetExe>
+        <DotnetDir>$(Stage0Directory)</DotnetDir>
       </Stage>
       <Stage Include="Stage2">
         <Inputs>@(CompileStageInputs)</Inputs>
         <StageDirectory>$(Stage2Directory)</StageDirectory>
         <StageSymbolsDirectory>$(Stage2SymbolsDirectory)</StageSymbolsDirectory>
-        <DotnetExe>$(DotnetStage1)</DotnetExe>
-      </Stage>          
-    </ItemGroup>    
-  </Target>    
+        <DotnetDir>$(Stage1Directory)</DotnetDir>
+      </Stage>
+    </ItemGroup>
+  </Target>
 
   <Target Name="CompileStage"
+          DependsOnTargets="SetupStage;
+                            InitCrossgenProps;"
           Inputs="%(Stage.Inputs)"
           Outputs="%(StageDirectory)/sdk/$(SdkVersion)/dotnet.dll">
       <PropertyGroup>
@@ -55,21 +57,26 @@
 
         <StageDirectory>%(Stage.StageDirectory)</StageDirectory>
         <StageSymbolsDirectory>%(Stage.StageSymbolsDirectory)</StageSymbolsDirectory>
-        <SdkOutputDirectory>$(StageDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>            
+        <SdkOutputDirectory>$(StageDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
         <BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
         <BinaryToCorehostifyOutDir>$(SdkOutputDirectory)/$(BinaryToCorehostifyRelDir)</BinaryToCorehostifyOutDir>
         <MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
-        
+
         <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
       </PropertyGroup>
 
       <ItemGroup>
+        <BinObj Remove="*" />
         <BinObj Include="$(SrcDirectory)/**/bin/**/*" />
         <BinObj Include="$(SrcDirectory)/**/obj/**/*" />
+
+        <FilesToRemoveFromStageDirectory Remove="*" />
         <FilesToRemoveFromStageDirectory Include="$(StageDirectory)/**/*" />
 
+        <SharedFramework Remove="*" />
         <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
 
+        <BinariesToRemove Remove="*" />
         <BinariesToRemove Include="csc" />
         <BinariesToRemove Include="vbc" />
       </ItemGroup>
@@ -83,22 +90,45 @@
       <!-- CopySharedFramework -->
       <Copy SourceFiles="@(SharedFramework)"
             DestinationFiles="@(SharedFramework->'$(StageDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
-    
+
       <!-- Publish DotNet -->
-      <Exec Command="%(Stage.DotnetExe) publish
-                     --native-subdirectory
-                     --output $(SdkOutputDirectory)
-                     --configuration $(Configuration)
-                     --version-suffix $(CommitCount)
-                     $(SrcDirectory)/dotnet" />
+      <DotNetPublish ToolPath="%(Stage.DotnetDir)"
+                     NativeSubdirectory="True"
+                     Output="$(SdkOutputDirectory)"
+                     Configuration="$(Configuration)"
+                     VersionSuffix="$(CommitCount)"
+                     ProjectPath="$(SrcDirectory)/dotnet" />
 
       <!-- Corehostify Binaries -->
-      <FixModeFlags Dir="$(SdkOutputDirectory)" />
+      <ItemGroup Condition=" '$(OSName)' != 'win' ">
+        <SdkOutputChmodTargets Remove="*" />
+        <SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*.exe;
+                                      $(SdkOutputDirectory)/**/*.dll" >
+          <!-- Managed assemblies do not need execute -->
+          <Mode>u=rw,g=r,o=r</Mode>
+        </SdkOutputChmodTargets>
+
+        <SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*.dylib;
+                                      $(SdkOutputDirectory)/**/*.so" >
+          <!-- Generally, dylibs and sos have 'x' -->
+          <Mode>u=rwx,g=rx,o=rx</Mode>
+        </SdkOutputChmodTargets>
+
+        <SdkOutputChmodTargets Include="$(SdkOutputDirectory)/**/*"
+                             Exclude="$(SdkOutputDirectory)/**/*.*" >
+          <!-- Executables need x -->
+          <Mode>u=rwx,g=rx,o=rx</Mode>
+        </SdkOutputChmodTargets>
+      </ItemGroup>
 
-      <Exec Command="%(Stage.DotnetExe) publish
-                     --output $(SdkOutputDirectory)
-                     --framework netcoreapp1.0
-                     $(SrcDirectory)/compilers" />
+      <Chmod Condition=" '$(OSName)' != 'win' "
+             File="%(SdkOutputChModTargets.FullPath)"
+             Mode="%(SdkOutputChModTargets.Mode)" />
+
+      <DotNetPublish ToolPath="%(Stage.DotnetDir)"
+                     Output="$(SdkOutputDirectory)"
+                     Framework="netcoreapp1.0"
+                     ProjectPath="$(SrcDirectory)/compilers" />
 
       <Copy SourceFiles="$(BinaryToCorehostifyOutDir)/csc.exe"
             DestinationFiles="$(SdkOutputDirectory)/csc.dll" />
@@ -112,7 +142,7 @@
       <Copy SourceFiles="$(SdkOutputDirectory)/compilers.runtimeconfig.json"
             DestinationFiles="$(SdkOutputDirectory)/csc.runtimeconfig.json" />
 
-      <ChangeEntryPointLibraryName 
+      <ChangeEntryPointLibraryName
             DepsFile="$(SdkOutputDirectory)/csc.deps.json"
             NewName="csc.deps.json" />
 
@@ -124,10 +154,7 @@
                                    AssetPath="$(BinaryToCorehostifyRelDir)/%(BinariesToRemove.Identity).exe" />
 
       <!-- cleanup compilers project output we don't need -->
-      <CleanPublishOutput Path="$(SdkOutputDirectory)"
-                          Name="compilers"
-                          DeleteRuntimeConfigJson="true"
-                          DeleteDepsJson="true" />
+      <Delete Files="$(SdkOutputDirectory)/compilers%(PublishOutputExtensions.Identity)" />
 
       <!-- Copy Host to SDK Directory -->
       <Copy SourceFiles="$(SharedFrameworkNameVersionPath)/$(DotnetHostBaseName)"
@@ -139,10 +166,37 @@
       <Copy SourceFiles="$(SharedFrameworkNameVersionPath)/$(HostPolicyBaseName)"
             DestinationFiles="$(SdkOutputDirectory)/$(HostPolicyBaseName)" />
 
-      <CrossgenDirectory CoreCLRVersion="$(CoreCLRVersion)"
-                         JitVersion="$(JitVersion)"
-                         SharedFrameworkNameVersionPath="$(SharedFrameworkNameVersionPath)"
-                         SdkOutputDirectory="$(SdkOutputDirectory)" />
+      <!-- Crossgen the Shared Framework -->
+      <ItemGroup>
+        <SdkFiles Remove="*" />
+        <SdkFiles Include="$(SdkOutputDirectory)/**/*" />
+        <SdkFilesWithPEMarker Remove="*" />
+      </ItemGroup>
+
+      <AddMetadataIsPE Items="@(SdkFiles)">
+        <Output TaskParameter="ResultItems" ItemName="SdkFilesWithPEMarker" />
+      </AddMetadataIsPE>
+
+      <ItemGroup>
+        <CrossgenTargets Remove="*" />
+        <CrossgenTargets Include="%(SdkFilesWithPEMarker.FullPath)" Condition=" '%(SdkFilesWithPEMarker.IsPE)' == 'True' " />
+
+        <CompileStageSdkDirectories Remove="*" />
+      </ItemGroup>
+
+      <RemoveDuplicates Inputs="@(SdkFiles->'%(RootDir)%(Directory)')">
+        <Output TaskParameter="Filtered" ItemName="CompileStageSdkDirectories" />
+      </RemoveDuplicates>
+
+      <Crossgen Condition=" '$(DISABLE_CROSSGEN)' != '1' "
+                SourceAssembly="%(CrossgenTargets.FullPath)"
+                DestinationPath="%(CrossgenTargets.FullPath)"
+                JITPath="$(LibCLRJitPath)"
+                CrossgenPath="$(CrossgenPath)"
+                ReadyToRun="True"
+                PlatformAssemblyPaths="@(PlatformAssemblies);
+                                       $(SharedFrameworkNameVersionPath);
+                                       @(CompileStageSdkDirectories)" />
 
       <!-- Generate .version file -->
       <WriteLinesToFile File="$(SdkOutputDirectory)/.version"

diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <UsingTask TaskName="GetCurrentRuntimeInformation" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="GenerateBuildVersionInfo" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="SetEnvVar" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="DotNetBuild" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="DotNetPack" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="DotNetRestore" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="DotNetTest" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="DownloadFile" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="ExtractArchive" AssemblyFile="$(CLIBuildDll)" />
-  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(BuildToolsDir)/Microsoft.DotNet.Build.Tasks.dll"/>
-
+  <Import Project="Microsoft.DotNet.Cli.tasks" />
   <Import Project="prepare/CheckPrereqs.targets" />
 
   <Target Name="Prepare"
@@ -32,11 +22,17 @@
       <Output TaskParameter="OSName" PropertyName="OSName" />
     </GetCurrentRuntimeInformation>
 
+    <!-- NuGet Information -->
+    <PropertyGroup>
+      <NuGetPackagesDir>$(NUGET_PACKAGES)</NuGetPackagesDir>
+      <NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>
+    </PropertyGroup>
+
     <!-- Common Properties -->
     <PropertyGroup>
       <IsDesktopAvailable>False</IsDesktopAvailable>
       <IsDesktopAvailable Condition=" '$(OSName)' == 'win' ">True</IsDesktopAvailable>
-      <DotNetPath>$(Stage0Path)</DotNetPath>
+      <DotNetPath>$(Stage0Directory)</DotNetPath>
 
       <BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
       <ToolsOutputDirectory>$(BaseOutputDirectory)/tools</ToolsOutputDirectory>
@@ -53,11 +49,14 @@
       <SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
     </PropertyGroup>
 
+    <GetCommitHash RepoRoot="$(RepoRoot)">
+      <Output TaskParameter="CommitHash" PropertyName="CommitHash" />
+    </GetCommitHash>
+
     <GenerateBuildVersionInfo RepoRoot="$(RepoRoot)">
       <Output TaskParameter="VersionMajor" PropertyName="VersionMajor" />
       <Output TaskParameter="VersionMinor" PropertyName="VersionMinor" />
       <Output TaskParameter="VersionPatch" PropertyName="VersionPatch" />
-      <Output TaskParameter="CommitHash" PropertyName="CommitHash" />
       <Output TaskParameter="CommitCount" PropertyName="CommitCount" />
       <Output TaskParameter="ReleaseSuffix" PropertyName="ReleaseSuffix" />
       <Output TaskParameter="VersionSuffix" PropertyName="VersionSuffix" />
@@ -91,6 +90,12 @@
       <ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' Or '$(Rid)' == 'fedora.23-x64' Or '$(Rid)' == 'opensuse.13.2-x64' ">$(Rid)</ProductMonikerRid>
       <ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
 
+      <DynamicLibPrefix>lib</DynamicLibPrefix>
+      <DynamicLibPrefix Condition=" '$(OSName)' == 'win' "></DynamicLibPrefix>
+      <DynamicLibExtension>.so</DynamicLibExtension>
+      <DynamicLibExtension Condition=" '$(OSName)' == 'win' ">.dll</DynamicLibExtension>
+      <DynamicLibExtension Condition=" '$(OSName)' == 'osx' ">.dylib</DynamicLibExtension>
+
       <ArtifactNameSdk>dotnet-sdk</ArtifactNameSdk>
       <ArtifactNameSdkDebug>dotnet-sdk-debug</ArtifactNameSdkDebug>
       <ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-dev</ArtifactNameCombinedHostHostFxrFrameworkSdk>
@@ -133,14 +138,14 @@
                                Condition="!Exists('$(CombinedSharedHostAndFrameworkArchive)')">
         <Url>$(SharedFrameworkArchiveBlobRootUrl)/$(CombinedFrameworkHostCompressedFileName)</Url>
         <DownloadFileName>$(CombinedSharedHostAndFrameworkArchive)</DownloadFileName>
-        <ExtractDestintation>$(SharedFrameworkPublishDirectory)</ExtractDestintation>
+        <ExtractDestination>$(SharedFrameworkPublishDirectory)</ExtractDestination>
       </_DownloadAndExtractItem>
 
       <_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile"
                                Condition="!Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
         <Url>$(CoreSetupInstallerBlobRootUrl)/$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName)</Url>
         <DownloadFileName>$(DownloadedSharedFrameworkInstallerFile)</DownloadFileName>
-        <ExtractDestintation></ExtractDestintation>
+        <ExtractDestination></ExtractDestination>
       </_DownloadAndExtractItem>
 
       <_DownloadAndExtractItem Include="DownloadedSharedHostInstallerFile"
@@ -166,9 +171,15 @@
                   Uri="%(_DownloadAndExtractItem.Url)"
                   DestinationPath="%(_DownloadAndExtractItem.DownloadFileName)" />
 
-    <ExtractArchive Condition=" '%(_DownloadAndExtractItem.ExtractDestintation)' != '' "
-                    InputFile="%(_DownloadAndExtractItem.DownloadFileName)"
-                    DestinationDirectory="%(_DownloadAndExtractItem.ExtractDestintation)" />
+    <ZipFileExtractToDirectory Condition=" '%(_DownloadAndExtractItem.ExtractDestination)' != '' AND '$(OSName)' == 'win' "
+                               SourceArchive="%(_DownloadAndExtractItem.DownloadFileName)"
+                               DestinationDirectory="%(_DownloadAndExtractItem.ExtractDestination)"
+                               OverwriteDestination="True" />
+
+    <TarGzFileExtractToDirectory Condition=" '%(_DownloadAndExtractItem.ExtractDestination)' != '' AND '$(OSName)' != 'win' "
+                               SourceArchive="%(_DownloadAndExtractItem.DownloadFileName)"
+                               DestinationDirectory="%(_DownloadAndExtractItem.ExtractDestination)"
+                               OverwriteDestination="True" />
   </Target>
 
   <Target Name="RestorePackages"

diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <UsingTask TaskName="AddMetadataIsPE" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="ChangeEntryPointLibraryName" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="ChMod" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="Crossgen" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetBuild" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetNew" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetPack" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetPublish" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetRestore" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DotNetTest" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="DownloadFile" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="FinalizeBuild" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="GenerateBuildVersionInfo" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="GenerateGuidFromName" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="GetCommitHash" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="GetCurrentRuntimeInformation" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="MakeRelative" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="RemoveAssetFromDepsPackages" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="SetBlobPropertiesBasedOnFileType" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="SetEnvVar" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="TarGzFileCreateFromDirectory" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="TarGzFileExtractToDirectory" AssemblyFile="$(CLIBuildDll)" />
+  <UsingTask TaskName="UploadToAzure" AssemblyFile="$(BuildToolsTaskDir)/Microsoft.DotNet.Build.CloudTestTasks.dll"/>
+  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(BuildToolsDir)/Microsoft.DotNet.Build.Tasks.dll"/>
+  <UsingTask TaskName="ZipFileExtractToDirectory" AssemblyFile="$(BuildToolsDir)/Microsoft.DotNet.Build.Tasks.dll"/>
+</Project>