mirror/Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett synced 2025-02-20 21:37:09 +00:00
Code Issues Releases Wiki Activity

Remove Windows Owin from build

Browse source
This commit is contained in:
flightlevel 2018-07-12 21:16:38 +10:00
parent 4d1e4b59c8
commit 1792ed276e
3 changed files with 2 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
build.cake
View file

@ -88,8 +88,6 @@ Task("Copy-Files-Full-Framework")
var windowsOutput = windowsBuildFullFramework + "/Jackett";
CopyDirectory("./src/Jackett.Console/bin/" + configuration, windowsOutput);
CopyFiles("./src/Jackett.Service/bin/" + configuration + "/JackettService.*", windowsOutput);
CopyFiles("./src/Jackett.Tray/bin/" + configuration + "/JackettTray.*", windowsOutput);
CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/net452" + "/JackettUpdater.*", windowsOutput); //builds against multiple frameworks
CopyFiles("./Upstart.config", windowsOutput);
CopyFiles("./LICENSE", windowsOutput);
@ -119,32 +117,6 @@ Task("Check-Packaging-Platform")
}
});
Task("Package-Windows-Installer-Full-Framework")
.IsDependentOn("Check-Packaging-Platform")
.Does(() =>
{
string sourceFolder = MakeAbsolute(Directory(windowsBuildFullFramework + "/Jackett")).ToString();
InnoSetupSettings settings = new InnoSetupSettings();
settings.OutputDirectory = workingDir + "/" + artifactsDirName;
settings.Defines = new Dictionary<string, string>
{
{ "MyFileForVersion", sourceFolder + "/Jackett.Common.dll" },
{ "MySourceFolder", sourceFolder },
{ "MyOutputFilename", "Jackett.Installer.Windows" },
};
InnoSetup("./Installer.iss", settings);
});
Task("Package-Files-Full-Framework-Windows")
.IsDependentOn("Check-Packaging-Platform")
.Does(() =>
{
Zip(windowsBuildFullFramework, $"./{artifactsDirName}/Jackett.Binaries.Windows.zip");
Information(@"Full Framework Windows Binaries Zipping Completed");
});
Task("Package-Files-Full-Framework-Mono")
.IsDependentOn("Check-Packaging-Platform")
.Does(() =>
@ -154,8 +126,6 @@ Task("Package-Files-Full-Framework-Mono")
});
Task("Package-Full-Framework")
//.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(() =>
{
@ -169,13 +139,6 @@ Task("Kestrel-Full-Framework")
CleanDirectories("./src/**/obj");
CleanDirectories("./src/**/bin");
//Patch csproj to net461 until off Owin (net452 can't handle a nestandard library)
var trayCsproj = File("./src/Jackett.Tray/Jackett.Tray.csproj");
XmlPoke(trayCsproj, "*[name()='Project']/*[name()='PropertyGroup']/*[name()='TargetFrameworkVersion']", "v4.6.1");
var serviceCsproj = File("./src/Jackett.Service/Jackett.Service.csproj");
XmlPoke(serviceCsproj, "*[name()='Project']/*[name()='PropertyGroup']/*[name()='TargetFrameworkVersion']", "v4.6.1");
NuGetRestore("./src/Jackett.sln");
var buildSettings = new MSBuildSettings()
@ -260,13 +223,6 @@ Task("Experimental")
//.IsDependentOn("Experimental-DotNetCore")
.Does(() =>
{
//Unpatch csproj because it's annoying in source control (remove once off Owin)
var trayCsproj = File("./src/Jackett.Tray/Jackett.Tray.csproj");
XmlPoke(trayCsproj, "*[name()='Project']/*[name()='PropertyGroup']/*[name()='TargetFrameworkVersion']", "v4.5.2");
var serviceCsproj = File("./src/Jackett.Service/Jackett.Service.csproj");
XmlPoke(serviceCsproj, "*[name()='Project']/*[name()='PropertyGroup']/*[name()='TargetFrameworkVersion']", "v4.5.2");
Information("Experimental builds completed");
});

2
src/Jackett.Service/Jackett.Service.csproj
View file

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Jackett.Service</RootNamespace>
<AssemblyName>JackettService</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>

2
src/Jackett.Tray/Jackett.Tray.csproj
View file

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Jackett.Tray</RootNamespace>
<AssemblyName>JackettTray</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>