diff options
| author | Matt Mitchell <mmitche@microsoft.com> | 2015-07-06 16:12:43 -0700 |
|---|---|---|
| committer | Matt Mitchell <mmitche@microsoft.com> | 2015-07-09 16:20:11 -0700 |
| commit | 1972ec27c9a570460dde377ff910325b0017507b (patch) | |
| tree | 7c3aa8f49005bfaa5c6a8742427783aac778e195 /tests/publishdependency.targets | |
| parent | eed62e377af693f0288587a3600c89e258e614a6 (diff) | |
| download | coreclr-1972ec27c9a570460dde377ff910325b0017507b.tar.gz coreclr-1972ec27c9a570460dde377ff910325b0017507b.tar.bz2 coreclr-1972ec27c9a570460dde377ff910325b0017507b.zip | |
Move CoreCLR to the modern build tools and dnx
This changes moves coreclr onto DNX (same version as corefx). Theoretically, this should allow these tests to target the desktop CLR. All of the old package.config files are gone and replaced with corresponding project.json files. The up front restore behavior is retained. Tests are now buildable individually, though not runnable in a similar fashion.
Diffstat (limited to 'tests/publishdependency.targets')
| -rw-r--r-- | tests/publishdependency.targets | 79 |
1 files changed, 38 insertions, 41 deletions
diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets index 901e92c122..f8dd96f6b3 100644 --- a/tests/publishdependency.targets +++ b/tests/publishdependency.targets @@ -1,63 +1,60 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <UsingTask TaskName="ResolveNuGetPackages" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/> - + <UsingTask TaskName="ResolveNuGetPackageAssets" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/> <ItemGroup> - <TestTargetFramework Include="ASP.NetCore, version=v5.0"> - <Folder>aspnetcore50</Folder> + <TestTargetFramework Include="DNXCore,Version=v5.0"> + <Folder>dnxcore50</Folder> </TestTargetFramework> </ItemGroup> - <ItemGroup> - <AllPackagesConfigFile Include="$(SourceDir)**\*\packages.config"/> + <AllProjectJsonLockFiles Include="$(SourceDir)**\*\project.lock.json"/> </ItemGroup> <Target Name="CopyDependecyToCoreRoot" - Inputs="@(AllPackagesConfigFile)" + Inputs="@(AllProjectJsonLockFiles)" Outputs="$(CORE_ROOT)\*.*"> - - <ItemGroup> - <PackagesConfigFileExclude Include="$(SourceDir).nuget\packages.config" /> - <PackagesConfigFileExclude Include="$(SourceDir)Test*\**\packages.config" /> - <PackagesConfigFileExclude Include="$(SourceDir)packages\**\*\packages.config" /> - </ItemGroup> + <ItemGroup> + <ProjectJsonLockFileExclude Include="$(SourceDir).nuget\project.lock.json" /> + <ProjectJsonLockFileExclude Include="$(SourceDir)Test*\**\project.lock.json" /> + <ProjectJsonLockFileExclude Include="$(SourceDir)Common\Coreclr.TestWrapper\**\project.lock.json" /> + <ProjectJsonLockFileExclude Include="$(SourceDir)packages\**\*\project.lock.json" /> + </ItemGroup> - <Message Text= "PackagesConfigFileExclude= @(PackagesConfigFileExclude)"/> + <ItemGroup> + <ProjectLockJsonFiles Include="@(AllProjectJsonLockFiles)" Exclude="@(ProjectJsonLockFileExclude)"/> + </ItemGroup> + + <!-- This will use the overridden ResolveNuGetPackageAssets, 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)"> - <ItemGroup> - <PackagesConfigFile Include="@(AllPackagesConfigFile)" Exclude="@(PackagesConfigFileExclude)"/> - </ItemGroup> - <ResolveNuGetPackages PackagesConfigs="@(PackagesConfigFile)" - PackageRoot="$(PackagesDir)" - Platform="$(PlatformTarget)" - Configuration="$(NuGetConfiguration)" - Language="$(Language)" - TargetFramework="%(TestTargetFramework.Identity)" - TargetPlatformMoniker="$(TargetPlatformMoniker)"> + <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" /> + <Output TaskParameter="ResolvedReferences" ItemName="Reference" /> + <Output TaskParameter="ResolvedCopyLocalItems" ItemName="RunTimeCopyLocal" /> + </ResolveNuGetPackageAssets> - <Output TaskParameter="ResolvedCopyLocal" ItemName="RunTimeCopyLocal" /> - </ResolveNuGetPackages> - <ItemGroup> -</ItemGroup> - -<ItemGroup> - <RunTimeDependecyExclude Include="$(CORE_ROOT)\**\*.*" /> - <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName)%(Extension)')" /> - <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).ni%(Extension)')" /> - <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).pdb')" /> - <AllResolvedRuntimeDependencies Include="@(RunTimeCopyLocal -> '%(FileName)%(Extension)')"> + <RunTimeDependecyExclude Include="$(CORE_ROOT)\**\*.*" /> + <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName)%(Extension)')" /> + <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).ni%(Extension)')" /> + <RunTimeDependecyExcludeFiles Include="@(RunTimeDependecyExclude -> '%(FileName).pdb')" /> + <AllResolvedRuntimeDependencies Include="@(RunTimeCopyLocal -> '%(FileName)%(Extension)')"> <File>%(Identity)</File> - </AllResolvedRuntimeDependencies> - <RunTimeDependecyCopyLocalFile Include="@(AllResolvedRuntimeDependencies)" Exclude="@(RunTimeDependecyExcludeFiles)"/> - <RunTimeDependecyCopyLocal Include="@(RunTimeDependecyCopyLocalFile -> '%(File)')" /> - </ItemGroup> - <Message Text= "RunTimeDependecyCopyLocal= @(RunTimeDependecyCopyLocal)"/> - <Message Text= "RunTimeDependecyExcludeFiles= @(RunTimeDependecyExcludeFiles)"/> + </AllResolvedRuntimeDependencies> + <RunTimeDependecyCopyLocalFile Include="@(AllResolvedRuntimeDependencies)" Exclude="@(RunTimeDependecyExcludeFiles)"/> + <RunTimeDependecyCopyLocal Include="@(RunTimeDependecyCopyLocalFile -> '%(File)')" /> + </ItemGroup> + <Copy SourceFiles="@(RunTimeDependecyCopyLocal)" DestinationFolder="$(CORE_ROOT)" |