Skip to content

Commit

Permalink
Merge pull request #1634 from blairconrad/netcoreapp3.0
Browse files Browse the repository at this point in the history
Run tests against netcoreapp3.0
  • Loading branch information
thomaslevesque committed Sep 29, 2019
2 parents cbf5505 + 361eab8 commit f4ce986
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: '{build}'
image: Visual Studio 2017
image: Visual Studio 2019

pull_requests:
do_not_increment_build_number: true
Expand Down
6 changes: 3 additions & 3 deletions how_to_build.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
These instructions are *only* for building from the command line, which includes compilation, test execution and packaging. This is the simplest way to build.
It also replicates the build on the Continuous Integration build server and is the best indicator of whether a pull request will build.

You can also build the solution using Visual Studio 2017 or later, but this doesn't provide the same assurances as the command line build.
You can also build the solution using Visual Studio 2019 or later, but this doesn't provide the same assurances as the command line build.

At the time of writing the build is only confirmed to work on Windows using the Microsoft .NET framework.

Expand All @@ -14,11 +14,11 @@ The build requires that a few pieces of software be installed on the host comput

Ensure that the following are installed:

1. a recent version of Visual Studio 2017 (currently this means 15.7 or later) or the Build Tools for Visual Studio 2017
1. a recent version of Visual Studio 2019 (currently this means 16.3 or later) or the Build Tools for Visual Studio 2019

1. a recent version of the .NET Core 1.0 Runtime (currently this means 1.0.12 or later)

1. a recent version of the .NET Core 2.1 SDK (currently this means 2.1.3 or later)
1. a recent version of the .NET Core 3.0 SDK (currently this means 3.0.100 or later)

## Building

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netcoreapp1.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp1.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netcoreapp1.0;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp1.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
<AssemblyName>FakeItEasy.IntegrationTests</AssemblyName>
<SignAssembly>true</SignAssembly>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<DefineConstants>$(DefineConstants);FEATURE_NETCORE_REFLECTION;FEATURE_STRING_CONTAINS_COMPARISONTYPE;REQUIRES_NETSTANDARD_REFERENCE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<DefineConstants>$(DefineConstants);FEATURE_NETCORE_REFLECTION;FEATURE_STRING_CONTAINS_COMPARISONTYPE;REQUIRES_NETSTANDARD_REFERENCE</DefineConstants>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/FakeItEasy.Specs/FakeItEasy.Specs.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netcoreapp1.0;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp1.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
<AssemblyName>FakeItEasy.Specs</AssemblyName>
<CodeAnalysisRuleset>FakeItEasy.Specs.ruleset</CodeAnalysisRuleset>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion tests/FakeItEasy.Tests/FakeItEasy.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netcoreapp1.0;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp1.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
<AssemblyName>FakeItEasy.Tests</AssemblyName>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
Expand Down

0 comments on commit f4ce986

Please sign in to comment.