From 256002447799c62bef8c700571533f8bd5ce3d12 Mon Sep 17 00:00:00 2001 From: Tomasz Heimowski Date: Wed, 8 Aug 2018 14:52:58 +0200 Subject: [PATCH] Fix azure condition --- Content/.template.config/template.json | 24 ++++++++++++------------ build.fsx | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Content/.template.config/template.json b/Content/.template.config/template.json index ac06f3b0..dea42906 100644 --- a/Content/.template.config/template.json +++ b/Content/.template.config/template.json @@ -119,62 +119,62 @@ "modifiers": [ { "include": "paket_noazure_noremoting-nofulma_saturn-noremoting-noazure.lock", - "condition": "(server == \"saturn\" && remoting == false && deploy == \"none\" && layout == \"none\")", + "condition": "(server == \"saturn\" && remoting == false && deploy != \"azure\" && layout == \"none\")", "rename": { "paket_noazure_noremoting-nofulma_saturn-noremoting-noazure.lock": "paket.lock" } }, { "include": "paket_noazure_noremoting-nofulma_giraffe-noremoting-noazure.lock", - "condition": "(server == \"giraffe\" && remoting == false && deploy == \"none\" && layout == \"none\")", + "condition": "(server == \"giraffe\" && remoting == false && deploy != \"azure\" && layout == \"none\")", "rename": { "paket_noazure_noremoting-nofulma_giraffe-noremoting-noazure.lock": "paket.lock" } }, { "include": "paket_noazure_noremoting-nofulma_suave-noremoting-noazure.lock", - "condition": "(server == \"suave\" && remoting == false && deploy == \"none\" && layout == \"none\")", + "condition": "(server == \"suave\" && remoting == false && deploy != \"azure\" && layout == \"none\")", "rename": { "paket_noazure_noremoting-nofulma_suave-noremoting-noazure.lock": "paket.lock" } }, { "include": "paket_noazure_remoting-nofulma_saturn-remoting-noazure.lock", - "condition": "(server == \"saturn\" && remoting == true && deploy == \"none\" && layout == \"none\")", + "condition": "(server == \"saturn\" && remoting == true && deploy != \"azure\" && layout == \"none\")", "rename": { "paket_noazure_remoting-nofulma_saturn-remoting-noazure.lock": "paket.lock" } }, { "include": "paket_noazure_remoting-nofulma_giraffe-remoting-noazure.lock", - "condition": "(server == \"giraffe\" && remoting == true && deploy == \"none\" && layout == \"none\")", + "condition": "(server == \"giraffe\" && remoting == true && deploy != \"azure\" && layout == \"none\")", "rename": { "paket_noazure_remoting-nofulma_giraffe-remoting-noazure.lock": "paket.lock" } }, { "include": "paket_noazure_remoting-nofulma_suave-remoting-noazure.lock", - "condition": "(server == \"suave\" && remoting == true && deploy == \"none\" && layout == \"none\")", + "condition": "(server == \"suave\" && remoting == true && deploy != \"azure\" && layout == \"none\")", "rename": { "paket_noazure_remoting-nofulma_suave-remoting-noazure.lock": "paket.lock" } }, { "include": "paket_noazure_noremoting-fulma_saturn-noremoting-noazure.lock", - "condition": "(server == \"saturn\" && remoting == false && deploy == \"none\" && layout != \"none\")", + "condition": "(server == \"saturn\" && remoting == false && deploy != \"azure\" && layout != \"none\")", "rename": { "paket_noazure_noremoting-fulma_saturn-noremoting-noazure.lock": "paket.lock" } }, { "include": "paket_noazure_noremoting-fulma_giraffe-noremoting-noazure.lock", - "condition": "(server == \"giraffe\" && remoting == false && deploy == \"none\" && layout != \"none\")", + "condition": "(server == \"giraffe\" && remoting == false && deploy != \"azure\" && layout != \"none\")", "rename": { "paket_noazure_noremoting-fulma_giraffe-noremoting-noazure.lock": "paket.lock" } }, { "include": "paket_noazure_noremoting-fulma_suave-noremoting-noazure.lock", - "condition": "(server == \"suave\" && remoting == false && deploy == \"none\" && layout != \"none\")", + "condition": "(server == \"suave\" && remoting == false && deploy != \"azure\" && layout != \"none\")", "rename": { "paket_noazure_noremoting-fulma_suave-noremoting-noazure.lock": "paket.lock" } }, { "include": "paket_noazure_remoting-fulma_saturn-remoting-noazure.lock", - "condition": "(server == \"saturn\" && remoting == true && deploy == \"none\" && layout != \"none\")", + "condition": "(server == \"saturn\" && remoting == true && deploy != \"azure\" && layout != \"none\")", "rename": { "paket_noazure_remoting-fulma_saturn-remoting-noazure.lock": "paket.lock" } }, { "include": "paket_noazure_remoting-fulma_giraffe-remoting-noazure.lock", - "condition": "(server == \"giraffe\" && remoting == true && deploy == \"none\" && layout != \"none\")", + "condition": "(server == \"giraffe\" && remoting == true && deploy != \"azure\" && layout != \"none\")", "rename": { "paket_noazure_remoting-fulma_giraffe-remoting-noazure.lock": "paket.lock" } }, { "include": "paket_noazure_remoting-fulma_suave-remoting-noazure.lock", - "condition": "(server == \"suave\" && remoting == true && deploy == \"none\" && layout != \"none\")", + "condition": "(server == \"suave\" && remoting == true && deploy != \"azure\" && layout != \"none\")", "rename": { "paket_noazure_remoting-fulma_suave-remoting-noazure.lock": "paket.lock" } }, { diff --git a/build.fsx b/build.fsx index 491493e9..d993d98c 100644 --- a/build.fsx +++ b/build.fsx @@ -185,19 +185,19 @@ Target.create "GenJsonConditions" (fun _ -> for config in configs do let lockFileName = fullLockFileName config.ToBuild config.ToClient config.ToServer let server = string config.Server - let deploy = if config.Azure then "azure" else "none" + let azureOperator = if config.Azure then "==" else "!=" let remoting = config.Remoting let layoutOperator = if config.Fulma then "!=" else "==" let template = sprintf """ { "include": "%s", - "condition": "(server == \"%s\" && remoting == %b && deploy == \"%s\" && layout %s \"none\")", + "condition": "(server == \"%s\" && remoting == %b && deploy %s \"azure\" && layout %s \"none\")", "rename": { "%s": "paket.lock" } },""" lockFileName server remoting - deploy + azureOperator layoutOperator lockFileName