Skip to content

Commit 89b04f9

Browse files
committed
Merge branch 'feature/initial-skiasharp3-migration' into develop
2 parents 0de8e90 + 938d840 commit 89b04f9

5 files changed

Lines changed: 42 additions & 19 deletions

File tree

AuroraControls.TestApp/AuroraControls.TestApp.csproj

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,28 @@
3636
</PropertyGroup>
3737
<ItemGroup>
3838
<!-- App Icon -->
39-
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4"/>
39+
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
4040
<!-- Splash Screen -->
41-
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128"/>
41+
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
4242
<!-- Images -->
43-
<MauiImage Include="Resources\Images\*"/>
44-
<MauiFont Include="Resources\Fonts\*"/>
43+
<MauiImage Include="Resources\Images\*" />
44+
<MauiFont Include="Resources\Fonts\*" />
4545
<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
46-
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)"/>
47-
<EmbeddedResource Include="Resources\SVG\*.svg"/>
46+
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
47+
<EmbeddedResource Include="Resources\SVG\*.svg" />
4848
</ItemGroup>
4949
<ItemGroup>
50-
<ProjectReference Include="..\AuroraControlsMaui\AuroraControls.Maui.csproj"/>
50+
<ProjectReference Include="..\AuroraControlsMaui\AuroraControls.Maui.csproj">
51+
<ReferenceSourceTarget></ReferenceSourceTarget>
52+
</ProjectReference>
5153
</ItemGroup>
5254
<ItemGroup>
53-
<PackageReference Include="NPicker" Version="3.0.3"/>
54-
<PackageReference Include="ReactiveUI.Maui" Version="20.4.1"/>
55-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
56-
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41"/>
57-
<PackageReference Include="CommunityToolkit.Maui.Markup" Version="6.0.1"/>
58-
<PackageReference Include="CommunityToolkit.Maui" Version="12.2.0"/>
59-
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.100"/>
55+
<PackageReference Include="NPicker" Version="3.0.3" />
56+
<PackageReference Include="ReactiveUI.Maui" Version="20.4.1" />
57+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
58+
<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
59+
<PackageReference Include="CommunityToolkit.Maui.Markup" Version="6.0.1" />
60+
<PackageReference Include="CommunityToolkit.Maui" Version="12.2.0" />
61+
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.100" />
6062
</ItemGroup>
6163
</Project>
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 25.0.1706.14
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuroraControls.TestApp", "AuroraControls.TestApp.csproj", "{3190F882-0667-428B-98EC-C5EFB9630A1B}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
EndGlobalSection
11+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12+
EndGlobalSection
13+
GlobalSection(SolutionProperties) = preSolution
14+
HideSolutionNode = FALSE
15+
EndGlobalSection
16+
GlobalSection(ExtensibilityGlobals) = postSolution
17+
SolutionGuid = {C310314B-1C97-4CEC-93F7-743E13D1DE17}
18+
EndGlobalSection
19+
EndGlobal

AuroraControlsMaui/AuroraControls.Maui.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<CreatePackage>false</CreatePackage>
1818
</PropertyGroup>
1919
<ItemGroup>
20-
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.9" />
21-
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
22-
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.9" />
23-
<PackageReference Include="Svg.Skia" Version="2.0.0.4" />
20+
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="3.119.1" />
21+
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1" />
22+
<PackageReference Include="SkiaSharp.HarfBuzz" Version="3.119.1" />
23+
<PackageReference Include="Svg.Skia" Version="3.2.1" />
2424
<PackageReference Include="Topten.RichTextKit" Version="0.4.167" />
2525
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.0" />
2626
</ItemGroup>

AuroraControlsMaui/VisualEffects/ThreeDee.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace AuroraControls.VisualEffects;
22

3+
/*
34
public class ThreeDee : VisualEffect
45
{
56
/// <summary>
@@ -106,3 +107,4 @@ private SKImage InternalApplyEffect(SKSurface surface, SKRect rect)
106107
return surface.Snapshot();
107108
}
108109
}
110+
*/

Directory.build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Version="9.0.0"
2222
PrivateAssets="all" />
2323
<PackageReference Include="Roslynator.Analyzers"
24-
Version="4.13.1"
24+
Version="4.14.0"
2525
PrivateAssets="All" />
2626
</ItemGroup>
2727
<ItemGroup>

0 commit comments

Comments
 (0)