[Tizen] Set obj dir to be TargetRid specific

[platform/upstream/coreclr.git] / tests / src / Common / CoreFX / CoreFX.depproj

diff --git a/tests/src/Common/CoreFX/CoreFX.depproj b/tests/src/Common/CoreFX/CoreFX.depproj
index 75bccfa..86df181 100644 (file)
--- a/tests/src/Common/CoreFX/CoreFX.depproj
+++ b/tests/src/Common/CoreFX/CoreFX.depproj
@@ -2,10 +2,11 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-      <RestoreOutputPath>$(SourceDir)Common\CoreFX\obj</RestoreOutputPath>
+      <RestoreOutputPath>$(SourceDir)Common\CoreFX\obj-$(TargetRid)</RestoreOutputPath>
       <Language>C#</Language>
       <NugetTargetMoniker>.NETCoreApp,Version=v3.1</NugetTargetMoniker>
       <TargetFramework>netcoreapp3.1</TargetFramework>
+      <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
       <ContainsPackageReferences>true</ContainsPackageReferences>
       <CLRTestKind>SharedLibrary</CLRTestKind>
       <IsTestProject>false</IsTestProject>
@@ -31,6 +32,9 @@
 
   <ItemGroup>
 
+    <!-- Workaround to exclude runtime assets from this package while we fix a bug in CoreFx -->
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControlVersion)" ExcludeAssets="Runtime" />
+
     <!-- 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)" />
 
@@ -129,6 +133,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 
   <PropertyGroup>
-    <ProjectAssetsFile>$(SourceDir)Common\CoreFX\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(SourceDir)Common\CoreFX\obj-$(TargetRid)\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>