diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-06-24 21:10:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-24 21:10:44 +0300 |
| commit | 555bcbcb5458a7aacb404f8242a6fe9267266ca7 (patch) | |
| tree | dfb7caea05fb1f004869a4eba32267f2a76fe449 /dir.targets | |
| parent | 095e43a781181d9a59ceb726a9c72a65913dbdeb (diff) | |
Update CoreRT build to use latest .NET CLI and build tools (#3916)
- Pick up latest .NET Core 2.0 CLI and buildtools
- Remove all project.json references and convert everything to msbuild projects
- Stick to vanilla .NET CLI project shape as much as possible. Minimize dependencies on buildtools special behaviors
Diffstat (limited to 'dir.targets')
| -rw-r--r-- | dir.targets | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/dir.targets b/dir.targets index aaf9c39c4..788a01823 100644 --- a/dir.targets +++ b/dir.targets @@ -17,9 +17,41 @@ <CLSCompliant Condition="'$(CLSCompliant)'==''">false</CLSCompliant> </PropertyGroup> - <!-- Setting IsTestProject prior to Build.Common.targets --> + <!-- Set default references for netstandard1.3 --> + <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3'"> + <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <TargetFrameworkVersion>v1.3</TargetFrameworkVersion> + </PropertyGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'"> + <PackageReference Include="NETStandard.Library"> + <Version>1.6.1</Version> + </PackageReference> + </ItemGroup> + + <!-- Set default references for netcoreapp1.1 --> + <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'"> + <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> + <!-- This tells VS that this is .NET Core app - uses .NET Core debugger, etc. --> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <TargetFrameworkVersion>v1.1</TargetFrameworkVersion> + <NoWarn>$(NoWarn);1701;1702</NoWarn> + <!-- Force .dll extension even if output type is exe. --> + <TargetExt>.dll</TargetExt> + </PropertyGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'"> + <PackageReference Include="Microsoft.NETCore.App"> + <Version>1.1.2</Version> + </PackageReference> + </ItemGroup> + + <!-- Set non-empty TargetFrameworkIdentifier to avoid defaulting to .NETPortable --> + <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == ''"> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + </PropertyGroup> + <PropertyGroup> - <IsTestProject Condition="'$(IsTestProject)'=='' And $(MSBuildProjectName.EndsWith('.tests', StringComparison.OrdinalIgnoreCase))">true</IsTestProject> + <NugetRuntimeIdentifier Condition="'$(NugetRuntimeIdentifier)' == ''">$(RuntimeIdentifiers)</NugetRuntimeIdentifier> </PropertyGroup> <Import Project="$(ToolsDir)/Build.Common.targets" /> @@ -45,4 +77,5 @@ <!-- We set this property to avoid MSBuild errors regarding not setting TargetFrameworkProfile (see above line) --> <PortableNuGetMode>true</PortableNuGetMode> </PropertyGroup> + </Project> |