Skip to content

Commit 2a41ea0

Browse files
committed
Merge branch 'develop'
2 parents 2ed97cb + 226021d commit 2a41ea0

3 files changed

Lines changed: 6 additions & 66 deletions

File tree

.github/workflows/nuget.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ on:
1111
jobs:
1212
build:
1313

14-
runs-on: macos-14
14+
runs-on: macos-15
1515

1616
steps:
17-
- uses: actions/checkout@v3
18-
- uses: actions/setup-dotnet@v3
17+
- uses: actions/checkout@v4
18+
- uses: actions/setup-dotnet@v4
1919
with:
20-
dotnet-version: '8.x'
20+
dotnet-version: '10.x'
2121

2222
- uses: maxim-lobanov/setup-xcode@v1
2323
with:

Directory.build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
Version="1.2.0-beta.435"
1818
PrivateAssets="all" />
1919
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers"
20-
Version="8.0.0"
20+
Version="10.0.0"
2121
PrivateAssets="all" />
2222
<PackageReference Include="Roslynator.Analyzers"
2323
Version="4.12.9"

MauiKeyboardEffects/MauiKeyboardEffects.csproj

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
4+
<TargetFrameworks>net10.0-android;net10.0-ios</TargetFrameworks>
55
<UseMaui>true</UseMaui>
66
<SingleProject>true</SingleProject>
77
<ImplicitUsings>enable</ImplicitUsings>
@@ -14,72 +14,12 @@
1414

1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
17-
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)"/>
1817
</ItemGroup>
1918

2019
<ItemGroup>
2120
<Folder Include="Platforms\Android\" />
2221
</ItemGroup>
2322

24-
<ItemGroup>
25-
<None Update="Platforms\iOS\Resources\KeyboardDismiss.png">
26-
<Link>%(FullPath)</Link>
27-
<IsDefaultItem>true</IsDefaultItem>
28-
</None>
29-
<None Update="Platforms\iOS\Resources\KeyboardDismiss@2x.png">
30-
<Link>%(FullPath)</Link>
31-
<IsDefaultItem>true</IsDefaultItem>
32-
</None>
33-
<None Update="Platforms\iOS\Resources\KeyboardDismiss@3x.png">
34-
<Link>%(FullPath)</Link>
35-
<IsDefaultItem>true</IsDefaultItem>
36-
</None>
37-
<None Update="Platforms\iOS\Resources\KeyboardErase.png">
38-
<Link>%(FullPath)</Link>
39-
<IsDefaultItem>true</IsDefaultItem>
40-
</None>
41-
<None Update="Platforms\iOS\Resources\KeyboardErase@2x.png">
42-
<Link>%(FullPath)</Link>
43-
<IsDefaultItem>true</IsDefaultItem>
44-
</None>
45-
<None Update="Platforms\iOS\Resources\KeyboardErase@3x.png">
46-
<Link>%(FullPath)</Link>
47-
<IsDefaultItem>true</IsDefaultItem>
48-
</None>
49-
<None Update="Platforms\iOS\Resources\de.lproj\Localizable.strings">
50-
<Link>%(FullPath)</Link>
51-
<IsDefaultItem>true</IsDefaultItem>
52-
</None>
53-
<None Update="Platforms\iOS\Resources\en.lproj\Localizable.strings">
54-
<Link>%(FullPath)</Link>
55-
<IsDefaultItem>true</IsDefaultItem>
56-
</None>
57-
<None Update="Platforms\iOS\Resources\es.lproj\Localizable.strings">
58-
<Link>%(FullPath)</Link>
59-
<IsDefaultItem>true</IsDefaultItem>
60-
</None>
61-
<None Update="Platforms\iOS\Resources\fr.lproj\Localizable.strings">
62-
<Link>%(FullPath)</Link>
63-
<IsDefaultItem>true</IsDefaultItem>
64-
</None>
65-
<None Update="Platforms\iOS\Resources\he.lproj\Localizable.strings">
66-
<Link>%(FullPath)</Link>
67-
<IsDefaultItem>true</IsDefaultItem>
68-
</None>
69-
<None Update="Platforms\iOS\Resources\it.lproj\Localizable.strings">
70-
<Link>%(FullPath)</Link>
71-
<IsDefaultItem>true</IsDefaultItem>
72-
</None>
73-
<None Update="Platforms\iOS\Resources\nl.lproj\Localizable.strings">
74-
<Link>%(FullPath)</Link>
75-
<IsDefaultItem>true</IsDefaultItem>
76-
</None>
77-
<None Update="Platforms\iOS\Resources\sv.lproj\Localizable.strings">
78-
<Link>%(FullPath)</Link>
79-
<IsDefaultItem>true</IsDefaultItem>
80-
</None>
81-
</ItemGroup>
82-
8323
<!--
8424
Pack the MSBuild targets file and all iOS resources into the NuGet package.
8525
NuGet auto-imports build/net9.0-ios/EightBot.MauiKeyboardEffects.targets into

0 commit comments

Comments
 (0)