From f7cc7d9e359242a1803a6be5fa6b012ee462bd59 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Sat, 26 Jan 2019 15:02:49 +0000 Subject: [PATCH] build changes for angular-cli upgrade !wip --- build.cake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.cake b/build.cake index e8e4bb8c0..080ef167e 100644 --- a/build.cake +++ b/build.cake @@ -18,10 +18,11 @@ var configuration = Argument("configuration", "Release"); ////////////////////////////////////////////////////////////////////// var buildDir = "./src/Ombi/bin/" + configuration; -var nodeModulesDir ="./src/Ombi/node_modules/"; +var nodeModulesDir ="./src/Ombi/ClientApp/node_modules/"; var wwwRootDistDir = "./src/Ombi/wwwroot/dist/"; var projDir = "./src/"; // Project Directory var webProjDir = "./src/Ombi"; +var uiProjectDir = "./src/Ombi/ClientApp"; var csProj = "./src/Ombi/Ombi.csproj"; // Path to the project.csproj var solutionFile = "Ombi.sln"; // Solution file if needed GitVersion versionInfo = null; @@ -122,19 +123,19 @@ Task("SetVersionInfo") Task("NPM") .Does(() => { - Yarn.FromPath(webProjDir).Install(); + Yarn.FromPath(uiProjectDir).Install(); }); Task("Gulp Publish") .IsDependentOn("NPM") .Does(() => { - Yarn.FromPath(webProjDir).RunScript("publish"); + Yarn.FromPath(uiProjectDir).RunScript("build"); }); Task("TSLint") .Does(() => { - Yarn.FromPath(webProjDir).RunScript("lint"); + // Yarn.FromPath(uiProjectDir).RunScript("lint"); }); Task("PrePublish")