diff options
author | Jan Kotas <jkotas@microsoft.com> | 2015-08-11 08:18:32 -0700 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2015-08-19 00:21:19 -0700 |
commit | d3c22523bdf4b5d72a404302953bb92e54020783 (patch) | |
tree | d6d165bcd7fa7feb33582209e72e971e4e377c81 /tests | |
parent | 6662f68752005c9fe9a8141860b9cb9e64745f92 (diff) | |
download | coreclr-d3c22523bdf4b5d72a404302953bb92e54020783.tar.gz coreclr-d3c22523bdf4b5d72a404302953bb92e54020783.tar.bz2 coreclr-d3c22523bdf4b5d72a404302953bb92e54020783.zip |
Rename ResolveNuGetPackageAssets to PrereleaseResolveNuGetPackageAssets
Diffstat (limited to 'tests')
-rw-r--r-- | tests/publishdependency.targets | 25 | ||||
-rw-r--r-- | tests/xunitwrapper.targets | 22 |
2 files changed, 23 insertions, 24 deletions
diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets index f8dd96f6b3..afab45e2c2 100644 --- a/tests/publishdependency.targets +++ b/tests/publishdependency.targets @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <UsingTask TaskName="ResolveNuGetPackageAssets" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/> - + <UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/> + <ItemGroup> <TestTargetFramework Include="DNXCore,Version=v5.0"> <Folder>dnxcore50</Folder> </TestTargetFramework> </ItemGroup> - + <ItemGroup> <AllProjectJsonLockFiles Include="$(SourceDir)**\*\project.lock.json"/> </ItemGroup> @@ -28,20 +28,19 @@ <ProjectLockJsonFiles Include="@(AllProjectJsonLockFiles)" Exclude="@(ProjectJsonLockFileExclude)"/> </ItemGroup> - <!-- This will use the overridden ResolveNuGetPackageAssets, which outputs copy local items + <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items for the xunit wrapper projects --> - <ResolveNuGetPackageAssets Architecture="$(PlatformTarget)" - Configuration="$(Configuration)" - Language="$(Language)" - PackageRoot="$(PackagesDir)" - ProjectLockFile="%(ProjectLockJsonFiles.Identity)" - TargetFrameworkMonikers="@(TestTargetFramework)" - TargetPlatformMonikers="$(TargetPlatformMoniker)"> - + <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="true" + IncludeFrameworkReferences="false" + NuGetPackagesDirectory="$(PackagesDir)" + RuntimeIdentifier="dotnet" + ProjectLanguage="$(Language)" + ProjectLockFile="%(ProjectLockJsonFiles.Identity)" + TargetMonikers="@(TestTargetFramework)"> <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" /> <Output TaskParameter="ResolvedReferences" ItemName="Reference" /> <Output TaskParameter="ResolvedCopyLocalItems" ItemName="RunTimeCopyLocal" /> - </ResolveNuGetPackageAssets> + </PrereleaseResolveNuGetPackageAssets> <ItemGroup> <RunTimeDependecyExclude Include="$(CORE_ROOT)\**\*.*" /> diff --git a/tests/xunitwrapper.targets b/tests/xunitwrapper.targets index 2794d4666b..fbc1481f33 100644 --- a/tests/xunitwrapper.targets +++ b/tests/xunitwrapper.targets @@ -4,20 +4,20 @@ to the core_root directory --> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Target Name="ResolveNuGetPackages" Condition="'$(ResolveNuGetPackages)'=='true'"> - - <ResolveNuGetPackageAssets Condition="Exists($(ProjectLockJson))" - Architecture="$(PlatformTarget)" - Configuration="$(Configuration)" - Language="$(Language)" - PackageRoot="$(PackagesDir)" - ProjectLockFile="$(ProjectLockJson)" - TargetFrameworkMonikers="$(NugetTargetFrameworkMoniker)" - TargetPlatformMonikers="$(TargetPlatformMoniker)"> + <Target Name="ResolveNuGetPackages"> + + <PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectLockJson))" + AllowFallbackOnTargetSelection="true" + IncludeFrameworkReferences="false" + NuGetPackagesDirectory="$(PackagesDir)" + RuntimeIdentifier="dotnet" + ProjectLanguage="$(Language)" + ProjectLockFile="$(ProjectLockJson)" + TargetMonikers="$(NugetTargetFrameworkMoniker)"> <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" /> <Output TaskParameter="ResolvedReferences" ItemName="Reference" /> <Output TaskParameter="ResolvedCopyLocalItems" ItemName="CopyLocal" /> - </ResolveNuGetPackageAssets> + </PrereleaseResolveNuGetPackageAssets> <!-- We may have an indirect package reference that we want to replace with a project reference --> <ItemGroup> |