Update buildtools to v3 (dotnet/coreclr#20286)

Commit migrated from https://github.com/dotnet/coreclr/commit/645faa5b24c32741944cad55f58fd66d6c8abfa4

diff --git a/src/coreclr/BuildToolsVersion.txt b/src/coreclr/BuildToolsVersion.txt
index 5d33180..bcc83f1 100644 (file)
--- a/src/coreclr/BuildToolsVersion.txt
+++ b/src/coreclr/BuildToolsVersion.txt
@@ -1 +1 @@
-2.2.0-preview1-03116-01
+3.0.0-preview1-03307-03

diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
index 804bc0a..12a4ed8 100644 (file)
--- a/src/coreclr/dependencies.props
+++ b/src/coreclr/dependencies.props
@@ -25,7 +25,7 @@
   <PropertyGroup>
     <CoreFxCurrentRef>7551558bd7f7806cc9e61b7811b46daff4f735ba</CoreFxCurrentRef>
     <CoreClrCurrentRef>7551558bd7f7806cc9e61b7811b46daff4f735ba</CoreClrCurrentRef>
-    <BuildToolsCurrentRef>e0c1d36d8a19fed21cadfff4890e027bd4c2c214</BuildToolsCurrentRef>
+    <BuildToolsCurrentRef>2c097cd54d4130327754027f301dba5489396f53</BuildToolsCurrentRef>
     <PgoDataCurrentRef>7551558bd7f7806cc9e61b7811b46daff4f735ba</PgoDataCurrentRef>
     <CoreSetupCurrentRef>7551558bd7f7806cc9e61b7811b46daff4f735ba</CoreSetupCurrentRef>
     <IbcDataCurrentRef>7551558bd7f7806cc9e61b7811b46daff4f735ba</IbcDataCurrentRef>
@@ -127,7 +127,7 @@
       <ElementName>MicrosoftNETCoreAppPackageVersion</ElementName>
       <PackageId>Microsoft.NETCore.App</PackageId>
     </XmlUpdateStep>
-    <!-- <UpdateStep Include="BuildTools">
+    <UpdateStep Include="BuildTools">
       <UpdaterType>File</UpdaterType>
       <Path>$(MSBuildThisFileDirectory)BuildToolsVersion.txt</Path>
       <PackageId>Microsoft.DotNet.BuildTools</PackageId>
@@ -136,7 +136,7 @@
        <Path>$(MSBuildThisFileFullPath)</Path>
        <ElementName>FeedTasksPackageVersion</ElementName>
        <PackageId>$(FeedTasksPackage)</PackageId>
-    </XmlUpdateStep> -->
+    </XmlUpdateStep>
     <XmlUpdateStep Include="PgoData">
       <Path>$(MSBuildThisFileFullPath)</Path>
       <ElementName>PgoDataPackageVersion</ElementName>

diff --git a/src/coreclr/tests/src/dir.props b/src/coreclr/tests/src/dir.props
index 9c367e2..b56c686 100644 (file)
--- a/src/coreclr/tests/src/dir.props
+++ b/src/coreclr/tests/src/dir.props
@@ -46,6 +46,7 @@
     <OutputPath>$(BaseOutputPathWithConfig)$(BuildProjectRelativeDir)\</OutputPath>
     <TestWorkingDir Condition="'$(TestWorkingDir)'==''">$(BaseOutputPath)\testStagingDir\</TestWorkingDir>
     <TestPath Condition="'$(TestPath)'==''">$(TestWorkingDir)$(OSPlatformConfig)\$(MSBuildProjectName)/</TestPath>
+    <SkipXunitDependencyCopying>true</SkipXunitDependencyCopying>
   </PropertyGroup>
 
   <!-- Disable some standard properties for building our projects -->