Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: properly ignore xamarin+winui targets for shadows #762

Merged
merged 1 commit into from
Aug 28, 2023
Merged

build: properly ignore xamarin+winui targets for shadows #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Uno.Toolkit.RuntimeTests/Tests/ShadowContainerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace Uno.Toolkit.RuntimeTests.Tests
{
[TestClass]
[RunsOnUIThread]
#if HAS_UNO_WINUI && !NET6_0_OR_GREATER
#if HAS_UNO_WINUI && !(NET6_0_OR_GREATER || NETSTANDARD2_0)
[Ignore("Disabled because Skia.Sharp doesn't support Xamarin+WinUI.")]
#endif
internal partial class ShadowContainerTests
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public partial class ShadowContainer : ContentControl

public ShadowContainer()
{
#if HAS_UNO_WINUI && !NET6_0_OR_GREATER
#if HAS_UNO_WINUI && !(NET6_0_OR_GREATER || NETSTANDARD2_0)
throw new NotSupportedException("ShadowContainer doesn't support Xamarin + WinUI considering moving to .NET6 or greater.");
#else
Shadows = new();
Expand Down
2 changes: 2 additions & 0 deletions src/Uno.Toolkit.Skia.WinUI/Uno.Toolkit.Skia.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<RootNamespace>Uno.Toolkit.Skia.WinUI</RootNamespace>
<PackageId>Uno.Toolkit.Skia.WinUI</PackageId>
<DefineConstants Condition="$(_IsWindowsWinUI)">$(DefineConstants);WINDOWS</DefineConstants>
<!-- Need to manually add NET6_0_OR_GREATER since MSBuild.Sdk.Extras/3.0.38 contains a bug that forcibly removes it -->
<DefineConstants Condition="$(TargetFramework.StartsWith('net6.0'))">$(DefineConstants);NET6_0_OR_GREATER</DefineConstants>
<DefineConstants>$(DefineConstants);IS_WINUI</DefineConstants>
<FrameworkLineage>WinUI</FrameworkLineage>
<UnoXamlResourcesTrimming Condition="'$(OS)'=='Windows_NT' or '$(MSBuildRuntimeType)'=='Core'">true</UnoXamlResourcesTrimming>
Expand Down