diff options
author | wtgodbe <wigodbe@microsoft.com> | 2017-05-02 16:33:41 -0700 |
---|---|---|
committer | wtgodbe <wigodbe@microsoft.com> | 2017-05-16 16:37:21 -0700 |
commit | 798387ee90d7536d5a620af8482100ba76f6061a (patch) | |
tree | c11eea885b05e7424f103cd671d227ff173a3083 /tests/src/Common/targeting_pack_ref | |
parent | 36e988ee6593351f1e962118a99154df5eae0254 (diff) | |
download | coreclr-798387ee90d7536d5a620af8482100ba76f6061a.tar.gz coreclr-798387ee90d7536d5a620af8482100ba76f6061a.tar.bz2 coreclr-798387ee90d7536d5a620af8482100ba76f6061a.zip |
Update Coreclr to 2.0.0 buildtools
Diffstat (limited to 'tests/src/Common/targeting_pack_ref')
-rw-r--r-- | tests/src/Common/targeting_pack_ref/project.json | 25 | ||||
-rw-r--r-- | tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj | 13 |
2 files changed, 13 insertions, 25 deletions
diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json deleted file mode 100644 index 566b4c66b9..0000000000 --- a/tests/src/Common/targeting_pack_ref/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-preview2-25316-03" - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "ubuntu.16.04-x64": {}, - "ubuntu.16.10-x64": {}, - "osx.10.12-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {}, - "fedora.24-x64": {} - } -} diff --git a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj index 65e37c03c3..f59dfa3905 100644 --- a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj +++ b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj @@ -6,6 +6,19 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.TargetingPack.Private.CoreCLR"> + <Version>$(CoreClrPackageVersion)</Version> + </PackageReference> + </ItemGroup> + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> + <RuntimeIdentifiers>win7-x86;win7-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;osx.10.12-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64</RuntimeIdentifiers> + <ContainsPackageReferences>true</ContainsPackageReferences> + <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> |