From d40679cdf4625806f4280c23e14a947dc323dd22 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 30 Dec 2015 21:29:58 +0100 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20niveau=20de=20la=20plateforme?= =?UTF-8?q?=20.Net=20:=20Mono=204.2.1=20Asp.Net=204.0.30319.17020?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Web.config: l'entité nbsp n'est plus supportée * Yavsc.csproj: mise à niveau de Newtownsoft.Json * packages.config: mise à jour des paquets nuget * GoogleHelpers.cs: ça marchait avant, mais c'etait mal écrit et a cassé à la mise à niveau de la plateforme. * SimpleJsonPostMethod.cs: using Newtonsoft.Json --- web/ChangeLog | 8 +++++ web/Web.config | 4 +-- web/Yavsc.csproj | 6 ++-- web/packages.config | 50 +++++++++++++------------- yavscModel/ChangeLog | 7 ++++ yavscModel/Google/Api/GoogleHelpers.cs | 4 +-- yavscModel/SimpleJsonPostMethod.cs | 17 ++++----- 7 files changed, 56 insertions(+), 40 deletions(-) diff --git a/web/ChangeLog b/web/ChangeLog index d04edb72..d4d9708b 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,11 @@ +2015-12-30 Paul Schneider + + * Web.config: l'entité nbsp n'est plus supportée + + * Yavsc.csproj: mise à niveau de Newtownsoft.Json + + * packages.config: mise à jour des paquets nuget + 2015-12-30 Paul Schneider * Sent.aspx: Vue de confirmation du messag envoyé diff --git a/web/Web.config b/web/Web.config index 0f260bf8..3944a801 100644 --- a/web/Web.config +++ b/web/Web.config @@ -97,7 +97,7 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx - + @@ -162,7 +162,7 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx - + diff --git a/web/Yavsc.csproj b/web/Yavsc.csproj index f23845a4..a0363e18 100644 --- a/web/Yavsc.csproj +++ b/web/Yavsc.csproj @@ -97,9 +97,6 @@ nunit - - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll @@ -143,6 +140,9 @@ ..\packages\log4net.2.0.5\lib\net45-full\log4net.dll + + ..\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll + diff --git a/web/packages.config b/web/packages.config index 90bbef00..1878b154 100644 --- a/web/packages.config +++ b/web/packages.config @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog index 7b9b011c..ba1bed2a 100644 --- a/yavscModel/ChangeLog +++ b/yavscModel/ChangeLog @@ -1,3 +1,10 @@ +2015-12-30 Paul Schneider + + * GoogleHelpers.cs: ça marchait avant, mais c'etait mal écrit + et a cassé à la mise à niveau de la plateforme. + + * SimpleJsonPostMethod.cs: using Newtonsoft.Json + 2015-12-30 Paul Schneider * PerformerContact.cs: modèle de donnnée d'un message diff --git a/yavscModel/Google/Api/GoogleHelpers.cs b/yavscModel/Google/Api/GoogleHelpers.cs index 3229e084..aa416d52 100644 --- a/yavscModel/Google/Api/GoogleHelpers.cs +++ b/yavscModel/Google/Api/GoogleHelpers.cs @@ -145,14 +145,14 @@ namespace Yavsc.Model.Google.Api public static MessageWithPayloadResponse NotifyEvent (NominativeEventPub evpub) { using (var r = - new SimpleJsonPostMethod,MessageWithPayloadResponse> ( + new SimpleJsonPostMethod,MessageWithPayloadResponse> ( "https://gcm-http.googleapis.com/gcm/send")) { r.SetCredential ("key="+ConfigurationManager.AppSettings ["GOOGLE_API_KEY"]); var userprofile = ProfileBase.Create (evpub.PerformerName); var regid = userprofile.GetPropertyValue ("gregid") as string; if (regid == null) throw new NotImplementedException ("Notification via e-mail"); - var msg = new MessageWithPayload () { + var msg = new MessageWithPayload () { notification = new Notification() { title = evpub.Title, body = evpub.Description, icon = "icon" }, data = evpub, registration_ids = new string[] { regid } }; return r.Invoke (msg); diff --git a/yavscModel/SimpleJsonPostMethod.cs b/yavscModel/SimpleJsonPostMethod.cs index 691144a0..605a93f3 100644 --- a/yavscModel/SimpleJsonPostMethod.cs +++ b/yavscModel/SimpleJsonPostMethod.cs @@ -23,6 +23,8 @@ using System.Net; using System.Text; using System.IO; using System.Runtime.Serialization.Json; +using System.Collections.Generic; +using Newtonsoft.Json; namespace Yavsc.Model { @@ -75,18 +77,17 @@ namespace Yavsc.Model /// Query. public TAnswer Invoke(TQuery query) { - - DataContractJsonSerializer serquery = new DataContractJsonSerializer (typeof(TQuery)); - DataContractJsonSerializer seransw = new DataContractJsonSerializer (typeof(TAnswer)); - - using (Stream streamQuery = request.GetRequestStream()) { - serquery.WriteObject (streamQuery, query); - } + using (Stream streamQuery = request.GetRequestStream()) { + using (StreamWriter writer = new StreamWriter(streamQuery)) { + writer.Write (JsonConvert.SerializeObject(query)); + }} TAnswer ans = default (TAnswer); using (WebResponse response = Request.GetResponse ()) { using (Stream responseStream = response.GetResponseStream ()) { - ans = (TAnswer) seransw.ReadObject(responseStream); + using (StreamReader rdr = new StreamReader (responseStream)) { + ans = (TAnswer) JsonConvert.DeserializeObject (rdr.ReadToEnd ()); + } } response.Close(); }