Skip to content

Commit

Permalink
fix: Fix GetWindow issue on GTK
Browse files Browse the repository at this point in the history
  • Loading branch information
@eriklimakc
eriklimakc committed Jul 18, 2023
1 parent 1da0cf6 commit 3d669af
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 15 deletions.
4 changes: 2 additions & 2 deletions src/library/Uno.Cupertino/Uno.Cupertino.csproj
View file
Expand Up @@ -86,14 +86,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Uno.UI" Version="5.0.0-dev.1148" />
<PackageReference Include="Uno.UI" Version="5.0.0-dev.1433" />
</ItemGroup>
<ItemGroup Condition="$(_IsUWP)">
<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.0-prerelease.210113001" />
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Lottie" Version="6.1.0" />
</ItemGroup>
<ItemGroup Condition="!$(_IsUWP)">
<PackageReference Include="Uno.UI.Lottie" Version="5.0.0-dev.1148" />
<PackageReference Include="Uno.UI.Lottie" Version="5.0.0-dev.1433" />
</ItemGroup>

<ItemGroup Condition="$(_IsUWP)">
Expand Down
6 changes: 3 additions & 3 deletions src/library/Uno.Material/Uno.Material.csproj
View file
Expand Up @@ -61,7 +61,7 @@
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.1148" Condition="!$(_IsWinUI)" />

<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" Condition="$(_IsWinUI)" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="$(_IsWinUI)"/>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" Condition="$(_IsWinUI)" />
</ItemGroup>

<ItemGroup Condition="$(_IsWinUI)">
Expand Down Expand Up @@ -97,14 +97,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Uno.UI" Version="5.0.0-dev.1148" />
<PackageReference Include="Uno.UI" Version="5.0.0-dev.1433" />
</ItemGroup>
<ItemGroup Condition="$(_IsUWP)">
<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.0-prerelease.210113001" />
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Lottie" Version="6.1.0" />
</ItemGroup>
<ItemGroup Condition="!$(_IsUWP)">
<PackageReference Include="Uno.UI.Lottie" Version="5.0.0-dev.1148" />
<PackageReference Include="Uno.UI.Lottie" Version="5.0.0-dev.1433" />
</ItemGroup>


Expand Down
4 changes: 1 addition & 3 deletions src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Program.cs
View file
Expand Up @@ -14,9 +14,7 @@ static void Main(string[] args)
expArgs.ExitApplication = true;
};

Windows.ApplicationModel.Resources.ResourceLoader.GetStringInternal = s => null;

var host = new GtkHost(() => new App(), args);
var host = new GtkHost(() => new App());

host.Run();
}
Expand Down
6 changes: 3 additions & 3 deletions src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj
View file
Expand Up @@ -36,9 +36,9 @@
<PackageReference Include="SkiaSharp.Views.Uno" Version="2.88.1-preview.79" />
<PackageReference Include="Uno.ShowMeTheXAML" Version="1.0.59" />
<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" Version="1.0.59" />
<PackageReference Include="Uno.UI.Skia.Gtk" Version="5.0.0-dev.1148" />
<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1148" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1148" />
<PackageReference Include="Uno.UI.Skia.Gtk" Version="5.0.0-dev.1433" />
<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1433" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1433" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/samples/UWP/Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj
View file
Expand Up @@ -37,7 +37,7 @@
<Version>1.0.59</Version>
</PackageReference>
<PackageReference Include="Uno.UI">
<Version>5.0.0-dev.1148</Version>
<Version>5.0.0-dev.1433</Version>
</PackageReference>
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
Expand Down
6 changes: 3 additions & 3 deletions src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj
View file
Expand Up @@ -54,9 +54,9 @@
</PackageReference>
<PackageReference Include="Uno.ShowMeTheXAML" Version="1.0.59" />
<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" Version="1.0.59" />
<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1148" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.WebAssembly" Version="5.0.0-dev.1148" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1148" />
<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1433" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.WebAssembly" Version="5.0.0-dev.1433" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1433" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.20" />
Expand Down

0 comments on commit 3d669af

Please sign in to comment.