diff options
Diffstat (limited to 'tests/publishdependency.targets')
-rw-r--r-- | tests/publishdependency.targets | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets index 6d1c6bdc78..8cae729776 100644 --- a/tests/publishdependency.targets +++ b/tests/publishdependency.targets @@ -18,20 +18,20 @@ </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*"/> </ItemGroup> <PropertyGroup> @@ -43,10 +43,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 +85,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 +115,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" |