summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBruce Forstall <brucefo@microsoft.com>2019-06-20 13:05:53 -0700
committerBruce Forstall <brucefo@microsoft.com>2019-06-25 17:31:34 -0700
commit9565b16a8d348048c73572d1c4ee8ea9a7fec455 (patch)
tree428faf12b8bb4e104d8090999d2f7c649bb9a3e4 /tests
parent4d8ab39b383e5300adf9b1be451d4d46a982f586 (diff)
downloadcoreclr-9565b16a8d348048c73572d1c4ee8ea9a7fec455.tar.gz
coreclr-9565b16a8d348048c73572d1c4ee8ea9a7fec455.tar.bz2
coreclr-9565b16a8d348048c73572d1c4ee8ea9a7fec455.zip
Expand corefx testing in coreclr repo
Currently, corefx testing is done on Windows/x64. Expand testing to include: 1. Linux/x64, Linux/arm, Linux/arm64, Windows/x86 platforms. Windows/arm should be added after corefx official builds publish tests and test manifest. Windows/arm64 should be added after corefx tests are published, and we have sufficient hardware. 2. All JIT stress modes that are used in normal coreclr testing. Testing is split into 4 Azure DevOps Pipelines: coreclr-corefx, coreclr-corefx-jitstress, coreclr-corefx-jitstressregs, and coreclr-corefx-jitstress2-jitstressregs. In addition, we now use the corefx meta-package Microsoft.Private.CoreFx.OOB instead of a list of individual assemblies when constructing the testhost.
Diffstat (limited to 'tests')
-rw-r--r--tests/dir.props10
-rw-r--r--tests/runtest.proj83
-rw-r--r--tests/src/Common/CoreFX/CoreFX.depproj264
3 files changed, 128 insertions, 229 deletions
diff --git a/tests/dir.props b/tests/dir.props
index 296a29a4d7..5e31468e4c 100644
--- a/tests/dir.props
+++ b/tests/dir.props
@@ -54,6 +54,8 @@
<BinDir>$(__BinDir)\</BinDir>
<BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)Product\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir>
+ <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(BuildOS).$(BuildArch).$(BuildType)\</TestWorkingDir>
+
<AltJitArch>$(__AltJitArch)</AltJitArch>
</PropertyGroup>
@@ -132,5 +134,13 @@
<PropertyGroup>
<CLRTestPriorityToBuild>0</CLRTestPriorityToBuild>
</PropertyGroup>
+
+ <!-- Where to put a "testhost" for running corefx tests -->
+ <PropertyGroup>
+ <TestHostVersion>$(ProductVersion)</TestHostVersion>
+ <TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(TestWorkingDir)', 'testhost'))</TestHostRootPath>
+ <NETCoreAppTestHostFxrPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'host', 'fxr', '$(TestHostVersion)'))</NETCoreAppTestHostFxrPath>
+ <NETCoreAppTestSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(TestHostVersion)'))</NETCoreAppTestSharedFrameworkPath>
+ </PropertyGroup>
</Project>
diff --git a/tests/runtest.proj b/tests/runtest.proj
index 3f1faa8fd8..c9a90acd89 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -8,14 +8,6 @@
<MSBuildEnableAllPropertyFunctions>1</MSBuildEnableAllPropertyFunctions>
</PropertyGroup>
- <!-- TestHost destinations -->
- <PropertyGroup>
- <NETCoreAppTestSharedFxVersion>9.9.9</NETCoreAppTestSharedFxVersion>
- <TestHostRootPath>$(BinDir)testhost\</TestHostRootPath>
- <NETCoreAppTestHostFxrPath>$(TestHostRootPath)host\fxr\$(NETCoreAppTestSharedFxVersion)\</NETCoreAppTestHostFxrPath>
- <NETCoreAppTestSharedFrameworkPath>$(TestHostRootPath)shared\Microsoft.NETCore.App\$(NETCoreAppTestSharedFxVersion)\</NETCoreAppTestSharedFrameworkPath>
- </PropertyGroup>
-
<ItemGroup>
<DisabledTestDir Include="Common" />
<_SkipTestDir Include="@(DisabledTestDir)" />
@@ -373,22 +365,23 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
Properties="Language=C#;TargetRid=$(TargetRid)" />
</Target>
- <Target Name="ResolveTestHostDependencies">
- <MSBuild Projects="$(MSBuildThisFileDirectory)src\Common\CoreFX\CoreFX.depproj"
- Properties="OutputPath=$(NETCoreAppTestSharedFrameworkPath);" />
- </Target>
+ <!--
+ Targets and properties for creating the testhost directory used to run corefx tests.
+ -->
- <Target Name="CreateTestHost" DependsOnTargets="ResolveTestHostDependencies">
- <MSBuild Projects="$(MSBuildProjectFile)"
- Targets="SetupTestingHost"/>
+ <Target Name="CreateTestHost">
+ <MSBuild Projects="$(MSBuildThisFileDirectory)src\Common\CoreFX\CoreFX.depproj"
+ Targets="Build;SetupTestingHost"
+ Properties="OutputPath=$(NETCoreAppTestSharedFrameworkPath)" />
<MSBuild Projects="$(MSBuildProjectFile)"
- Targets="GenerateTestSharedFrameworkDepsFile"/>
+ Targets="GenerateTestSharedFrameworkDepsFile"/>
</Target>
<UsingTask TaskName="GenerateDepsJson" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
+
<!-- After we copied all the framework libraries we need to generate a deps.json file for the shared test framework -->
- <Target Name="GenerateTestSharedFrameworkDepsFile" AfterTargets="SetupTestingHost">
+ <Target Name="GenerateTestSharedFrameworkDepsFile">
<ItemGroup>
<!-- This is for HostPolicy, CoreCLR and Jit dependencies to continue to remain inside of the dep.json -->
<ExceptionForDepsJson Include="microsoft.netcore.app" />
@@ -409,62 +402,6 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
OutputPath="$(_OutputTestSharedFrameworkDepsPath)"/>
</Target>
- <Target Name="SetupTestingHost" AfterTargets="CreateTestOverlay" Condition="'$(CreateTestHost)' != 'false'">
-
- <PropertyGroup Condition="'$(OSGroup)'=='Windows_NT'">
- <HostFxrFileName>hostfxr</HostFxrFileName>
- <HostFxrFileExtension>dll</HostFxrFileExtension>
- <DotnetExecutableName>dotnet.exe</DotnetExecutableName>
- <HostPolicyFileName>hostpolicy</HostPolicyFileName>
- <HostPolicyExtension>dll</HostPolicyExtension>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(OSGroup)'!='Windows_NT'">
- <HostFxrFileName>libhostfxr</HostFxrFileName>
- <HostFxrFileExtension Condition="'$(OSGroup)' == 'Linux' Or '$(OSGroup)' == 'FreeBSD'">so</HostFxrFileExtension>
- <HostFxrFileExtension Condition="$(OSGroup) =='OSX'">dylib</HostFxrFileExtension>
- <HostPolicyFileName>libhostpolicy</HostPolicyFileName>
- <HostPolicyExtension>$(HostFxrFileExtension)</HostPolicyExtension>
- <DotnetExecutableName>dotnet</DotnetExecutableName>
- </PropertyGroup>
-
- <ItemGroup>
- <!-- Workaround for packages on which Microsoft.NetCoreApp expresses a dependency
- The <PackageToInclude> element doesn't allow a version to be specified and we end up with clashing assembly versions in Core_Root-->
- <NetCoreAppPackagedAssemblies Include="System.Text.Encoding.CodePages.dll"/>
- <!-- Use xunit dependencies defined in CoreFX.depproj instead of conflicting versions from test dependencies. -->
- <TestDependenciesToExclude Include="$(CORE_ROOT)\**\xunit*"/>
- <CoreCLRBinariesToExclude Include="@(NetCoreAppPackagedAssemblies);@(TestDependenciesToExclude -> '%(Identity)')" />
- </ItemGroup>
-
- <ItemGroup>
- <CoreCLRBinaries Include="$(CORE_ROOT)\**\*.*" Exclude="$(CORE_ROOT)\**\@(CoreCLRBinariesToExclude -> '%(Identity)' )" />
- <HostFxFile Include="$(DotnetCliPath)\**\$(HostFxrFileName).$(HostFxrFileExtension)" />
- <DotnetExe Include="$(DotnetCliPath)\$(DotnetExecutableName)" />
- <HostPolicyFile Include="$(DotnetCliPath)\**\$(HostPolicyFileName).$(HostPolicyExtension)" />
- </ItemGroup>
-
- <Copy SourceFiles="@(HostFxFile)"
- DestinationFolder="$(NETCoreAppTestHostFxrPath)"
- SkipUnchangedFiles="true"
- UseHardlinksIfPossible="true" />
-
- <!-- Should this be referenced from a NuGet package? -->
- <Copy SourceFiles="@(HostPolicyFile)"
- DestinationFolder="$(NETCoreAppTestSharedFrameworkPath)"
- SkipUnchangedFiles="true"
- UseHardlinksIfPossible="true" />
-
- <Copy SourceFiles="@(DotnetExe)"
- DestinationFolder="$(TestHostRootPath)"
- SkipUnchangedFiles="true"
- UseHardlinksIfPossible="true" />
-
- <Copy SourceFiles="@(CoreCLRBinaries)"
- DestinationFolder="$(NETCoreAppTestSharedFrameworkPath)"
- SkipUnchangedFiles="true" />
- </Target>
-
<Target Name="Build">
<!-- generate project.lock.json file corresponding to above json file -->
diff --git a/tests/src/Common/CoreFX/CoreFX.depproj b/tests/src/Common/CoreFX/CoreFX.depproj
index 0cc06f66ac..c42cf53e1d 100644
--- a/tests/src/Common/CoreFX/CoreFX.depproj
+++ b/tests/src/Common/CoreFX/CoreFX.depproj
@@ -9,173 +9,125 @@
<ContainsPackageReferences>true</ContainsPackageReferences>
<CLRTestKind>SharedLibrary</CLRTestKind>
<IsTestProject>false</IsTestProject>
- <!-- System.Composition and System.Composition.AttributedModel use different versioning conventions -->
- <SystemCompositionVersions>1.3.0-preview3-26501-04</SystemCompositionVersions>
- <MicrosoftDiagnosticsTracingTraceVentVersion>2.0.19</MicrosoftDiagnosticsTracingTraceVentVersion>
- <MicrosoftDotnetPlatformAbstractionsVersion>2.1.0</MicrosoftDotnetPlatformAbstractionsVersion>
<MicrosoftDiagnosticsRuntimePackageVersion>1.0.5</MicrosoftDiagnosticsRuntimePackageVersion>
</PropertyGroup>
- <!-- Switch RuntimeIdentifier according to currently running OSGroup -->
+ <!-- Switch RuntimeIdentifier according to currently targeted OSGroup -->
<PropertyGroup>
- <RuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT'">win-x64</RuntimeIdentifier>
- <RuntimeIdentifier Condition="'$(OSGroup)' == 'Linux'">linux-x64</RuntimeIdentifier>
- <RuntimeIdentifier Condition="'$(OSGroup)' == 'OSX'">osx-x64</RuntimeIdentifier>
+ <RuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT'">win-$(Platform)</RuntimeIdentifier>
+ <RuntimeIdentifier Condition="'$(OSGroup)' == 'Linux'">linux-$(Platform)</RuntimeIdentifier>
+ <RuntimeIdentifier Condition="'$(OSGroup)' == 'OSX'">osx-$(Platform)</RuntimeIdentifier>
<NugetRuntimeIdentifier>$(RuntimeIdentifier)</NugetRuntimeIdentifier>
+
+ <!-- Set AdditionalRestoreArgs so the _DnuRestoreCommandFull in Tools\packageresolve.targets
+ passes these on to 'dotnet restore'. This is needed so all the various dirs.props files
+ set up the target architecture correctly, so $(Platform) above gets set correctly, among
+ other things. (Note that _DnuRestoreCommandFull doesn't properly set
+ TargetGroup/ConfigurationGroup/ArchGroup, and even if they are set, it isn't used by
+ the various dirs.props files.)
+ -->
+ <AdditionalRestoreArgs>/p:__BuildOS=$(__BuildOS) /p:__BuildType=$(__BuildType) /p:__BuildArch=$(__BuildArch)</AdditionalRestoreArgs>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="System.CodeDom">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Configuration.ConfigurationManager">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Composition.Hosting">
- <Version>$(SystemCompositionVersions)</Version>
- </PackageReference>
- <PackageReference Include="System.Composition.AttributedModel">
- <Version>$(SystemCompositionVersions)</Version>
- </PackageReference>
- <PackageReference Include="System.Composition.Convention">
- <Version>$(SystemCompositionVersions)</Version>
- </PackageReference>
- <PackageReference Include="System.Composition.Runtime">
- <Version>$(SystemCompositionVersions)</Version>
- </PackageReference>
- <PackageReference Include="System.Composition.TypedParts">
- <Version>$(SystemCompositionVersions)</Version>
- </PackageReference>
- <PackageReference Include="System.ComponentModel.Composition">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Data.Odbc">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="runtime.native.System.Data.SqlClient.sni">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Security.Principal.Windows">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Text.Encoding.CodePages">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Diagnostics.DiagnosticSource">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Data.SqlClient">
- <!-- The 4.6 packages of System.Data.SqlClient have a version of 4.5 in the dll so they fail to load -->
- <Version>4.7.0-preview4.19164.7</Version>
- </PackageReference>
- <PackageReference Include="System.Diagnostics.PerformanceCounter">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.DirectoryServices">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.DirectoryServices.AccountManagement">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.DirectoryServices.Protocols">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Drawing.Common">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.IO.Packaging">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.IO.Pipelines">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.IO.Ports">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Management">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Net.Http.WinHttpHandler">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Net.WebSockets.WebSocketProtocol">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Reflection.MetadataLoadContext">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Runtime.Caching">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Reflection.Context">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Security.Cryptography.ProtectedData">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Security.Cryptography.Pkcs">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Security.Cryptography.Xml">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.ServiceModel.Syndication">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.ServiceProcess.ServiceController">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Text.Encoding.CodePages">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Text.Encodings.Web">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Threading.AccessControl">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Threading.Channels">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="System.Json">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
- <Version>$(MicrosoftBclAsyncInterfacesVersion)</Version>
- </PackageReference>
- </ItemGroup>
- <ItemGroup Condition="'$(OSGroup)' == 'Windows_NT'">
- <!-- Windows Dependencies -->
- <PackageReference Include="Microsoft.Win32.Registry">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.Win32.Registry.AccessControl">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.Win32.SystemEvents">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent">
- <Version>$(MicrosoftDiagnosticsTracingTraceVentVersion)</Version>
- </PackageReference>
- </ItemGroup>
-
- <ItemGroup Condition="'$(OSGroup)' != 'Windows_NT'">
- <PackageReference Include="Microsoft.DotNet.PlatformAbstractions">
- <Version>$(MicrosoftDotnetPlatformAbstractionsVersion)</Version>
- </PackageReference>
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.Diagnostics.Runtime">
- <Version>$(MicrosoftDiagnosticsRuntimePackageVersion)</Version>
- </PackageReference>
- </ItemGroup>
-
- <ItemGroup>
- <PackageToInclude Include="@(PackageReference -> '%(Identity)' )"/>
+ <!-- Microsoft.Private.CoreFx.OOB is a meta-package that contains references to most of what we need -->
+ <PackageReference Include="Microsoft.Private.CoreFx.OOB" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
+
+ <!-- dotnet.exe -->
+ <PackageReference Include="Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreAppVersion)" />
+
+ <!-- hostfxr.dll -->
+ <PackageReference Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreAppVersion)" />
+
+ <!-- hostpolicy.dll -->
+ <PackageReference Include="Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreAppVersion)" />
+
</ItemGroup>
+
+ <!-- Target SetupTestingHost needs to run after "AfterResolveReferences" so @(ReferenceCopyLocalPaths) is
+ set up, and before "BeforeCompile" because @(ReferenceCopyLocalPaths) is cleared out during the
+ compile phase.
+ -->
+ <Target Name="SetupTestingHost" AfterTargets="AfterResolveReferences" BeforeTargets="BeforeCompile">
+
+ <Error Condition="'$(CORE_ROOT)' == ''"
+ Text="CORE_ROOT variable is not set." />
+
+ <PropertyGroup Condition="'$(OSGroup)'=='Windows_NT'">
+ <HostFxrFileName>hostfxr</HostFxrFileName>
+ <HostFxrFileExtension>dll</HostFxrFileExtension>
+ <DotnetExecutableName>dotnet.exe</DotnetExecutableName>
+ <HostPolicyFileName>hostpolicy</HostPolicyFileName>
+ <HostPolicyExtension>dll</HostPolicyExtension>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(OSGroup)'!='Windows_NT'">
+ <HostFxrFileName>libhostfxr</HostFxrFileName>
+ <HostFxrFileExtension Condition="'$(OSGroup)' == 'Linux' Or '$(OSGroup)' == 'FreeBSD'">so</HostFxrFileExtension>
+ <HostFxrFileExtension Condition="$(OSGroup) =='OSX'">dylib</HostFxrFileExtension>
+ <HostPolicyFileName>libhostpolicy</HostPolicyFileName>
+ <HostPolicyExtension>$(HostFxrFileExtension)</HostPolicyExtension>
+ <DotnetExecutableName>dotnet</DotnetExecutableName>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <!-- Workaround for packages on which Microsoft.NetCoreApp expresses a dependency
+ The <PackageToInclude> element doesn't allow a version to be specified and we end up with clashing assembly versions in Core_Root
+ -->
+ <!--
+ <NetCoreAppPackagedAssemblies Include="System.Text.Encoding.CodePages.dll"/>
+ -->
+
+ <!-- Use xunit dependencies defined in CoreFX.depproj instead of conflicting versions from test dependencies. -->
+ <TestDependenciesToExclude Include="$(CORE_ROOT)\**\xunit*"/>
+
+ <!-- Exclude subdirectories that contain cross-architecture (possibly cross-bitness) crossgen/JIT -->
+ <TestDependenciesToExclude Include="$(CORE_ROOT)\**\x64\*"/>
+
+ <!-- Don't include all the nuget files -->
+ <TestDependenciesToExclude Include="$(CORE_ROOT)\.nuget\**\*"/>
+
+ <CoreCLRBinariesToExclude Include="@(NetCoreAppPackagedAssemblies);@(TestDependenciesToExclude -> '%(Identity)')" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <!-- REVIEW: do we need to copy recursively (and flatten the structure into a single destination folder)? Can we just copy
+ the top level? Or, should we preserve the hierarchy?
+ -->
+ <CoreCLRBinaries Include="$(CORE_ROOT)\**\*.*" Exclude="$(CORE_ROOT)\**\@(CoreCLRBinariesToExclude -> '%(Identity)' )" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <HostFxFile Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Filename)' == '$(HostFxrFileName)'" />
+ <DotnetExe Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Filename)' == 'dotnet'" />
+ <HostPolicyFile Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Filename)' == '$(HostPolicyFileName)'" />
+ </ItemGroup>
+
+ <Copy SourceFiles="@(HostFxFile)"
+ DestinationFolder="$(NETCoreAppTestHostFxrPath)"
+ SkipUnchangedFiles="true"
+ UseHardlinksIfPossible="true" />
+
+ <Copy SourceFiles="@(HostPolicyFile)"
+ DestinationFolder="$(NETCoreAppTestSharedFrameworkPath)"
+ SkipUnchangedFiles="true"
+ UseHardlinksIfPossible="true" />
+
+ <Copy SourceFiles="@(DotnetExe)"
+ DestinationFolder="$(TestHostRootPath)"
+ SkipUnchangedFiles="true"
+ UseHardlinksIfPossible="true" />
+
+ <Copy SourceFiles="@(CoreCLRBinaries)"
+ DestinationFolder="$(NETCoreAppTestSharedFrameworkPath)"
+ SkipUnchangedFiles="true" />
+
+ <Exec Command="chmod +x $(TestHostRootPath)%(DotnetExe.Filename)%(DotnetExe.Extension)" Condition="'$(OSGroup)' != 'Windows_NT'"/>
+ </Target>
+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+
<PropertyGroup>
<ProjectAssetsFile>$(SourceDir)Common\CoreFX\obj\project.assets.json</ProjectAssetsFile>
</PropertyGroup>