Skip to content

Commit af48b9a

Browse files
authored
Merge pull request #109 from Laerdal/framinosona/fix-global-json-sdk-version
fix: Automatic Dependency Submission workflow (global.json + Sample's local ProjectReferences)
2 parents 86eb7f9 + c965c11 commit af48b9a

4 files changed

Lines changed: 4 additions & 12 deletions

File tree

Laerdal.Dfu.Sample/Laerdal.Dfu.Sample.csproj

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,20 @@
3333
<!-- NuGet packages -->
3434
<ItemGroup>
3535
<PackageReference Include="Laerdal.Dfu" Version="1.27.205" />
36+
<PackageReference Include="Bluetooth.Maui" Version="4.0.18" />
3637
<PackageReference Include="CommunityToolkit.Maui" Version="15.0.1" />
3738
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
3839
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.101" />
3940
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.11" />
4041
</ItemGroup>
4142

42-
<!-- Plugin.Bluetooth project references (for BLE scanning) -->
43-
<ItemGroup>
44-
<ProjectReference Include="..\..\Laerdal_Plugin.Bluetooth\Bluetooth.Maui\Bluetooth.Maui.csproj" />
45-
<ProjectReference Include="..\..\Laerdal_Plugin.Bluetooth\Bluetooth.Abstractions\Bluetooth.Abstractions.csproj" />
46-
<ProjectReference Include="..\..\Laerdal_Plugin.Bluetooth\Bluetooth.Abstractions.Scanning\Bluetooth.Abstractions.Scanning.csproj" />
47-
</ItemGroup>
48-
4943
<!-- Resources -->
5044
<ItemGroup>
5145
<MauiIcon Include="Resources\AppIcon\appicon.svg" />
5246
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="256,256" />
5347
<MauiImage Include="Resources\Images\*" />
54-
<MauiFont Include="..\..\Laerdal_Plugin.Bluetooth\Bluetooth.Maui.Sample.Scanner\Resources\Fonts\OpenSans-Regular.ttf"
55-
Link="Resources\Fonts\OpenSans-Regular.ttf" />
56-
<MauiFont Include="..\..\Laerdal_Plugin.Bluetooth\Bluetooth.Maui.Sample.Scanner\Resources\Fonts\OpenSans-Semibold.ttf"
57-
Link="Resources\Fonts\OpenSans-Semibold.ttf" />
48+
<MauiFont Include="Resources\Fonts\OpenSans-Regular.ttf" />
49+
<MauiFont Include="Resources\Fonts\OpenSans-Semibold.ttf" />
5850
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
5951
</ItemGroup>
6052

105 KB
Binary file not shown.
109 KB
Binary file not shown.

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.0",
3+
"version": "10.0.100",
44
"rollForward": "latestMinor",
55
"allowPrerelease": false
66
}

0 commit comments

Comments
 (0)