Skip to content

Commit

Permalink
Merge pull request #72 from SimonCropp/netcore22
Browse files Browse the repository at this point in the history
run against netcore app 2.2
  • Loading branch information
nblumhardt authored Aug 22, 2019
2 parents 1ad869f + 6f01144 commit 4989e8b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ language: csharp
matrix:
include:
- os: linux # Ubuntu 14.04
dist: trusty
dist: xenial
sudo: required
dotnet: 1.0.4
dotnet: 2.2.401
mono: none
group: edge

Expand Down
9 changes: 4 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ dotnet --info
dotnet restore

for path in src/**/*.csproj; do
dotnet build -f netstandard1.3 -c Release ${path}
dotnet build -f netcoreapp1.1 -c Release ${path}
dotnet build -f netstandard2.0 -c Release ${path}
done

for path in test/*.Tests/*.csproj; do
dotnet test -f netcoreapp1.1 -c Release ${path}
dotnet test -f netcoreapp2.2 -c Release ${path}
done

for path in sample/ConsoleDemo/*.csproj; do
dotnet build -f netcoreapp1.1 -c Release ${path}
dotnet run -f netcoreapp1.1 --project ${path}
dotnet build -f netcoreapp2.2 -c Release ${path}
dotnet run -f netcoreapp2.2 --project ${path}
done
2 changes: 1 addition & 1 deletion sample/ConsoleDemo/ConsoleDemo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp1.1;net45</TargetFrameworks>
<TargetFrameworks>net45;netcoreapp2.2</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
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.1;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
<AssemblyName>Serilog.Sinks.SystemConsole.Tests</AssemblyName>
<PackageId>Serilog.Sinks.Console.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down

0 comments on commit 4989e8b

Please sign in to comment.