From 4d1e4b59c82c98d5dc8d610274f833d0a7f80373 Mon Sep 17 00:00:00 2001 From: flightlevel Date: Wed, 11 Jul 2018 19:37:19 +1000 Subject: [PATCH] Update to .NET Core 2.1.1 --- build.cake | 8 ++++---- src/Jackett.Server/Jackett.Server.csproj | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.cake b/build.cake index 8e882f994..b00800e02 100644 --- a/build.cake +++ b/build.cake @@ -154,8 +154,8 @@ Task("Package-Files-Full-Framework-Mono") }); Task("Package-Full-Framework") - .IsDependentOn("Package-Windows-Installer-Full-Framework") - .IsDependentOn("Package-Files-Full-Framework-Windows") + //.IsDependentOn("Package-Windows-Installer-Full-Framework") Now distributing Kestrel builds + //.IsDependentOn("Package-Files-Full-Framework-Windows") Now distributing Kestrel builds .IsDependentOn("Package-Files-Full-Framework-Mono") .Does(() => { @@ -198,7 +198,7 @@ Task("Experimental-Kestrel-Windows-Full-Framework") CopyFiles("./src/Jackett.Tray/bin/" + configuration + "/JackettTray.*", buildOutputPath); CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/net461" + "/JackettUpdater.*", buildOutputPath); //builds against multiple frameworks - Zip("./BuildOutput/Experimental/net461/win7-x86", $"./{artifactsDirName}/Experimental.Jackett.Binaries.Windows.zip"); + Zip("./BuildOutput/Experimental/net461/win7-x86", $"./{artifactsDirName}/Jackett.Binaries.Windows.zip"); //InnoSetup string sourceFolder = MakeAbsolute(Directory(buildOutputPath)).ToString(); @@ -209,7 +209,7 @@ Task("Experimental-Kestrel-Windows-Full-Framework") { { "MyFileForVersion", sourceFolder + "/Jackett.Common.dll" }, { "MySourceFolder", sourceFolder }, - { "MyOutputFilename", "Experimental.Jackett.Installer.Windows" }, + { "MyOutputFilename", "Jackett.Installer.Windows" }, }; InnoSetup("./Installer.iss", settings); diff --git a/src/Jackett.Server/Jackett.Server.csproj b/src/Jackett.Server/Jackett.Server.csproj index 587b69824..dce2cd4b6 100644 --- a/src/Jackett.Server/Jackett.Server.csproj +++ b/src/Jackett.Server/Jackett.Server.csproj @@ -25,15 +25,15 @@ - - - - - - - - - + + + + + + + + +