Merge remote-tracking branch 'upstream/develop' into feature/angular6-webpack4

This commit is contained in:
Matt Jeanes 2018-06-18 11:06:37 +01:00
commit 05fdb471f7
34 changed files with 1182 additions and 96 deletions

View file

@ -26,7 +26,7 @@ var csProj = "./src/Ombi/Ombi.csproj"; // Path to the project.csproj
var solutionFile = "Ombi.sln"; // Solution file if needed
GitVersion versionInfo = null;
var frameworkVer = "netcoreapp2.0";
var frameworkVer = "netcoreapp2.1";
var buildSettings = new DotNetCoreBuildSettings
{