diff options
Diffstat (limited to 'tests/src/Common/external')
-rw-r--r-- | tests/src/Common/external/external.csproj | 13 | ||||
-rw-r--r-- | tests/src/Common/external/external.depproj | 46 | ||||
-rw-r--r-- | tests/src/Common/external/project.json | 26 |
3 files changed, 43 insertions, 42 deletions
diff --git a/tests/src/Common/external/external.csproj b/tests/src/Common/external/external.csproj deleted file mode 100644 index f7fa75ed32..0000000000 --- a/tests/src/Common/external/external.csproj +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <CLRTestKind>BuildOnly</CLRTestKind> - <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker> - </PropertyGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <Target Name="Build" - DependsOnTargets="ResolveReferences" /> -</Project>
\ No newline at end of file diff --git a/tests/src/Common/external/external.depproj b/tests/src/Common/external/external.depproj index 5a16122cdb..51b36208b6 100644 --- a/tests/src/Common/external/external.depproj +++ b/tests/src/Common/external/external.depproj @@ -5,19 +5,55 @@ <!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here --> - <ProjectJson>$(MSBuildThisFileDirectory)project.json</ProjectJson> - <ProjectLockJson>$(MSBuildThisFileDirectory)project.lock.json</ProjectLockJson> + <RestoreOutputPath>$(MSBuildThisFileDirectory)obj</RestoreOutputPath> <Language>C#</Language> <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker> + <NugetTargetMonikerShort>netcoreapp1.1</NugetTargetMonikerShort> <NugetRuntimeIdentifier>win7-x64</NugetRuntimeIdentifier> + <ContainsPackageReferences>true</ContainsPackageReferences> <OutputPath>$(TargetingPackPath)</OutputPath> <XUnitRunnerPackageId Condition="'$(TargetGroup)' != 'netfx'">xunit.console.netcore</XUnitRunnerPackageId> <XUnitRunnerPackageId Condition="'$(TargetGroup)' == 'netfx'">xunit.runner.console</XUnitRunnerPackageId> <CLRTestKind>SharedLibrary</CLRTestKind> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> - <None Include="project.json" /> + <PackageReference Include="Microsoft.CodeAnalysis.Compilers"> + <Version>1.1.1</Version> + </PackageReference> + <PackageReference Include="xunit.performance.api"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.core"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.execution"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.performance.metrics"> + <Version>$(XUnitPerformanceApiVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> + <Version>$(MicrosoftDiagnosticsTracingLibraryVersion)</Version> + </PackageReference> + <PackageReference Include="Newtonsoft.Json"> + <Version>9.0.1</Version> + </PackageReference> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.console.netcore"> + <Version>$(XUnitConsoleNetCoreVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.utility"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> + </PropertyGroup> <ItemGroup> <PackageToInclude Include="xunit.abstractions"/> <PackageToInclude Include="xunit.assert"/> @@ -40,6 +76,10 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup> + <ProjectAssetsFile>$(SourceDir)Common\external\obj\project.assets.json</ProjectAssetsFile> + </PropertyGroup> + <Target Name="AddXunitConsoleRunner" BeforeTargets="ResolveReferences" Condition="'$(TargetGroup)' == 'netfx'"> <Error Condition="!Exists('$(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion)\tools\xunit.console.exe')" Text="Error: looks the package $(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion) not restored or missing xunit.console.exe." diff --git a/tests/src/Common/external/project.json b/tests/src/Common/external/project.json deleted file mode 100644 index 12c986a98b..0000000000 --- a/tests/src/Common/external/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "dependencies": { - "Microsoft.CodeAnalysis.Compilers": "1.1.1", - "xunit.performance.api": "1.0.0-beta-build0003", - "xunit.performance.core": "1.0.0-beta-build0003", - "xunit.performance.execution": "1.0.0-beta-build0003", - "xunit.performance.metrics": "1.0.0-beta-build0003", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Newtonsoft.Json": "9.0.1", - "xunit": "2.2.0-beta2-build3300", - "xunit.console.netcore": "1.0.2-prerelease-00177", - "xunit.runner.utility": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {} - } -} |