Update SDK used to build jitutils to 2.1 RC (#18290)

[platform/upstream/coreclr.git] / tests / publishdependency.targets

diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
index 6d1c6bd..e2c8706 100644 (file)
--- a/tests/publishdependency.targets
+++ b/tests/publishdependency.targets
@@ -3,8 +3,8 @@
 
   <UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
   <ItemGroup>
-    <TestTargetFramework Include=".NETCoreApp,Version=v2.0">
-      <Folder>netcoreapp2.0</Folder>
+    <TestTargetFramework Include=".NETCoreApp,Version=v2.1">
+      <Folder>netcoreapp2.1</Folder>
     </TestTargetFramework>
   </ItemGroup>
 
@@ -18,20 +18,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_runtime\project.lock.json"/>
-    <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_dependencies\project.lock.json"/>
+    <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_runtime\obj\project.assets.json"/>
+    <CoreRootProjectLockJsonFiles Include="$(SourceDir)Common\test_dependencies\obj\project.assets.json"/>
   </ItemGroup>
 
   <ItemGroup>
-    <RefProjectLockJsonFiles Include="$(SourceDir)Common\targeting_pack_ref\project.lock.json"/>
+    <RefProjectLockJsonFiles Include="$(SourceDir)Common\targeting_pack_ref\obj\project.assets.json"/>
   </ItemGroup>
 
   <ItemGroup>
-    <ProductProjectLockJsonFiles Include="$(SourceDir)Common\build_against_pkg_dependencies\project.lock.json"/>
+    <ProductProjectLockJsonFiles Include="$(SourceDir)Common\build_against_pkg_dependencies\obj\project.assets.json"/>
   </ItemGroup>
 
   <ItemGroup>
-    <CrossGenFiles Include="..\packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(CoreClrPackageVersion)\tools\crossgen*"/>
+    <CrossGenFiles Include="..\packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(DesiredPackageVersionArg)\tools\crossgen*"/>
+    <VCRuntimeFiles Include="..\packages\vc-runtime\$(VCRuntimeVersion)\lib\netcoreapp1.1\*.dll"/>
   </ItemGroup>
 
   <PropertyGroup>
@@ -43,10 +44,6 @@
     Inputs="@(CoreRootProjectLockJsonFiles)"
     Outputs="$(CORE_ROOT)\*.*">
 
-    <MSBuild Projects="$(SourceDir)Common\test_runtime\test_runtime.csproj"/>
-
-    <MSBuild Projects="$(SourceDir)Common\test_dependencies\test_dependencies.csproj"/>
-
     <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items
          for the xunit wrapper projects -->
     <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="false"
@@ -89,8 +86,6 @@
     Inputs="@(RefProjectLockJsonFiles)"
     Outputs="$(RefDestination)\*.*">
 
-    <MSBuild Projects="$(SourceDir)Common\targeting_pack_ref\targeting_pack_ref.csproj"/>
-
     <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items
          for the xunit wrapper projects -->
     <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="true"
@@ -121,8 +116,6 @@
     Inputs="@(ProductProjectLockJsonFiles)"
     Outputs="$(ProductDestination)\*.*">
 
-    <MSBuild Projects="$(SourceDir)Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj"/>
-
     <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items
          for the xunit wrapper projects -->
     <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="true"
@@ -166,4 +159,22 @@
 
   </Target>
 
+  <Target Name="CopyVCRuntimeToCoreRoot"
+    AfterTargets="CopyDependecyToCoreRoot"
+    Outputs="$(CORE_ROOT)\*.*"
+    Condition="'$(BuildArch)' == 'arm'">
+
+    <Copy
+      SourceFiles="@(VCRuntimeFiles)"
+      DestinationFolder="$(CORE_ROOT)"
+      SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
+      OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+      Retries="$(CopyRetryCount)"
+      RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+      UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)">
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
+    </Copy>
+
+  </Target>
+
 </Project>