Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="8.0.1">
<PackageVersion Include="coverlet.collector" Version="10.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Darp.BinaryObjects" Version="0.7.0" />
<PackageVersion Include="Darp.Utils.Messaging" Version="1.19.2" />
<PackageVersion Include="Meziantou.Analyzer" Version="3.0.48">
<PackageVersion Include="Darp.Utils.Messaging" Version="1.20.0" />
<PackageVersion Include="Meziantou.Analyzer" Version="3.0.61">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.6" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.7" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.1.0" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
Expand All @@ -39,20 +39,20 @@
<PackageVersion Include="SerilogTracing" Version="2.3.1" />
<PackageVersion Include="SerilogTracing.Expressions" Version="2.3.1" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="System.IO.Ports" Version="10.0.6" />
<PackageVersion Include="System.Linq.Async" Version="7.0.0" />
<PackageVersion Include="System.Numerics.Tensors" Version="10.0.6" />
<PackageVersion Include="System.IO.Ports" Version="10.0.7" />
<PackageVersion Include="System.Linq.Async" Version="7.0.1" />
<PackageVersion Include="System.Numerics.Tensors" Version="10.0.7" />
<PackageVersion Include="System.Reactive" Version="6.1.0" />
<PackageVersion Include="System.Reactive.Linq" Version="6.1.0" />
<PackageVersion Include="Verify" Version="31.15.0" />
<PackageVersion Include="Verify" Version="31.16.2" />
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
<PackageVersion Include="Verify.XunitV3" Version="31.15.0" />
<PackageVersion Include="Verify.XunitV3" Version="31.16.2" />
<PackageVersion Include="xunit.v3" Version="3.2.2" />
<PackageVersion Include="Xunit.DependencyInjection.Logging" Version="11.0.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="YamlDotNet" Version="17.0.1" />
<PackageVersion Include="YamlDotNet" Version="17.1.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
```
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.0",
"version": "10.0.100",
"rollForward": "latestFeature"
}
}
}
2 changes: 1 addition & 1 deletion src/Darp.Ble.Android/Darp.Ble.Android.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-android</TargetFramework>
<TargetFramework>net10.0-android</TargetFramework>
<!-- Android 12, older versions are not maintained by google anymore -->
<SupportedOSPlatformVersion>31</SupportedOSPlatformVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Darp.Ble.Hci/Darp.Ble.Hci.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>13</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Darp.Ble.HciHost/Darp.Ble.HciHost.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>latest</LangVersion>
<IsAotCompatible>true</IsAotCompatible>
<!-- Required for DLL import source generation -->
Expand Down
2 changes: 1 addition & 1 deletion src/Darp.Ble.Mock/Darp.Ble.Mock.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Darp.Ble.WinRT/Darp.Ble.WinRT.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net9.0;net9.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net10.0;net10.0-windows10.0.19041.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Darp.Ble\Darp.Ble.csproj" />
</ItemGroup>
<!-- When NOT building windows, remove everything except for the public API -->
<ItemGroup Condition="'$(TargetFramework)'!='net9.0-windows10.0.19041.0'">
<ItemGroup Condition="'$(TargetFramework)'!='net10.0-windows10.0.19041.0'">
<!-- remove all .cs under the project -->
<Compile Remove="**\*.cs" />
<!-- Bring back the public API only. -->
Expand Down
2 changes: 1 addition & 1 deletion src/Darp.Ble/Darp.Ble.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
<TargetFramework>net10.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>13</LangVersion>
Expand Down
21 changes: 0 additions & 21 deletions test/Darp.Ble.WinRT.Tests/Darp.Ble.WinRT.Tests.csproj

This file was deleted.

61 changes: 0 additions & 61 deletions test/Darp.Ble.WinRT.Tests/UnitTest1.cs

This file was deleted.

2 changes: 1 addition & 1 deletion tools/AssignedNumbersCrawler/AssignedNumbersCrawler.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
Expand Down
Loading