Skip to content
This repository has been archived by the owner on Apr 16, 2020. It is now read-only.

Commit

Permalink
Target both 1.0 and 2.0 .NET Core runtimes (#262)
Browse files Browse the repository at this point in the history
* Target both 1.0 and 2.0 .NET Core runtimes

* Fixed build to run tests as multiple frameworks targeted now.
  • Loading branch information
chris5287 authored and ctaggart committed Sep 22, 2017
1 parent 132ea62 commit 3057fcf
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Tests/Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion build/build.proj
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<DotNetCliToolReference Include="dotnet-sourcelink" Version="[2.1.0]" />
<DotNetCliToolReference Include="dotnet-sourcelink" Version="[2.3.0]" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion dotnet-sourcelink-git/dotnet-sourcelink-git.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="../build/common.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFrameworks>netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
<PackageType>DotnetCliTool</PackageType>
<RootNamespace>SourceLink.Git</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion dotnet-sourcelink/dotnet-sourcelink.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="../build/common.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFrameworks>netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
<PackageType>DotnetCliTool</PackageType>
<RootNamespace>SourceLink</RootNamespace>
</PropertyGroup>
Expand Down
7 changes: 0 additions & 7 deletions global.json

This file was deleted.

0 comments on commit 3057fcf

Please sign in to comment.