Revert change to InitBaseDotnetCli

dotnet · May 3, 2017 · bd5f1ce · bd5f1ce
1 parent 97bb1bc
commit bd5f1ce
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/test/dir.proj b/src/test/dir.proj
@@ -31,18 +31,16 @@
           DependsOnTargets="DetermineTestOutputDirectory">
     <PropertyGroup>
       <TestToolsLocalPath Condition="'$(TestToolsLocalPath)' == ''">$(TestsOutputDir)Tools</TestToolsLocalPath>
+      <BootstrapCommand Condition="'$(OSGroup)' == 'Windows_NT'">powershell -NoProfile -ExecutionPolicy unrestricted -Command "$(MSBuildThisFileDirectory)bootstrap/bootstrap.ps1" -ToolsLocalPath $(TestToolsLocalPath) -Architecture $(TargetArchitecture)</BootstrapCommand>
+      <BootstrapCommand Condition="'$(OSGroup)' != 'Windows_NT'">$(MSBuildThisFileDirectory)bootstrap/bootstrap.sh --toolsLocalPath $(TestToolsLocalPath)</BootstrapCommand>
       <DotnetTestToolCommand Condition="'$(DotnetTestToolCommand)'=='' and '$(OsEnvironment)'!='Unix'">$(TestToolsLocalPath)/dotnetcli/dotnet.exe</DotnetTestToolCommand>
       <DotnetTestToolCommand Condition="'$(DotnetTestToolCommand)'=='' and '$(OsEnvironment)'=='Unix'">$(TestToolsLocalPath)/dotnetcli/dotnet</DotnetTestToolCommand>
     </PropertyGroup>
 
-    <ItemGroup>
-      <SeedCliCopyFiles Include="$(DotnetSdkPath)/**/*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(SeedCliCopyFiles)"
-          DestinationFiles="@(SeedCliCopyFiles->'$(TestToolsLocalPath)/dotnetcli/%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Exec Command="$(BootstrapCommand)" 
+          WorkingDirectory="$(MSBuildThisFileDirectory)bootstrap/" />
   </Target>
 
-
   <Target Name="RestoreTests">
     <ItemGroup>
       <RestoreTest Include="$(TestDir)/**/*.csproj" />