From 402adc4d66fea155ef9d8043ef3739ba577255b2 Mon Sep 17 00:00:00 2001 From: Asval Date: Sun, 8 Dec 2019 20:45:18 +0100 Subject: [PATCH] 3.0.2 + allow global messages to be separated by versions --- FModel/Methods/Utilities/EndpointsUtility.cs | 3 ++- FModel/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/FModel/Methods/Utilities/EndpointsUtility.cs b/FModel/Methods/Utilities/EndpointsUtility.cs index f195aa47..5745d341 100644 --- a/FModel/Methods/Utilities/EndpointsUtility.cs +++ b/FModel/Methods/Utilities/EndpointsUtility.cs @@ -1,6 +1,7 @@ using Newtonsoft.Json.Linq; using RestSharp; using System.Collections.Generic; +using System.Reflection; using System.Text; using FProp = FModel.Properties.Settings; @@ -31,7 +32,7 @@ namespace FModel.Methods.Utilities JToken FData = JToken.Parse(EndpointContent); //GLOBAL MESSAGES - JArray FGMessages = FData["Global_Messages"].Value(); + JArray FGMessages = FData["Global_Messages"][Assembly.GetExecutingAssembly().GetName().Version.ToString()].Value(); if (!string.IsNullOrEmpty(FGMessages[0]["Message"].Value())) { StringBuilder sb = new StringBuilder(); diff --git a/FModel/Properties/AssemblyInfo.cs b/FModel/Properties/AssemblyInfo.cs index 864b3784..e2426a78 100644 --- a/FModel/Properties/AssemblyInfo.cs +++ b/FModel/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut // en utilisant '*', comme indiqué ci-dessous : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.1.0")] -[assembly: AssemblyFileVersion("3.0.1.0")] +[assembly: AssemblyVersion("3.0.2.0")] +[assembly: AssemblyFileVersion("3.0.2.0")]