From ce775aaa17e357b750ec5f67d1d1c488565e3efb Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Mon, 25 Jul 2016 13:17:14 +0200 Subject: [PATCH 1/5] GCM Ok[Debug] --- BookAStar.sln | 2 +- .../Helpers/SimpleJsonPostMethod.cs | 2 +- BookAStar/BookAStar.Droid/MainActivity.cs | 8 ++- .../Properties/AndroidManifest.xml | 7 +- .../Services/GcmRegistrationIntentService.cs | 20 +++++- .../Services/MyGcmIntentService.cs | 2 +- BookAStar/BookAStar.Droid/app.config | 2 +- BookAStar/BookAStar.iOS/BookAStar.iOS.csproj | 3 +- BookAStar/BookAStar.iOS/app.config | 11 ++++ BookAStar/BookAStar/App.xaml.cs | 3 +- BookAStar/BookAStar/Helpers/MainSettings.cs | 2 +- Yavsc.Api/project.lock.json | 64 ++++++++++++++++++- Yavsc.Client/Yavsc.Client.csproj | 5 +- Yavsc.Client/app.config | 11 ++++ Yavsc.Client/packages.config | 2 +- wrap/Yavsc.Client/project.json | 4 ++ 16 files changed, 126 insertions(+), 22 deletions(-) create mode 100644 BookAStar/BookAStar.iOS/app.config create mode 100644 Yavsc.Client/app.config diff --git a/BookAStar.sln b/BookAStar.sln index cf37a60d..183b2925 100644 --- a/BookAStar.sln +++ b/BookAStar.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookAStar.Droid", "BookAStar\BookAStar.Droid\BookAStar.Droid.csproj", "{2A8C2BD7-B1B6-4D74-A3FC-3F5DB3BE325E}" EndProject diff --git a/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs b/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs index 7b200659..4cc139e4 100644 --- a/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs +++ b/BookAStar/BookAStar.Droid/Helpers/SimpleJsonPostMethod.cs @@ -48,7 +48,7 @@ namespace Yavsc.Helpers request.SendChunked = true; request.TransferEncoding = "UTF-8"; if (authorizationHeader!=null) - request.Headers.Add($"Authorization: Bearer {authorizationHeader}"); + request.Headers.Add($"Authorization: {authorizationHeader}"); } public static string BasePath { get; private set; } = "http://dev.pschneider.fr/api/"; diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs index 834ee3b6..cf78b0b6 100644 --- a/BookAStar/BookAStar.Droid/MainActivity.cs +++ b/BookAStar/BookAStar.Droid/MainActivity.cs @@ -293,7 +293,8 @@ namespace BookAStar.Droid public TAnswer InvokeApi(string method, object arg) { using (var m = - new SimpleJsonPostMethod(method, + new SimpleJsonPostMethod( + method, "Bearer "+ MainSettings.CurrentUser.YavscTokens.AccessToken )) { @@ -304,9 +305,10 @@ namespace BookAStar.Droid public object InvokeApi(string method, object arg) { using (var m = - new SimpleJsonPostMethod(method, + new SimpleJsonPostMethod( + method, "Bearer " + MainSettings.CurrentUser.YavscTokens.AccessToken - )) + )) { return m.InvokeJson(arg); } diff --git a/BookAStar/BookAStar.Droid/Properties/AndroidManifest.xml b/BookAStar/BookAStar.Droid/Properties/AndroidManifest.xml index a0c47dad..659bb9cf 100644 --- a/BookAStar/BookAStar.Droid/Properties/AndroidManifest.xml +++ b/BookAStar/BookAStar.Droid/Properties/AndroidManifest.xml @@ -29,13 +29,14 @@ - - - + + + + \ No newline at end of file diff --git a/BookAStar/BookAStar.Droid/Services/GcmRegistrationIntentService.cs b/BookAStar/BookAStar.Droid/Services/GcmRegistrationIntentService.cs index ac849504..9ede457f 100644 --- a/BookAStar/BookAStar.Droid/Services/GcmRegistrationIntentService.cs +++ b/BookAStar/BookAStar.Droid/Services/GcmRegistrationIntentService.cs @@ -44,9 +44,23 @@ namespace BookAStar.Droid Log.Info ("RegistrationIntentService", "Calling InstanceID.GetToken"); lock (locker) { - - var instanceID = InstanceID.GetInstance (this); - var senderid = MainSettings.GoogleSenderId; + + var instanceID = InstanceID.GetInstance(this); + +#if DEBUG + try + { + instanceID.DeleteInstanceID(); + + } + catch(Exception ex) + { + Debug.WaitForDebugger(); + Log.Debug("bas.GCM", ex.StackTrace.ToString()); + } +#endif + + var senderid = MainSettings.GoogleSenderId; var token = instanceID.GetToken ( senderid, GoogleCloudMessaging.InstanceIdScope, null); diff --git a/BookAStar/BookAStar.Droid/Services/MyGcmIntentService.cs b/BookAStar/BookAStar.Droid/Services/MyGcmIntentService.cs index aa2007fd..b6ed58f1 100644 --- a/BookAStar/BookAStar.Droid/Services/MyGcmIntentService.cs +++ b/BookAStar/BookAStar.Droid/Services/MyGcmIntentService.cs @@ -99,7 +99,7 @@ namespace BookAStar.Droid void SubscribeGCM () { Context context = this.ApplicationContext; - string senders = "325408689282"; + string senders = MainSettings.GoogleSenderId; // Resources.GetString(GoogleSenderId); Intent intent = new Intent ("com.google.android.c2dm.intent.REGISTER"); intent.SetPackage ("com.google.android.gsf"); diff --git a/BookAStar/BookAStar.Droid/app.config b/BookAStar/BookAStar.Droid/app.config index de5386a4..8460dd43 100644 --- a/BookAStar/BookAStar.Droid/app.config +++ b/BookAStar/BookAStar.Droid/app.config @@ -4,7 +4,7 @@ - + diff --git a/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj b/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj index b57c0800..1c69864b 100644 --- a/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj +++ b/BookAStar/BookAStar.iOS/BookAStar.iOS.csproj @@ -90,6 +90,7 @@ + @@ -151,4 +152,4 @@ - + \ No newline at end of file diff --git a/BookAStar/BookAStar.iOS/app.config b/BookAStar/BookAStar.iOS/app.config new file mode 100644 index 00000000..8460dd43 --- /dev/null +++ b/BookAStar/BookAStar.iOS/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs index 412de277..adb41003 100644 --- a/BookAStar/BookAStar/App.xaml.cs +++ b/BookAStar/BookAStar/App.xaml.cs @@ -86,7 +86,8 @@ namespace BookAStar public async Task PostDeviceInfo() { var res = PlateformSpecificInstance.InvokeApi( - "gcm/register", PlateformSpecificInstance.GetDeviceInfo()); + "gcm/register", + PlateformSpecificInstance.GetDeviceInfo()); } } diff --git a/BookAStar/BookAStar/Helpers/MainSettings.cs b/BookAStar/BookAStar/Helpers/MainSettings.cs index 33bd6581..5b69b109 100644 --- a/BookAStar/BookAStar/Helpers/MainSettings.cs +++ b/BookAStar/BookAStar/Helpers/MainSettings.cs @@ -58,7 +58,7 @@ namespace BookAStar }; private static readonly Dictionary environ = new Dictionary(); - public static readonly string YavscApiUrl = "dev.pschneider.fr"; + public static readonly string YavscApiUrl = "http://dev.pschneider.fr/api"; #endregion diff --git a/Yavsc.Api/project.lock.json b/Yavsc.Api/project.lock.json index a111b505..f3013ca9 100644 --- a/Yavsc.Api/project.lock.json +++ b/Yavsc.Api/project.lock.json @@ -120,6 +120,18 @@ "lib/net45/System.Interactive.Async.dll": {} } }, + "Json.NET.Web/1.0.49": { + "type": "package", + "dependencies": { + "Newtonsoft.Json": "8.0.3" + }, + "compile": { + "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} + }, + "runtime": { + "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} + } + }, "Microsoft.AspNet.Authentication/1.0.0-rc1-final": { "type": "package", "dependencies": { @@ -754,7 +766,11 @@ }, "Yavsc.Client/1.0.0": { "type": "project", - "framework": ".NETPortable,Version=v4.5,Profile=Profile111" + "framework": ".NETPortable,Version=v4.5,Profile=Profile111", + "dependencies": { + "Json.NET.Web": "1.0.49", + "Newtonsoft.Json": "9.0.1" + } } }, ".NETFramework,Version=v4.5.1/win7-x86": { @@ -875,6 +891,18 @@ "lib/net45/System.Interactive.Async.dll": {} } }, + "Json.NET.Web/1.0.49": { + "type": "package", + "dependencies": { + "Newtonsoft.Json": "8.0.3" + }, + "compile": { + "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} + }, + "runtime": { + "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} + } + }, "Microsoft.AspNet.Authentication/1.0.0-rc1-final": { "type": "package", "dependencies": { @@ -1509,7 +1537,11 @@ }, "Yavsc.Client/1.0.0": { "type": "project", - "framework": ".NETPortable,Version=v4.5,Profile=Profile111" + "framework": ".NETPortable,Version=v4.5,Profile=Profile111", + "dependencies": { + "Json.NET.Web": "1.0.49", + "Newtonsoft.Json": "9.0.1" + } } }, ".NETFramework,Version=v4.5.1/win7-x64": { @@ -1630,6 +1662,18 @@ "lib/net45/System.Interactive.Async.dll": {} } }, + "Json.NET.Web/1.0.49": { + "type": "package", + "dependencies": { + "Newtonsoft.Json": "8.0.3" + }, + "compile": { + "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} + }, + "runtime": { + "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll": {} + } + }, "Microsoft.AspNet.Authentication/1.0.0-rc1-final": { "type": "package", "dependencies": { @@ -2264,7 +2308,11 @@ }, "Yavsc.Client/1.0.0": { "type": "project", - "framework": ".NETPortable,Version=v4.5,Profile=Profile111" + "framework": ".NETPortable,Version=v4.5,Profile=Profile111", + "dependencies": { + "Json.NET.Web": "1.0.49", + "Newtonsoft.Json": "9.0.1" + } } } }, @@ -2383,6 +2431,16 @@ "lib/portable-windows8+net45+wp8/System.Interactive.Async.XML" ] }, + "Json.NET.Web/1.0.49": { + "type": "package", + "sha512": "1lhQBN6Oi5IEf2BIhBgqWH3r9uBUitvsoQi0QlC+8IkFYyHq+076OorXbcTxmcXgSsmc66LyoUpqG62BnLOWgg==", + "files": [ + "Json.NET.Web.1.0.49.nupkg", + "Json.NET.Web.1.0.49.nupkg.sha512", + "Json.NET.Web.nuspec", + "lib/portable45-net45+win8+wpa81/Json.NET.Web.dll" + ] + }, "Microsoft.AspNet.Authentication/1.0.0-rc1-final": { "type": "package", "serviceable": true, diff --git a/Yavsc.Client/Yavsc.Client.csproj b/Yavsc.Client/Yavsc.Client.csproj index b21ce6f0..d7771e2d 100644 --- a/Yavsc.Client/Yavsc.Client.csproj +++ b/Yavsc.Client/Yavsc.Client.csproj @@ -48,6 +48,7 @@ + Designer @@ -57,8 +58,8 @@ ..\packages\Json.NET.Web.1.0.49\lib\portable45-net45+win8+wpa81\Json.NET.Web.dll True - - ..\packages\Newtonsoft.Json.8.0.3\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll True diff --git a/Yavsc.Client/app.config b/Yavsc.Client/app.config new file mode 100644 index 00000000..8460dd43 --- /dev/null +++ b/Yavsc.Client/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Yavsc.Client/packages.config b/Yavsc.Client/packages.config index dc205314..3e864e39 100644 --- a/Yavsc.Client/packages.config +++ b/Yavsc.Client/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/wrap/Yavsc.Client/project.json b/wrap/Yavsc.Client/project.json index 451528f0..cbd22f76 100644 --- a/wrap/Yavsc.Client/project.json +++ b/wrap/Yavsc.Client/project.json @@ -6,6 +6,10 @@ "bin": { "assembly": "../../Yavsc.Client/obj/{configuration}/Yavsc.Client.dll", "pdb": "../../Yavsc.Client/obj/{configuration}/Yavsc.Client.pdb" + }, + "dependencies": { + "Json.NET.Web": "1.0.49", + "Newtonsoft.Json": "9.0.1" } } } From 880b896f6758c7562b55d8a245edee295e47029a Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Wed, 27 Jul 2016 16:00:03 +0200 Subject: [PATCH 2/5] "MessageSender" became "sendmsg" --- MessageSender/MessageSender.xproj | 22 ----- MessageSender/MessageSender.xproj.user | 6 -- MessageSender/Program.cs | 51 ----------- MessageSender/Properties/AssemblyInfo.cs | 19 ---- MessageSender/Properties/launchSettings.json | 5 -- MessageSender/project.json | 21 ----- MessageSender/project.lock.json | 92 -------------------- 7 files changed, 216 deletions(-) delete mode 100644 MessageSender/MessageSender.xproj delete mode 100644 MessageSender/MessageSender.xproj.user delete mode 100644 MessageSender/Program.cs delete mode 100644 MessageSender/Properties/AssemblyInfo.cs delete mode 100644 MessageSender/Properties/launchSettings.json delete mode 100644 MessageSender/project.json delete mode 100644 MessageSender/project.lock.json diff --git a/MessageSender/MessageSender.xproj b/MessageSender/MessageSender.xproj deleted file mode 100644 index 222981f4..00000000 --- a/MessageSender/MessageSender.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2f4ae1ac-5311-483b-ab03-f8bfdf998f29 - MessageSender - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - True - - - \ No newline at end of file diff --git a/MessageSender/MessageSender.xproj.user b/MessageSender/MessageSender.xproj.user deleted file mode 100644 index bc5e9832..00000000 --- a/MessageSender/MessageSender.xproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - console1 - - \ No newline at end of file diff --git a/MessageSender/Program.cs b/MessageSender/Program.cs deleted file mode 100644 index 7bd387f0..00000000 --- a/MessageSender/Program.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Net.Http; -using System.Net.Http.Headers; -using System.Text; -using System.Threading.Tasks; -using Newtonsoft.Json.Linq; - -namespace MessageSender -{ - public class Program - { - public const string API_KEY = "AIzaSyDwPlu2ky9AoPwDvThoXxJwqiPq-Tc8p8k"; - public const string MESSAGE = "Hello, Xamarin!"; - - static void Main(string[] args) - { - var jGcmData = new JObject(); - var jData = new JObject(); - - jData.Add("message", MESSAGE); - jGcmData.Add("to", "/topics/global"); - jGcmData.Add("data", jData); - - var url = new Uri("https://gcm-http.googleapis.com/gcm/send"); - try - { - using (var client = new HttpClient()) - { - client.DefaultRequestHeaders.Accept.Add( - new MediaTypeWithQualityHeaderValue("application/json")); - - client.DefaultRequestHeaders.TryAddWithoutValidation( - "Authorization", "key=" + API_KEY); - - Task.WaitAll(client.PostAsync(url, - new StringContent(jGcmData.ToString(), Encoding.Default, "application/json")) - .ContinueWith(response => - { - Console.WriteLine(response); - Console.WriteLine("Message sent: check the client device notification tray."); - })); - } - } - catch (Exception e) - { - Console.WriteLine("Unable to send GCM message:"); - Console.Error.WriteLine(e.StackTrace); - } - } - } -} diff --git a/MessageSender/Properties/AssemblyInfo.cs b/MessageSender/Properties/AssemblyInfo.cs deleted file mode 100644 index b99a04e3..00000000 --- a/MessageSender/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("MessageSender")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("2f4ae1ac-5311-483b-ab03-f8bfdf998f29")] diff --git a/MessageSender/Properties/launchSettings.json b/MessageSender/Properties/launchSettings.json deleted file mode 100644 index 3a2cb634..00000000 --- a/MessageSender/Properties/launchSettings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "profiles": { - "console1": {} - } -} \ No newline at end of file diff --git a/MessageSender/project.json b/MessageSender/project.json deleted file mode 100644 index 2d200be1..00000000 --- a/MessageSender/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "build", - "version": "1.0.0-rc2-3002702" - }, - "Newtonsoft.Json": "9.0.1" - }, - - "frameworks": { - "dnx451": {"compilationOptions": {"emitEntryPoint": true}}, - "netcoreapp1.0": { - "imports": "dnxcore50" - } - } -} diff --git a/MessageSender/project.lock.json b/MessageSender/project.lock.json deleted file mode 100644 index 3535509f..00000000 --- a/MessageSender/project.lock.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "locked": false, - "version": 2, - "targets": { - "DNX,Version=v4.5.1": { - "Microsoft.NETCore.App/1.0.0-rc2-3002702": { - "type": "package" - }, - "Newtonsoft.Json/9.0.1": { - "type": "package", - "compile": { - "lib/net45/Newtonsoft.Json.dll": {} - }, - "runtime": { - "lib/net45/Newtonsoft.Json.dll": {} - } - } - }, - "DNX,Version=v4.5.1/win7-x86": { - "Microsoft.NETCore.App/1.0.0-rc2-3002702": { - "type": "package" - }, - "Newtonsoft.Json/9.0.1": { - "type": "package", - "compile": { - "lib/net45/Newtonsoft.Json.dll": {} - }, - "runtime": { - "lib/net45/Newtonsoft.Json.dll": {} - } - } - }, - "DNX,Version=v4.5.1/win7-x64": { - "Microsoft.NETCore.App/1.0.0-rc2-3002702": { - "type": "package" - }, - "Newtonsoft.Json/9.0.1": { - "type": "package", - "compile": { - "lib/net45/Newtonsoft.Json.dll": {} - }, - "runtime": { - "lib/net45/Newtonsoft.Json.dll": {} - } - } - } - }, - "libraries": { - "Microsoft.NETCore.App/1.0.0-rc2-3002702": { - "type": "package", - "sha512": "G+wsg7zwathgjAOZ2w0XbHU0MD4GEHIpi/JsvBGmbACW+/Dsx2YoXai7LLItfe5ZVidqBXXQCz8NxCKbKqr8Ww==", - "files": [ - "dotnet_library_license.txt", - "Microsoft.NETCore.App.1.0.0-rc2-3002702.nupkg", - "Microsoft.NETCore.App.1.0.0-rc2-3002702.nupkg.sha512", - "Microsoft.NETCore.App.nuspec", - "ThirdPartyNotices.txt" - ] - }, - "Newtonsoft.Json/9.0.1": { - "type": "package", - "sha512": "U82mHQSKaIk+lpSVCbWYKNavmNH1i5xrExDEquU1i6I5pV6UMOqRnJRSlKO3cMPfcpp0RgDY+8jUXHdQ4IfXvw==", - "files": [ - "lib/net20/Newtonsoft.Json.dll", - "lib/net20/Newtonsoft.Json.xml", - "lib/net35/Newtonsoft.Json.dll", - "lib/net35/Newtonsoft.Json.xml", - "lib/net40/Newtonsoft.Json.dll", - "lib/net40/Newtonsoft.Json.xml", - "lib/net45/Newtonsoft.Json.dll", - "lib/net45/Newtonsoft.Json.xml", - "lib/netstandard1.0/Newtonsoft.Json.dll", - "lib/netstandard1.0/Newtonsoft.Json.xml", - "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.dll", - "lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml", - "lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll", - "lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.xml", - "Newtonsoft.Json.9.0.1.nupkg", - "Newtonsoft.Json.9.0.1.nupkg.sha512", - "Newtonsoft.Json.nuspec", - "tools/install.ps1" - ] - } - }, - "projectFileDependencyGroups": { - "": [ - "Microsoft.NETCore.App >= 1.0.0-rc2-3002702", - "Newtonsoft.Json >= 9.0.1" - ], - "DNX,Version=v4.5.1": [] - } -} \ No newline at end of file From ca4e473757281fe9101ccc9c640c43b905e81497 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sat, 30 Jul 2016 23:46:47 +0200 Subject: [PATCH 3/5] no more Yavsc.Api Yavsc.Api is once again a bad bid --- BookAStar.sln | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) diff --git a/BookAStar.sln b/BookAStar.sln index 183b2925..622d32c9 100644 --- a/BookAStar.sln +++ b/BookAStar.sln @@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookAStar.iOS", "BookAStar\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookAStar", "BookAStar\BookAStar\BookAStar.csproj", "{A0815650-0A0A-47B0-8826-771F0E1AD137}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Yavsc.Server.Api", "Yavsc.Api\Yavsc.Server.Api.xproj", "{5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Client", "Yavsc.Client\Yavsc.Client.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}" EndProject Global @@ -193,54 +191,6 @@ Global {A0815650-0A0A-47B0-8826-771F0E1AD137}.Release|x64.Build.0 = Release|Any CPU {A0815650-0A0A-47B0-8826-771F0E1AD137}.Release|x86.ActiveCfg = Release|Any CPU {A0815650-0A0A-47B0-8826-771F0E1AD137}.Release|x86.Build.0 = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|ARM.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|iPhone.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|x64.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|x64.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|x86.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.AppStore|x86.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|ARM.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|ARM.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|iPhone.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|x64.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|x64.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|x86.ActiveCfg = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Debug|x86.Build.0 = Debug|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|Any CPU.Build.0 = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|ARM.ActiveCfg = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|ARM.Build.0 = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|iPhone.ActiveCfg = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|iPhone.Build.0 = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|x64.ActiveCfg = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|x64.Build.0 = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|x86.ActiveCfg = Release|Any CPU - {5C3248AC-CAE0-4324-8A70-08F2DCA9FB08}.Release|x86.Build.0 = Release|Any CPU {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU From c93058f4d52e8ff49e447530f6f7caf4a4680ea9 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sat, 30 Jul 2016 23:49:05 +0200 Subject: [PATCH 4/5] build under M$ VS --- Yavsc.Client/Yavsc.Client.nuget.targets | 6 + Yavsc.Client/project.json | 7 +- Yavsc.Client/project.lock.json | 253 +----------------------- 3 files changed, 15 insertions(+), 251 deletions(-) create mode 100644 Yavsc.Client/Yavsc.Client.nuget.targets diff --git a/Yavsc.Client/Yavsc.Client.nuget.targets b/Yavsc.Client/Yavsc.Client.nuget.targets new file mode 100644 index 00000000..85cf587b --- /dev/null +++ b/Yavsc.Client/Yavsc.Client.nuget.targets @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Yavsc.Client/project.json b/Yavsc.Client/project.json index 8e58e005..6204fd2a 100644 --- a/Yavsc.Client/project.json +++ b/Yavsc.Client/project.json @@ -12,10 +12,9 @@ "tooling": { "defaultNamespace": "Yavsc" }, - "dependencies": { - "Microsoft.AspNet.SignalR.Client.Portable": "2.0.1" - }, + "dependencies": {}, "frameworks": { - "net451": {} + "net451": {}, + ".NETPortable,Version=v4.5,Profile=Profile111": {} } } \ No newline at end of file diff --git a/Yavsc.Client/project.lock.json b/Yavsc.Client/project.lock.json index a380b838..ec5815d6 100644 --- a/Yavsc.Client/project.lock.json +++ b/Yavsc.Client/project.lock.json @@ -2,254 +2,13 @@ "locked": false, "version": 2, "targets": { - ".NETFramework,Version=v4.5.1": { - "Microsoft.AspNet.SignalR.Client.Portable/2.0.1": { - "type": "package", - "dependencies": { - "Microsoft.Net.Http": "2.2.18", - "Newtonsoft.Json": "5.0.6" - }, - "compile": { - "lib/Microsoft.AspNet.SignalR.Client.dll": {} - }, - "runtime": { - "lib/Microsoft.AspNet.SignalR.Client.dll": {} - } - }, - "Microsoft.Bcl/1.1.3": { - "type": "package", - "dependencies": { - "Microsoft.Bcl.Build": "1.0.4" - }, - "compile": { - "lib/net45/_._": {} - }, - "runtime": { - "lib/net45/_._": {} - } - }, - "Microsoft.Bcl.Build/1.0.10": { - "type": "package" - }, - "Microsoft.Net.Http/2.2.18": { - "type": "package", - "dependencies": { - "Microsoft.Bcl": "1.1.3", - "Microsoft.Bcl.Build": "1.0.10" - }, - "frameworkAssemblies": [ - "System.Net.Http", - "System.Net.Http.WebRequest" - ], - "compile": { - "lib/net45/System.Net.Http.Extensions.dll": {}, - "lib/net45/System.Net.Http.Primitives.dll": {} - }, - "runtime": { - "lib/net45/System.Net.Http.Extensions.dll": {}, - "lib/net45/System.Net.Http.Primitives.dll": {} - } - }, - "Newtonsoft.Json/5.0.6": { - "type": "package", - "compile": { - "lib/net45/Newtonsoft.Json.dll": {} - }, - "runtime": { - "lib/net45/Newtonsoft.Json.dll": {} - } - } - } - }, - "libraries": { - "Microsoft.AspNet.SignalR.Client.Portable/2.0.1": { - "sha512": "IrbSa4V7I+sQbhXiZV+4FFAp0FKZ2Q+zJsbGmBUtixzWVksDytSl5zIOov8dAk6FiZWdvNOUigz8pbOJZL82Lw==", - "type": "package", - "files": [ - "Microsoft.AspNet.SignalR.Client.Portable.2.0.1.nupkg.sha512", - "Microsoft.AspNet.SignalR.Client.Portable.nuspec", - "lib/Microsoft.AspNet.SignalR.Client.XML", - "lib/Microsoft.AspNet.SignalR.Client.dll" - ] - }, - "Microsoft.Bcl/1.1.3": { - "sha512": "NlSh9kk1UyC25O5JJ6vM/omaEirx0Ysep3CMkFNluQbzlIE14eWNa2rHtmFV1NGAsA/OW6MYvuSi7T7aowD2jw==", - "type": "package", - "files": [ - "License-RTM.rtf", - "Microsoft.Bcl.1.1.3.nupkg.sha512", - "Microsoft.Bcl.nuspec", - "ReleaseNotes.txt", - "content/net45/_._", - "content/portable-net45+win8+wp8/_._", - "content/sl4/_._", - "content/sl5/_._", - "content/win8/_._", - "content/wp8/_._", - "lib/net40/System.IO.dll", - "lib/net40/System.IO.xml", - "lib/net40/System.Runtime.dll", - "lib/net40/System.Runtime.xml", - "lib/net40/System.Threading.Tasks.dll", - "lib/net40/System.Threading.Tasks.xml", - "lib/net40/ensureRedirect.xml", - "lib/net45/_._", - "lib/portable-net40+sl4+win8+wp71/System.IO.dll", - "lib/portable-net40+sl4+win8+wp71/System.IO.xml", - "lib/portable-net40+sl4+win8+wp71/System.Runtime.dll", - "lib/portable-net40+sl4+win8+wp71/System.Runtime.xml", - "lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll", - "lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.xml", - "lib/portable-net40+sl4+win8+wp71/ensureRedirect.xml", - "lib/portable-net40+sl4+win8+wp8/System.IO.dll", - "lib/portable-net40+sl4+win8+wp8/System.IO.xml", - "lib/portable-net40+sl4+win8+wp8/System.Runtime.dll", - "lib/portable-net40+sl4+win8+wp8/System.Runtime.xml", - "lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll", - "lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.xml", - "lib/portable-net40+sl4+win8+wp8/ensureRedirect.xml", - "lib/portable-net40+sl4+win8/System.IO.dll", - "lib/portable-net40+sl4+win8/System.IO.xml", - "lib/portable-net40+sl4+win8/System.Runtime.dll", - "lib/portable-net40+sl4+win8/System.Runtime.xml", - "lib/portable-net40+sl4+win8/System.Threading.Tasks.dll", - "lib/portable-net40+sl4+win8/System.Threading.Tasks.xml", - "lib/portable-net40+sl4+win8/ensureRedirect.xml", - "lib/portable-net40+sl5+win8+wp8/System.IO.dll", - "lib/portable-net40+sl5+win8+wp8/System.IO.xml", - "lib/portable-net40+sl5+win8+wp8/System.Runtime.dll", - "lib/portable-net40+sl5+win8+wp8/System.Runtime.xml", - "lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll", - "lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.xml", - "lib/portable-net40+sl5+win8+wp8/ensureRedirect.xml", - "lib/portable-net40+win8+wp8/System.IO.dll", - "lib/portable-net40+win8+wp8/System.IO.xml", - "lib/portable-net40+win8+wp8/System.Runtime.dll", - "lib/portable-net40+win8+wp8/System.Runtime.xml", - "lib/portable-net40+win8+wp8/System.Threading.Tasks.dll", - "lib/portable-net40+win8+wp8/System.Threading.Tasks.xml", - "lib/portable-net40+win8+wp8/ensureRedirect.xml", - "lib/portable-net40+win8/System.IO.dll", - "lib/portable-net40+win8/System.IO.xml", - "lib/portable-net40+win8/System.Runtime.dll", - "lib/portable-net40+win8/System.Runtime.xml", - "lib/portable-net40+win8/System.Threading.Tasks.dll", - "lib/portable-net40+win8/System.Threading.Tasks.xml", - "lib/portable-net40+win8/ensureRedirect.xml", - "lib/portable-net45+win8+wp8/_._", - "lib/sl4-windowsphone71/System.IO.dll", - "lib/sl4-windowsphone71/System.IO.xml", - "lib/sl4-windowsphone71/System.Runtime.dll", - "lib/sl4-windowsphone71/System.Runtime.xml", - "lib/sl4-windowsphone71/System.Threading.Tasks.dll", - "lib/sl4-windowsphone71/System.Threading.Tasks.xml", - "lib/sl4-windowsphone71/ensureRedirect.xml", - "lib/sl4/System.IO.dll", - "lib/sl4/System.IO.xml", - "lib/sl4/System.Runtime.dll", - "lib/sl4/System.Runtime.xml", - "lib/sl4/System.Threading.Tasks.dll", - "lib/sl4/System.Threading.Tasks.xml", - "lib/sl5/System.IO.dll", - "lib/sl5/System.IO.xml", - "lib/sl5/System.Runtime.dll", - "lib/sl5/System.Runtime.xml", - "lib/sl5/System.Threading.Tasks.dll", - "lib/sl5/System.Threading.Tasks.xml", - "lib/win8/_._", - "lib/wp8/_._" - ] - }, - "Microsoft.Bcl.Build/1.0.10": { - "sha512": "JpazBBc/JT6o76Gx2q3mxJlGHfv2gK+GTzaJ+PZjf2XNGQOcajNU4PKJqc0udRwmPunZP5GrMhiWUuDVkabh+A==", - "type": "package", - "files": [ - "License-Stable.rtf", - "Microsoft.Bcl.Build.1.0.10.nupkg.sha512", - "Microsoft.Bcl.Build.nuspec", - "content/net40/_._", - "content/netcore45/_._", - "content/portable-net40+win8+sl4+wp71/_._", - "content/sl4-windowsphone71/_._", - "content/sl4/_._", - "tools/Install.ps1", - "tools/Microsoft.Bcl.Build.Tasks.dll", - "tools/Microsoft.Bcl.Build.targets", - "tools/Uninstall.ps1" - ] - }, - "Microsoft.Net.Http/2.2.18": { - "sha512": "YSmLk8qh917EkfrP5ULL4Nu8mxpoz1fwd5pXwNPUlg4+grLWWpHyYPIMZKjxa7HOR5gsZ8ZfhaSoYzQyom8xUw==", - "type": "package", - "files": [ - "License-Stable.rtf", - "Microsoft.Net.Http.2.2.18.nupkg.sha512", - "Microsoft.Net.Http.nuspec", - "lib/net40/System.Net.Http.Extensions.XML", - "lib/net40/System.Net.Http.Extensions.dll", - "lib/net40/System.Net.Http.Primitives.dll", - "lib/net40/System.Net.Http.Primitives.xml", - "lib/net40/System.Net.Http.WebRequest.dll", - "lib/net40/System.Net.Http.WebRequest.xml", - "lib/net40/System.Net.Http.dll", - "lib/net40/System.Net.Http.xml", - "lib/net40/ensureRedirect.xml", - "lib/net45/System.Net.Http.Extensions.XML", - "lib/net45/System.Net.Http.Extensions.dll", - "lib/net45/System.Net.Http.Primitives.dll", - "lib/net45/System.Net.Http.Primitives.xml", - "lib/net45/ensureRedirect.xml", - "lib/portable-net40+sl4+win8+wp71/System.Net.Http.Extensions.XML", - "lib/portable-net40+sl4+win8+wp71/System.Net.Http.Extensions.dll", - "lib/portable-net40+sl4+win8+wp71/System.Net.Http.Primitives.XML", - "lib/portable-net40+sl4+win8+wp71/System.Net.Http.Primitives.dll", - "lib/portable-net40+sl4+win8+wp71/System.Net.Http.dll", - "lib/portable-net40+sl4+win8+wp71/System.Net.Http.xml", - "lib/portable-net40+sl4+win8+wp71/ensureRedirect.xml", - "lib/portable-net45+win8/System.Net.Http.Extensions.XML", - "lib/portable-net45+win8/System.Net.Http.Extensions.dll", - "lib/portable-net45+win8/System.Net.Http.Primitives.dll", - "lib/portable-net45+win8/System.Net.Http.Primitives.xml", - "lib/portable-net45+win8/ensureRedirect.xml", - "lib/sl4-windowsphone71/System.Net.Http.Extensions.XML", - "lib/sl4-windowsphone71/System.Net.Http.Extensions.dll", - "lib/sl4-windowsphone71/System.Net.Http.Primitives.XML", - "lib/sl4-windowsphone71/System.Net.Http.Primitives.dll", - "lib/sl4-windowsphone71/System.Net.Http.dll", - "lib/sl4-windowsphone71/System.Net.Http.xml", - "lib/win8/System.Net.Http.Extensions.XML", - "lib/win8/System.Net.Http.Extensions.dll", - "lib/win8/System.Net.Http.Primitives.dll", - "lib/win8/System.Net.Http.Primitives.xml" - ] - }, - "Newtonsoft.Json/5.0.6": { - "sha512": "Z594WlU7Wndv4vQxwsS7ym2y2Izsuw5U86UxQbx6YIKIjVju7V7OU4l1QQl5fM9AmPdzWIOxSlonzuQzzulMaw==", - "type": "package", - "files": [ - "Newtonsoft.Json.5.0.6.nupkg.sha512", - "Newtonsoft.Json.nuspec", - "lib/net20/Newtonsoft.Json.dll", - "lib/net20/Newtonsoft.Json.xml", - "lib/net35/Newtonsoft.Json.dll", - "lib/net35/Newtonsoft.Json.xml", - "lib/net40/Newtonsoft.Json.dll", - "lib/net40/Newtonsoft.Json.xml", - "lib/net45/Newtonsoft.Json.dll", - "lib/net45/Newtonsoft.Json.xml", - "lib/netcore45/Newtonsoft.Json.dll", - "lib/netcore45/Newtonsoft.Json.xml", - "lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.dll", - "lib/portable-net40+sl4+wp7+win8/Newtonsoft.Json.xml", - "lib/portable-net45+wp80+win8/Newtonsoft.Json.dll", - "lib/portable-net45+wp80+win8/Newtonsoft.Json.xml" - ] - } + ".NETFramework,Version=v4.5.1": {}, + ".NETPortable,Version=v4.5,Profile=Profile111": {} }, + "libraries": {}, "projectFileDependencyGroups": { - "": [ - "Microsoft.AspNet.SignalR.Client.Portable >= 2.0.1" - ], - ".NETFramework,Version=v4.5.1": [] + "": [], + ".NETFramework,Version=v4.5.1": [], + ".NETPortable,Version=v4.5,Profile=Profile111": [] } } \ No newline at end of file From 08e3fef781d44fa20358e3a9cee5d9e5fd739b64 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sat, 30 Jul 2016 23:49:56 +0200 Subject: [PATCH 5/5] referencing MarkdownDeep-av --- BookAStar/BookAStar.Droid/app.config | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/BookAStar/BookAStar.Droid/app.config b/BookAStar/BookAStar.Droid/app.config index 8460dd43..66a6339f 100644 --- a/BookAStar/BookAStar.Droid/app.config +++ b/BookAStar/BookAStar.Droid/app.config @@ -1,11 +1,31 @@ - + + + + + + + + + + + + + + + + + + + + + - - + + - \ No newline at end of file +