diff --git a/src/samples/prism/run-host.sh b/src/samples/prism/run-host.sh index af8765b..ff10299 100755 --- a/src/samples/prism/run-host.sh +++ b/src/samples/prism/run-host.sh @@ -1 +1 @@ -dotnet run -c release --project ../../heads/tbc.host.console/tbc.host.console.csproj -- ./reload-config.json +dotnet run -f net6.0 -c release --project ../../heads/tbc.host.console/tbc.host.console.csproj -- ./reload-config.json diff --git a/src/samples/prism/tbc.sample.prism/tbc.sample.prism.Android/Properties/AndroidManifest.xml b/src/samples/prism/tbc.sample.prism/tbc.sample.prism.Android/Properties/AndroidManifest.xml index 4b2fe78..725d325 100644 --- a/src/samples/prism/tbc.sample.prism/tbc.sample.prism.Android/Properties/AndroidManifest.xml +++ b/src/samples/prism/tbc.sample.prism/tbc.sample.prism.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@ - + - - - + + + \ No newline at end of file diff --git a/src/samples/prism/tbc.sample.prism/tbc.sample.prism.Android/tbc.sample.prism.Android.csproj b/src/samples/prism/tbc.sample.prism/tbc.sample.prism.Android/tbc.sample.prism.Android.csproj index c2aa5cd..f28b6e7 100644 --- a/src/samples/prism/tbc.sample.prism/tbc.sample.prism.Android/tbc.sample.prism.Android.csproj +++ b/src/samples/prism/tbc.sample.prism/tbc.sample.prism.Android/tbc.sample.prism.Android.csproj @@ -14,8 +14,7 @@ Properties\AndroidManifest.xml Resources Assets - false - v9.0 + v11.0 Xamarin.Android.Net.AndroidClientHandler @@ -46,22 +45,18 @@ - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + @@ -81,7 +76,7 @@ - {FEC29B52-B36E-43A7-9E04-5E6EA596E6DF} + {94CFA5B9-FF4C-4522-B116-7E942E7C727C} tbc.sample.prism diff --git a/src/samples/prism/tbc.sample.prism/tbc.sample.prism.iOS/tbc.sample.prism.iOS.csproj b/src/samples/prism/tbc.sample.prism/tbc.sample.prism.iOS/tbc.sample.prism.iOS.csproj index c927a36..6ba0839 100644 --- a/src/samples/prism/tbc.sample.prism/tbc.sample.prism.iOS/tbc.sample.prism.iOS.csproj +++ b/src/samples/prism/tbc.sample.prism/tbc.sample.prism.iOS/tbc.sample.prism.iOS.csproj @@ -126,8 +126,6 @@ - - @@ -141,32 +139,8 @@ - + - - - - $(NugetPackageRoot)\grpc.core\2.30.0\build\Xamarin.iOS10\ - - - - - - - - - Static - True - True - - - Static - True - True - - - - - \ No newline at end of file + diff --git a/src/samples/prism/tbc.sample.prism/tbc.sample.prism/ReloadManager.cs b/src/samples/prism/tbc.sample.prism/tbc.sample.prism/ReloadManager.cs index 8b9a739..cee0c6b 100644 --- a/src/samples/prism/tbc.sample.prism/tbc.sample.prism/ReloadManager.cs +++ b/src/samples/prism/tbc.sample.prism/tbc.sample.prism/ReloadManager.cs @@ -1,17 +1,18 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using DryIoc; using Prism.Navigation; using Prism.Services; using Serilog; -using Tbc.Protocol; +using Tbc.Core.Models; using tbc.sample.prism.Extensions; using Tbc.Target; using Tbc.Target.Interfaces; using Tbc.Target.Requests; using Xamarin.Forms; -using static Tbc.Target.Extensions.TbcOutcome; +using static Tbc.Core.Models.Outcome; namespace tbc.sample.prism { @@ -105,11 +106,22 @@ public override async Task ExecuteCommand(CommandRequest commandRequest case "goto": await Device.InvokeOnMainThreadAsync( async () => await GotoPage(args.Any() ? args[0] : null, message:"where to my friend?")); - return Success(); + return new Outcome { Success = true }; default: _logger.Warning("No logic to handle command \"{Command}\" with args {@Args}", command, args); - return Failure($"No logic to handle command \"{command}\" with args {String.Join(", ", args)}"); + return new Outcome + { + Success = true, + Messages = new List() + { + new OutcomeMessage + { + Message = + $"No logic to handle command \"{command}\" with args {String.Join(", ", args)}" + } + } + }; } } @@ -141,4 +153,4 @@ private async Task GotoPage(string pageName = null, string message = "choose") await navigationService.NavigateAsync(pageName); } } -} \ No newline at end of file +} diff --git a/src/samples/prism/tbc.sample.prism/tbc.sample.prism/tbc.sample.prism.csproj b/src/samples/prism/tbc.sample.prism/tbc.sample.prism/tbc.sample.prism.csproj index 77b1a22..20c7de4 100644 --- a/src/samples/prism/tbc.sample.prism/tbc.sample.prism/tbc.sample.prism.csproj +++ b/src/samples/prism/tbc.sample.prism/tbc.sample.prism/tbc.sample.prism.csproj @@ -14,7 +14,7 @@ - + - \ No newline at end of file +