Skip to content

Commit 69b0385

Browse files
jeromelabanramezgerges
jeromelaban
authored and
ramezgerges
committed
feat: Add support for wasm+skia runtime
1 parent 639e813 commit 69b0385

File tree

172 files changed

+4279
-663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+4279
-663
lines changed

‎NuGet.Config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<clear />
4+
<!--<clear />-->
55
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
66
<add key="Solution Packages" value="src/PackageCache" />
77
</packageSources>

‎build/nuget/Uno.WinUI.Skia.WebAssembly.Browser.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<IsUnoHead>true</IsUnoHead>
6+
<UnoRuntimeIdentifier>Skia</UnoRuntimeIdentifier>
7+
<UnoWinRTIdentifier>WebAssembly</UnoWinRTIdentifier>
8+
<UnoIsSkiaWebAssemblyBrowserHead>true</UnoIsSkiaWebAssemblyBrowserHead>
9+
</PropertyGroup>
10+
11+
</Project>

‎build/nuget/Uno.WinUI.Skia.WebAssembly.Browser.targets

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
</PropertyGroup>
6+
7+
<!-- Copy Content files to the output folder like APPX packaging does. -->
8+
<Target Name="_UnoBeforeCopyLocal" BeforeTargets="CopyFilesToOutputDirectory;_CopyFilesMarkedCopyLocal">
9+
<ItemGroup>
10+
<ContentWithTargetPath
11+
Update="@(ContentWithTargetPath)"
12+
CopyToOutputDirectory="Always" />
13+
</ItemGroup>
14+
</Target>
15+
16+
</Project>

‎global.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
{
2+
<<<<<<< HEAD
23
"sdk": {
34
"allowPrerelease": false
45
},
6+
=======
7+
//"sdk": {
8+
// "version": "7.0.406",
9+
// "allowPrerelease": false,
10+
// "rollForward": "latestFeature"
11+
//},
12+
//"tools": {
13+
// "dotnet": "7.0.406"
14+
//},
15+
>>>>>>> d296983cff (feat: Add support for wasm+skia runtime)
516
"msbuild-sdks": {
617
"MSBuild.Sdk.Extras": "3.0.44",
718
"Microsoft.Build.NoTargets": "3.7.56"

‎src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.Skia.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717

1818
<DefineConstants>$(DefineConstants);HAS_SKOTTIE</DefineConstants>
1919
</PropertyGroup>
20+
<ItemDefinitionGroup>
21+
<ProjectReference>
22+
<Private Condition="'$(OutputType)' == 'library'">false</Private>
23+
</ProjectReference>
24+
</ItemDefinitionGroup>
25+
2026

2127
<ItemGroup>
2228

‎src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.Skia.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
<ItemGroup>
2525
<PackageReference Include="Microsoft.Identity.Client" Version="4.61.3" />
2626
</ItemGroup>
27+
<ItemDefinitionGroup>
28+
<ProjectReference>
29+
<Private Condition="'$(OutputType)' == 'library'">false</Private>
30+
</ProjectReference>
31+
</ItemDefinitionGroup>
32+
2733

2834
<ItemGroup>
2935
<ProjectReference Include="..\..\Uno.UI\Uno.UI.Skia.csproj">

‎src/AddIns/Uno.UI.MediaPlayer.Skia.Gtk/Uno.UI.MediaPlayer.Skia.Gtk.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
<ItemGroup>
2727
<None Include="..\..\Common\uno.png" Pack="true" PackagePath="\" />
2828
</ItemGroup>
29+
<ItemDefinitionGroup>
30+
<ProjectReference>
31+
<Private Condition="'$(OutputType)' == 'library'">false</Private>
32+
</ProjectReference>
33+
</ItemDefinitionGroup>
34+
2935

3036
<ItemGroup>
3137
<PackageReference Include="PolySharp" Version="1.13.2">

‎src/AddIns/Uno.UI.Svg/Uno.UI.Svg.Skia.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<PlatformItemsBasePath>.\</PlatformItemsBasePath>
1616
<Nullable>enable</Nullable>
1717
</PropertyGroup>
18+
<ItemDefinitionGroup>
19+
<ProjectReference>
20+
<Private Condition="'$(OutputType)' == 'library'">false</Private>
21+
</ProjectReference>
22+
</ItemDefinitionGroup>
23+
1824

1925
<ItemGroup>
2026

‎src/Directory.Build.targets

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@
9696
<PackageReference Update="Xamarin.UITest" Version="4.3.5" />
9797
<PackageReference Update="Xamarin.TestCloud.Agent" Version="0.23.2" />
9898
<PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
99+
<PackageReference Update="Microsoft.Windows.Compatibility" Version="5.0.1" />
99100

101+
<<<<<<< HEAD
100102
<PackageReference Update="SkiaSharp.Views" Version="$(SkiaSharpVersion)" />
101103
<PackageReference Update="SkiaSharp.Views.Uno" Version="$(SkiaSharpVersion)" />
102104
<PackageReference Update="SkiaSharp.Views.Uno.WinUI" Version="$(SkiaSharpVersion)" />
@@ -109,8 +111,24 @@
109111
<PackageReference Update="SkiaSharp.NativeAssets.iOS" Version="$(SkiaSharpVersion)" />
110112
<PackageReference Update="SkiaSharp.NativeAssets.MacCatalyst" Version="$(SkiaSharpVersion)" />
111113
<PackageReference Update="SkiaSharp.NativeAssets.macos" Version="$(SkiaSharpVersion)" />
114+
=======
115+
<PackageReference Update="SkiaSharp.Views" Version="2.88.7" />
116+
<PackageReference Update="SkiaSharp.Views.Uno" Version="2.88.7" />
117+
<PackageReference Update="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
118+
<PackageReference Update="SkiaSharp.Views.WPF" Version="2.88.7" />
119+
<PackageReference Update="SkiaSharp" Version="2.88.7" />
120+
<PackageReference Update="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
121+
<PackageReference Update="SkiaSharp.Harfbuzz" Version="2.88.7" />
122+
<PackageReference Update="SkiaSharp.Skottie" Version="2.88.7" />
123+
<PackageReference Update="SkiaSharp.NativeAssets.Android" Version="2.88.7" />
124+
<PackageReference Update="SkiaSharp.NativeAssets.iOS" Version="2.88.7" />
125+
<PackageReference Update="SkiaSharp.NativeAssets.MacCatalyst" Version="2.88.7" />
126+
<PackageReference Update="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.7" />
127+
<PackageReference Update="SkiaSharp.NativeAssets.macos" Version="2.88.7" />
128+
>>>>>>> d296983cff (feat: Add support for wasm+skia runtime)
112129

113130
<PackageReference Update="HarfBuzzSharp.NativeAssets.macOS" Version="7.3.0.1" />
131+
<PackageReference Update="HarfBuzzSharp.NativeAssets.WebAssembly" Version="7.3.0.1" />
114132
<PackageReference Update="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.1" />
115133
<PackageReference Update="harfbuzzsharp.nativeassets.ios" Version="7.3.0.1" />
116134
<PackageReference Update="SkiaSharp.HarfBuzz" Version="$(SkiaSharpVersion)" />

‎src/SamplesApp/Directory.Build.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22

3-
<!-- https://docs.microsoft.com/en-us/visualstudio/msbuild/customize-your-build?view=vs-2019#use-case-multi-level-merging -->
4-
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
3+
<!-- https://docs.microsoft.com/en-us/visualstudio/msbuild/customize-your-build?view=vs-2019#use-case-multi-level-merging -->
4+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
55

6-
<PropertyGroup>
7-
<!-- fixed for self-testing inside the Uno Solution -->
8-
<UnoRemoteControlPort>53487</UnoRemoteControlPort>
9-
</PropertyGroup>
6+
<PropertyGroup>
7+
<!-- fixed for self-testing inside the Uno Solution -->
8+
<UnoRemoteControlPort>53487</UnoRemoteControlPort>
9+
</PropertyGroup>
1010

1111
</Project>

0 commit comments

Comments
 (0)