diff --git a/Directory.Packages.props b/Directory.Packages.props index 033c7beb..133dbca7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,19 +5,19 @@ $(NoWarn);NU1507 - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + @@ -39,20 +39,20 @@ - - - + + + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/README.md b/README.md index 4315d78c..d7c2494e 100644 --- a/README.md +++ b/README.md @@ -117,10 +117,10 @@ Note: The path `C:/work/...` is just an example After that, restore the dotnet workloads to install the required android workload. ```powershell -dotnet build -t:InstallAndroidDependencies -f net8.0-android -p:AndroidSdkDirectory=c:\work\android-sdk -p:JavaSdkDirectory=c:\work\jdk -p:AcceptAndroidSdkLicenses=True +dotnet build -t:InstallAndroidDependencies -f net10.0-android -p:AndroidSdkDirectory=c:\work\android-sdk -p:JavaSdkDirectory=c:\work\jdk -p:AcceptAndroidSdkLicenses=True setx JAVA_HOME C:\work\jdk\ setx ANDROID_HOME C:\work\android-sdk\ # Restore android workload dotnet workload restore -``` \ No newline at end of file +``` diff --git a/global.json b/global.json index 859752a8..512142d2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.0", + "version": "10.0.100", "rollForward": "latestFeature" } -} \ No newline at end of file +} diff --git a/src/Darp.Ble.Android/Darp.Ble.Android.csproj b/src/Darp.Ble.Android/Darp.Ble.Android.csproj index a8e919c1..bfd0a799 100644 --- a/src/Darp.Ble.Android/Darp.Ble.Android.csproj +++ b/src/Darp.Ble.Android/Darp.Ble.Android.csproj @@ -1,6 +1,6 @@ - net9.0-android + net10.0-android 31 true diff --git a/src/Darp.Ble.Hci/Darp.Ble.Hci.csproj b/src/Darp.Ble.Hci/Darp.Ble.Hci.csproj index c448441b..c09d914a 100644 --- a/src/Darp.Ble.Hci/Darp.Ble.Hci.csproj +++ b/src/Darp.Ble.Hci/Darp.Ble.Hci.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 enable true 13 diff --git a/src/Darp.Ble.HciHost/Darp.Ble.HciHost.csproj b/src/Darp.Ble.HciHost/Darp.Ble.HciHost.csproj index 8d387e98..c0153002 100644 --- a/src/Darp.Ble.HciHost/Darp.Ble.HciHost.csproj +++ b/src/Darp.Ble.HciHost/Darp.Ble.HciHost.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 latest true diff --git a/src/Darp.Ble.Mock/Darp.Ble.Mock.csproj b/src/Darp.Ble.Mock/Darp.Ble.Mock.csproj index 93f1c10b..ccb96167 100644 --- a/src/Darp.Ble.Mock/Darp.Ble.Mock.csproj +++ b/src/Darp.Ble.Mock/Darp.Ble.Mock.csproj @@ -1,6 +1,6 @@  - net9.0 + net10.0 true diff --git a/src/Darp.Ble.WinRT/Darp.Ble.WinRT.csproj b/src/Darp.Ble.WinRT/Darp.Ble.WinRT.csproj index a0aca9d6..04b8218c 100644 --- a/src/Darp.Ble.WinRT/Darp.Ble.WinRT.csproj +++ b/src/Darp.Ble.WinRT/Darp.Ble.WinRT.csproj @@ -1,6 +1,6 @@  - net9.0;net9.0-windows10.0.19041.0 + net10.0;net10.0-windows10.0.19041.0 true true @@ -8,7 +8,7 @@ - + diff --git a/src/Darp.Ble/Darp.Ble.csproj b/src/Darp.Ble/Darp.Ble.csproj index e5d93354..4846875f 100644 --- a/src/Darp.Ble/Darp.Ble.csproj +++ b/src/Darp.Ble/Darp.Ble.csproj @@ -1,6 +1,6 @@  - net9.0;net10.0 + net10.0 true true 13 diff --git a/test/Darp.Ble.WinRT.Tests/Darp.Ble.WinRT.Tests.csproj b/test/Darp.Ble.WinRT.Tests/Darp.Ble.WinRT.Tests.csproj deleted file mode 100644 index 027bed0c..00000000 --- a/test/Darp.Ble.WinRT.Tests/Darp.Ble.WinRT.Tests.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - net10.0-windows10.0.19041.0 - false - true - - - - - - - - - - - - - - - - diff --git a/test/Darp.Ble.WinRT.Tests/UnitTest1.cs b/test/Darp.Ble.WinRT.Tests/UnitTest1.cs deleted file mode 100644 index 38482a42..00000000 --- a/test/Darp.Ble.WinRT.Tests/UnitTest1.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Globalization; -using System.Reactive.Linq; -using Darp.Ble.Data; -using Darp.Ble.Gatt; -using Darp.Ble.Gatt.Client; -using Serilog; -using Serilog.Events; -using Xunit.Abstractions; - -namespace Darp.Ble.WinRT.Tests; - -public sealed class UnitTest1(ITestOutputHelper outputHelper) -{ - private readonly ILogger _logger = new LoggerConfiguration() - .MinimumLevel.Verbose() - .WriteTo.TestOutput(outputHelper, formatProvider: CultureInfo.InvariantCulture) - .CreateLogger(); - - //[Fact] - public async Task Test1() - { - BleManager manager = new BleManagerBuilder() - .OnLog( - (_, logEvent) => - _logger.Write( - (LogEventLevel)logEvent.Level, - logEvent.Exception, - logEvent.MessageTemplate, - logEvent.Properties - ) - ) - .With() - .CreateManager(); - IBleDevice device = manager.EnumerateDevices().First(); - await device.InitializeAsync(); - await device.Observer.RefCount().Take(100); - await Task.Delay(1000); - } - - //[Fact] - public async Task Test2() - { - BleManager manager = new BleManagerBuilder() - .OnLog( - (_, logEvent) => - _logger.Write( - (LogEventLevel)logEvent.Level, - logEvent.Exception, - logEvent.MessageTemplate, - logEvent.Properties - ) - ) - .With() - .CreateManager(); - IBleDevice device = manager.EnumerateDevices().First(); - await device.InitializeAsync(); - var service = await device.Peripheral.AddServiceAsync(new BleUuid(0x1234)); - var characteristic = await service.AddCharacteristicAsync(new BleUuid(0x1234)); - await Task.Delay(1000); - } -} diff --git a/tools/AssignedNumbersCrawler/AssignedNumbersCrawler.csproj b/tools/AssignedNumbersCrawler/AssignedNumbersCrawler.csproj index 7912e7f4..b778be17 100644 --- a/tools/AssignedNumbersCrawler/AssignedNumbersCrawler.csproj +++ b/tools/AssignedNumbersCrawler/AssignedNumbersCrawler.csproj @@ -1,7 +1,7 @@  Exe - net8.0 + net10.0 enable enable Nullable