diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ade8f76b1..6a5ab1991 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,11 +39,15 @@ jobs: with: fetch-depth: 0 - - name: Setup .NET 7.0 + - name: Setup .NET 8.0 uses: actions/setup-dotnet@v3 with: - dotnet-version: '7.0.x' - # dotnet-quality: 'preview' + dotnet-version: '8.0.x' + + - uses: AdoptOpenJDK/install-jdk@v1 + with: + version: '13' + architecture: x64 - name: Add .NET Workloads run: dotnet workload install maui-ios maui-android maui-maccatalyst maui-windows diff --git a/Shiny.sln b/Shiny.sln index 2de9252f3..90c7d8790 100644 --- a/Shiny.sln +++ b/Shiny.sln @@ -16,6 +16,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{7C114E37-36C8-4971-91C6-E2557DDCB4E8}" ProjectSection(SolutionItems) = preProject samples\readme.md = samples\readme.md + samples\Directory.build.props = samples\Directory.build.props EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{6374E4D9-1BD8-4880-B603-AFDEA8345D7E}" @@ -87,10 +88,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShinyBuild", "build\ShinyBu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shiny.Logging.AppCenter", "src\Shiny.Logging.AppCenter\Shiny.Logging.AppCenter.csproj", "{7A3AF2C7-1EDF-4BE2-ACC2-CC4C91A87601}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Maui", "samples\Sample.Maui\Sample.Maui.csproj", "{0E712AE3-FF27-4EE4-B10A-8921C48651AD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shiny.Hosting.Uno", "src\Shiny.Hosting.Uno\Shiny.Hosting.Uno.csproj", "{29813950-000D-4568-A41B-AF2633D3E07B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shiny.Support.Repositories", "src\Shiny.Support.Repositories\Shiny.Support.Repositories.csproj", "{47A57CFE-A1A8-407A-86FA-FA003D562C58}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shiny.Tests", "tests\Shiny.Tests\Shiny.Tests.csproj", "{B145321D-8E33-4A33-B5CF-37A162C0E261}" @@ -109,7 +106,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shiny.Push.FirebaseMessagin EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Api", "samples\Sample.Api\Sample.Api.csproj", "{6084D6FA-765E-4AE2-A29E-3FE9DFC4A5FC}" EndProject -Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Sample.Blazor", "samples\Sample.Blazor\Sample.Blazor.csproj", "{E74E02DF-9FC8-4883-9B7C-21857D661325}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Maui", "samples\Sample.Maui\Sample.Maui.csproj", "{88774A33-08F5-4AA1-A77C-A7ED2CFFDE51}" +EndProject +Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Sample.Blazor", "samples\Sample.Blazor\Sample.Blazor.csproj", "{C21631E7-A789-4DF8-B83F-03D6A07B57B4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -207,15 +206,6 @@ Global {7A3AF2C7-1EDF-4BE2-ACC2-CC4C91A87601}.Debug|Any CPU.Build.0 = Debug|Any CPU {7A3AF2C7-1EDF-4BE2-ACC2-CC4C91A87601}.Release|Any CPU.ActiveCfg = Release|Any CPU {7A3AF2C7-1EDF-4BE2-ACC2-CC4C91A87601}.Release|Any CPU.Build.0 = Release|Any CPU - {0E712AE3-FF27-4EE4-B10A-8921C48651AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E712AE3-FF27-4EE4-B10A-8921C48651AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E712AE3-FF27-4EE4-B10A-8921C48651AD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {0E712AE3-FF27-4EE4-B10A-8921C48651AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E712AE3-FF27-4EE4-B10A-8921C48651AD}.Release|Any CPU.Build.0 = Release|Any CPU - {29813950-000D-4568-A41B-AF2633D3E07B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29813950-000D-4568-A41B-AF2633D3E07B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29813950-000D-4568-A41B-AF2633D3E07B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29813950-000D-4568-A41B-AF2633D3E07B}.Release|Any CPU.Build.0 = Release|Any CPU {47A57CFE-A1A8-407A-86FA-FA003D562C58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {47A57CFE-A1A8-407A-86FA-FA003D562C58}.Debug|Any CPU.Build.0 = Debug|Any CPU {47A57CFE-A1A8-407A-86FA-FA003D562C58}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -254,10 +244,15 @@ Global {6084D6FA-765E-4AE2-A29E-3FE9DFC4A5FC}.Debug|Any CPU.Build.0 = Debug|Any CPU {6084D6FA-765E-4AE2-A29E-3FE9DFC4A5FC}.Release|Any CPU.ActiveCfg = Release|Any CPU {6084D6FA-765E-4AE2-A29E-3FE9DFC4A5FC}.Release|Any CPU.Build.0 = Release|Any CPU - {E74E02DF-9FC8-4883-9B7C-21857D661325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E74E02DF-9FC8-4883-9B7C-21857D661325}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E74E02DF-9FC8-4883-9B7C-21857D661325}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E74E02DF-9FC8-4883-9B7C-21857D661325}.Release|Any CPU.Build.0 = Release|Any CPU + {88774A33-08F5-4AA1-A77C-A7ED2CFFDE51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {88774A33-08F5-4AA1-A77C-A7ED2CFFDE51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {88774A33-08F5-4AA1-A77C-A7ED2CFFDE51}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {88774A33-08F5-4AA1-A77C-A7ED2CFFDE51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {88774A33-08F5-4AA1-A77C-A7ED2CFFDE51}.Release|Any CPU.Build.0 = Release|Any CPU + {C21631E7-A789-4DF8-B83F-03D6A07B57B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C21631E7-A789-4DF8-B83F-03D6A07B57B4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C21631E7-A789-4DF8-B83F-03D6A07B57B4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C21631E7-A789-4DF8-B83F-03D6A07B57B4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -281,8 +276,6 @@ Global {DA452A0B-08F8-4809-95F4-9CD583F30FEA} = {6374E4D9-1BD8-4880-B603-AFDEA8345D7E} {452F676E-22B7-49A6-9603-D39689F0EAAD} = {3A15354E-BAD2-4195-BE6B-49ED2B4E56E6} {7A3AF2C7-1EDF-4BE2-ACC2-CC4C91A87601} = {6374E4D9-1BD8-4880-B603-AFDEA8345D7E} - {0E712AE3-FF27-4EE4-B10A-8921C48651AD} = {7C114E37-36C8-4971-91C6-E2557DDCB4E8} - {29813950-000D-4568-A41B-AF2633D3E07B} = {6374E4D9-1BD8-4880-B603-AFDEA8345D7E} {47A57CFE-A1A8-407A-86FA-FA003D562C58} = {6374E4D9-1BD8-4880-B603-AFDEA8345D7E} {B145321D-8E33-4A33-B5CF-37A162C0E261} = {7C114E37-36C8-4971-91C6-E2557DDCB4E8} {2E4505D4-B9B3-4836-A0F8-37BA72025D3D} = {6374E4D9-1BD8-4880-B603-AFDEA8345D7E} @@ -292,7 +285,8 @@ Global {F97CC87B-85A8-4400-A8CD-30845535C011} = {7C114E37-36C8-4971-91C6-E2557DDCB4E8} {A7717BEB-CF3C-4CAB-8826-FD3848CCBE95} = {6374E4D9-1BD8-4880-B603-AFDEA8345D7E} {6084D6FA-765E-4AE2-A29E-3FE9DFC4A5FC} = {7C114E37-36C8-4971-91C6-E2557DDCB4E8} - {E74E02DF-9FC8-4883-9B7C-21857D661325} = {7C114E37-36C8-4971-91C6-E2557DDCB4E8} + {88774A33-08F5-4AA1-A77C-A7ED2CFFDE51} = {7C114E37-36C8-4971-91C6-E2557DDCB4E8} + {C21631E7-A789-4DF8-B83F-03D6A07B57B4} = {7C114E37-36C8-4971-91C6-E2557DDCB4E8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {135D86AF-4EC4-4AA0-BD06-75C410F3EA08} diff --git a/readme.md b/readme.md index 280a5ab60..7ad486a0d 100644 --- a/readme.md +++ b/readme.md @@ -7,10 +7,9 @@ things like dependency injection & logging in a structured way to your code! ## Supports * Xamarin iOS * Xamarin Android -* .NET 7 for Android -* .NET 7 for iOS -* .NET 7 for MacCatalyst -* .NET 7 for Windows (Core & BLE) +* .NET 8 for Android +* .NET 8 for iOS +* .NET 8 for MacCatalyst ## Features * Handles all of the cruft like Permissions, main thread traversal, persistent storage and app restarts diff --git a/samples/Directory.build.props b/samples/Directory.build.props new file mode 100644 index 000000000..5e8cb5bdd --- /dev/null +++ b/samples/Directory.build.props @@ -0,0 +1,6 @@ + + + 8.0.3 + 8.0.0 + + \ No newline at end of file diff --git a/samples/Sample.Api/Controllers/PushController.cs b/samples/Sample.Api/Controllers/PushController.cs index 24688cf66..2e592d44d 100644 --- a/samples/Sample.Api/Controllers/PushController.cs +++ b/samples/Sample.Api/Controllers/PushController.cs @@ -1,12 +1,40 @@ -namespace Sample.Api.Controllers; +using Shiny.Extensions.Push; + +namespace Sample.Api.Controllers; [ApiController] [Route("[controller]")] public class PushController : Controller { - public PushController() + readonly IPushManager pushManager; + + public PushController(IPushManager pushManager) + { + this.pushManager = pushManager; + } + + + [HttpPost] + public async Task Register([FromBody] RegisterArgs args) { + return this.Ok(null); + } + + + [HttpPost] + public async Task> Send([FromBody] SendArgs args) + { + return this.Ok(null); } } +public record RegisterArgs( + bool IsApple, + string RegistrationToken +); + + +public record SendArgs( + string Message +); \ No newline at end of file diff --git a/samples/Sample.Api/Program.cs b/samples/Sample.Api/Program.cs index 1d4d2598b..259d699e0 100644 --- a/samples/Sample.Api/Program.cs +++ b/samples/Sample.Api/Program.cs @@ -3,8 +3,6 @@ var builder = WebApplication.CreateBuilder(args); -// Add services to the container. - builder.Services.Configure(options => { options.Limits.MaxRequestBodySize = int.MaxValue; // if don't set default value is: 30 MB @@ -16,13 +14,11 @@ x.MultipartHeadersLengthLimit = int.MaxValue; }); builder.Services.AddControllers(); -// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddEndpointsApiExplorer(); builder.Services.AddSwaggerGen(); var app = builder.Build(); -// Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { app.UseSwagger(); @@ -30,9 +26,6 @@ } app.UseHttpsRedirection(); - -app.UseAuthorization(); - app.MapControllers(); app.Run(); diff --git a/samples/Sample.Api/Sample.Api.csproj b/samples/Sample.Api/Sample.Api.csproj index 942b725b2..4cb2987a5 100644 --- a/samples/Sample.Api/Sample.Api.csproj +++ b/samples/Sample.Api/Sample.Api.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable @@ -9,8 +9,9 @@ - + + diff --git a/samples/Sample.Api/appsettings.Development.json b/samples/Sample.Api/appsettings.Development.json index ce16a2e30..91961932c 100644 --- a/samples/Sample.Api/appsettings.Development.json +++ b/samples/Sample.Api/appsettings.Development.json @@ -1,9 +1,21 @@ { - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "Push": { + "AzureNotificationHubs": { + "ConnectionString": "", + "HubName": "" + }, + "Firebase": { + + } + //"Apple": { + // "": "" + //} } - } } diff --git a/samples/Sample.Blazor/Sample.Blazor.csproj b/samples/Sample.Blazor/Sample.Blazor.csproj index 217cdf6db..50e0a70e8 100644 --- a/samples/Sample.Blazor/Sample.Blazor.csproj +++ b/samples/Sample.Blazor/Sample.Blazor.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Sample @@ -17,8 +17,8 @@ - - + + diff --git a/samples/Sample.Maui/CurrentPermissionPage.xaml b/samples/Sample.Maui/CurrentPermissionPage.xaml new file mode 100644 index 000000000..169938379 --- /dev/null +++ b/samples/Sample.Maui/CurrentPermissionPage.xaml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + diff --git a/samples/Sample.Maui/CurrentPermissionPage.xaml.cs b/samples/Sample.Maui/CurrentPermissionPage.xaml.cs new file mode 100644 index 000000000..acc35751f --- /dev/null +++ b/samples/Sample.Maui/CurrentPermissionPage.xaml.cs @@ -0,0 +1,9 @@ +namespace Sample; + +public partial class CurrentPermissionPage : ContentPage +{ + public CurrentPermissionPage() + { + this.InitializeComponent(); + } +} diff --git a/samples/Sample.Maui/CurrentPermissionViewModel.cs b/samples/Sample.Maui/CurrentPermissionViewModel.cs new file mode 100644 index 000000000..607f5b77d --- /dev/null +++ b/samples/Sample.Maui/CurrentPermissionViewModel.cs @@ -0,0 +1,91 @@ +using Shiny.BluetoothLE; +using Shiny.BluetoothLE.Hosting; +using Shiny.Locations; + +namespace Sample; + + +public class CurrentPermissionViewModel : ViewModel +{ + public CurrentPermissionViewModel( + IBleManager bleManager, + IBleHostingManager bleHostingManager, + IGpsManager gpsManager, + IGeofenceManager geofenceManager, + BaseServices services + ) : base(services) + { + this.Refresh = ReactiveCommand.Create(() => + { + this.IsRefreshing = true; + this.PermissionSet = new List { + new PermissionViewModel( + "BLE Client", + () => bleManager.CurrentAccess, + () => bleManager.RequestAccess().ToTask() + ), + new PermissionViewModel( + "BLE Host - Advertising", + () => bleHostingManager.AdvertisingAccessStatus, + () => bleHostingManager.RequestAccess(true, false) + ), + new PermissionViewModel( + "BLE Host - GATT", + () => bleHostingManager.GattAccessStatus, + () => bleHostingManager.RequestAccess(false, true) + ), + new PermissionViewModel( + "GPS - In App", + () => gpsManager.GetCurrentStatus(GpsRequest.Foreground), + () => gpsManager.RequestAccess(GpsRequest.Foreground) + ), + new PermissionViewModel( + "GPS - Background", + () => gpsManager.GetCurrentStatus(GpsRequest.Realtime(false)), + () => gpsManager.RequestAccess(GpsRequest.Realtime(false)) + ), + new PermissionViewModel( + "Geofencing", + () => geofenceManager.CurrentStatus, + () => geofenceManager.RequestAccess() + ) + }; + this.IsRefreshing = false; + }); + } + + + public ICommand Refresh { get; } + [Reactive] public bool IsRefreshing { get; private set; } + [Reactive] public List PermissionSet { get; private set; } + + public override void OnAppearing() + { + base.OnAppearing(); + this.Refresh.Execute(null); + } +} + + +public class PermissionViewModel : ReactiveObject +{ + public PermissionViewModel( + string description, + Func getCurrent, + Func> requestAccess + ) + { + this.Description = description; + this.Status = getCurrent.Invoke(); + this.Request = ReactiveCommand.CreateFromTask(async () => + { + await requestAccess.Invoke(); + this.Status = getCurrent(); + }); + } + + + public ICommand Request { get; } + public string Description { get; } + [Reactive] public AccessState Status { get; private set; } +} \ No newline at end of file diff --git a/samples/Sample.Maui/MainPage.xaml b/samples/Sample.Maui/MainPage.xaml index 28de86f89..6cc3d8a8d 100644 --- a/samples/Sample.Maui/MainPage.xaml +++ b/samples/Sample.Maui/MainPage.xaml @@ -56,6 +56,7 @@ + diff --git a/samples/Sample.Maui/MauiProgram.cs b/samples/Sample.Maui/MauiProgram.cs index ecb292406..05db310cd 100644 --- a/samples/Sample.Maui/MauiProgram.cs +++ b/samples/Sample.Maui/MauiProgram.cs @@ -1,7 +1,7 @@ using CommunityToolkit.Maui.Markup; using Microsoft.Extensions.Configuration; -using Prism.DryIoc; using Sample.Dev; + namespace Sample; @@ -167,6 +167,7 @@ static MauiAppBuilder RegisterRoutes(this MauiAppBuilder builder) s.RegisterForNavigation(); s.RegisterForNavigation(); s.RegisterForNavigation(); + s.RegisterForNavigation(); return builder; } diff --git a/samples/Sample.Maui/Sample.Maui.csproj b/samples/Sample.Maui/Sample.Maui.csproj index 09d7fe981..8e3f576ca 100644 --- a/samples/Sample.Maui/Sample.Maui.csproj +++ b/samples/Sample.Maui/Sample.Maui.csproj @@ -1,16 +1,17 @@ - $(TargetFrameworks);net7.0-android - $(TargetFrameworks);net7.0-ios - $(TargetFrameworks);net7.0-maccatalyst + $(TargetFrameworks);net8.0-android + $(TargetFrameworks);net8.0-ios + $(TargetFrameworks);net8.0-maccatalyst Exe Sample - true enable true enable true + True + Shiny org.shiny.samples 3E54A75D-D399-4272-8326-54510C872263 @@ -32,13 +33,12 @@ --> - + false - + - @@ -48,12 +48,13 @@ - + + - + - + @@ -75,9 +76,11 @@ + diff --git a/samples/Sample.Push.Maui/Sample.Push.Maui.csproj b/samples/Sample.Push.Maui/Sample.Push.Maui.csproj index 5ba24fdcb..e44295d98 100644 --- a/samples/Sample.Push.Maui/Sample.Push.Maui.csproj +++ b/samples/Sample.Push.Maui/Sample.Push.Maui.csproj @@ -2,12 +2,11 @@ firebase - $(TargetFrameworks);net7.0-android - $(TargetFrameworks);net7.0-ios - $(TargetFrameworks);net7.0-maccatalyst + $(TargetFrameworks);net8.0-android + $(TargetFrameworks);net8.0-ios + $(TargetFrameworks);net8.0-maccatalyst Exe Sample - true enable true enable @@ -25,18 +24,6 @@ $(DefineConstants);FIREBASE - - 14.2 - - - - 14.0 - - - - 26.0 - - @@ -47,13 +34,9 @@ - - - - - + + + + + + + + + + diff --git a/src/Directory.build.props b/src/Directory.build.props index da63356e6..b04dae2fe 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -11,7 +11,7 @@ MIT https://shinylib.net icon.png - https://shinylib.net/releases/mobile/ + https://shinylib.net/release-notes/client/v30/ xamarin ios android ble bluetooth bluetoothle push notifications sensors geofences gps location background jobs settings speech sensors readme.md https://github.com/shinyorg/shiny @@ -19,25 +19,26 @@ true true - 7.0.0 + 8.0.0 + 8.0.3 true - net7.0-windows10.0.19041.0 + net8.0-windows10.0.19041.0 - net7.0 + net8.0 $(StandardTargetFrameworks);netstandard2.1 - net7.0-ios + net8.0-ios $(IosTargetFrameworks);xamarin.ios10 - net7.0-android - $(AndroidTargetFrameworks);monoandroid12.0 + net8.0-android + $(AndroidTargetFrameworks);monoandroid13.0 - net7.0-android;net7.0-ios;net7.0-maccatalyst - $(IosTargetFrameworks);net7.0-maccatalyst + net8.0-android;net8.0-ios;net8.0-maccatalyst + $(IosTargetFrameworks);net8.0-maccatalyst $(AppleTargetFrameworks);$(AndroidTargetFrameworks) $(StandardTargetFrameworks);$(IosTargetFrameworks);$(AndroidTargetFrameworks) $(StandardTargetFrameworks);$(PlatformOnlyTargetFrameworks) @@ -66,7 +67,7 @@ 26.0 - 31.0 + 34.0 true @@ -100,7 +101,7 @@ $(DefineConstants);PLATFORM;WINDOWS - + true true - + diff --git a/src/Shiny.Support.Repositories/Extensions.cs b/src/Shiny.Support.Repositories/Extensions.cs index 02c879026..cf0dbd031 100644 --- a/src/Shiny.Support.Repositories/Extensions.cs +++ b/src/Shiny.Support.Repositories/Extensions.cs @@ -1,4 +1,4 @@ - +using System; using System.Reactive.Linq; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; diff --git a/src/Shiny.Support.Repositories/Shiny.Support.Repositories.csproj b/src/Shiny.Support.Repositories/Shiny.Support.Repositories.csproj index 871f32ac0..fd3707541 100644 --- a/src/Shiny.Support.Repositories/Shiny.Support.Repositories.csproj +++ b/src/Shiny.Support.Repositories/Shiny.Support.Repositories.csproj @@ -3,8 +3,8 @@ $(DefaultTargetFrameworks) + Shiny Internal Repository Library enable - enable diff --git a/tests/Shiny.Tests/Logging/AppCenterLoggingTests.cs b/tests/Shiny.Tests/Logging/AppCenterLoggingTests.cs index c219b474d..82d812e95 100644 --- a/tests/Shiny.Tests/Logging/AppCenterLoggingTests.cs +++ b/tests/Shiny.Tests/Logging/AppCenterLoggingTests.cs @@ -1,7 +1,4 @@ #if IOS || ANDROID -using Microsoft.AppCenter; -using Microsoft.AppCenter.Analytics; -using Microsoft.AppCenter.Crashes; using Microsoft.Extensions.Logging; namespace Shiny.Tests.Logging; @@ -14,7 +11,7 @@ public AppCenterLoggingTests(ITestOutputHelper output) : base(output) {} protected override void Configure(HostBuilder hostBuilder) { - hostBuilder.Logging.AddAppCenter("ios=7d746922-5e14-45c6-bfb5-9e86d79930b9;android=;"); + //hostBuilder.Logging.AddAppCenter("ios=7d746922-5e14-45c6-bfb5-9e86d79930b9;android=;"); base.Configure(hostBuilder); } diff --git a/tests/Shiny.Tests/Shiny.Tests.csproj b/tests/Shiny.Tests/Shiny.Tests.csproj index 6c6c05cee..336dffe6d 100644 --- a/tests/Shiny.Tests/Shiny.Tests.csproj +++ b/tests/Shiny.Tests/Shiny.Tests.csproj @@ -1,12 +1,11 @@  - $(TargetFrameworks);net7.0-android - $(TargetFrameworks);net7.0-ios - $(TargetFrameworks);net7.0-maccatalyst + $(TargetFrameworks);net8.0-android + $(TargetFrameworks);net8.0-ios + $(TargetFrameworks);net8.0-maccatalyst Exe Shiny.Tests - true true disable enable @@ -22,15 +21,7 @@ 14.2 26.0 - - - ios-arm64 - - - - false - @@ -46,8 +37,10 @@ - - + + + + @@ -67,7 +60,7 @@ - +