Skip to content

Commit 00d5d85

Browse files
committed
Uno platform 2
1 parent 5677c27 commit 00d5d85

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

SmartImage.App/SmartImage.App.Mobile/SmartImage.App.Mobile.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net7.0-android</TargetFrameworks>
4-
<TargetFrameworks>$(TargetFrameworks);net7.0-ios</TargetFrameworks>
54

65

76
<!-- Disabled because of https://github.com/xamarin/xamarin-macios/issues/16401--><!--
@@ -14,11 +13,11 @@
1413
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
1514
</PropertyGroup>
1615
<ItemGroup>
17-
<PackageReference Include="Uno.WinUI" Version="4.6.39" />
18-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.6.39" Condition="'$(Configuration)'=='Debug'" />
19-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.39" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
21-
<PackageReference Include="Uno.WinUI.Lottie" Version="4.6.39" />
16+
<PackageReference Include="Uno.Extensions" Version="2.2.0" />
17+
<PackageReference Include="Uno.WinUI" Version="4.6.41" />
18+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.6.41" Condition="'$(Configuration)'=='Debug'" />
19+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.6.41" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
2221
</ItemGroup>
2322
<Choose>
2423
<When Condition="'$(TargetFramework)'=='net7.0-android'">
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Application
2-
x:Class="SmartImage.App.App"
3-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:local="using:SmartImage.App">
2+
x:Class="SmartImage.App.App"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:local="using:SmartImage.App">
66

7-
<Application.Resources>
8-
<ResourceDictionary>
9-
<ResourceDictionary.MergedDictionaries>
10-
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
11-
<!-- Add resource dictionaries here -->
12-
</ResourceDictionary.MergedDictionaries>
13-
<!-- Add resources here -->
14-
</ResourceDictionary>
15-
</Application.Resources>
7+
<Application.Resources>
8+
<ResourceDictionary>
9+
<ResourceDictionary.MergedDictionaries>
10+
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
11+
<!-- Add resource dictionaries here -->
12+
</ResourceDictionary.MergedDictionaries>
13+
<!-- Add resources here -->
14+
</ResourceDictionary>
15+
</Application.Resources>
1616

1717
</Application>

SmartImage.App/SmartImage.App.Windows/SmartImage.App.Windows.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.3" />
27-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.196" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
26+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.221209.1" />
27+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
2929
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
30+
<PackageReference Include="Uno.Extensions" Version="2.2.0" />
3031

3132
<Manifest Include="$(ApplicationManifest)" />
3233
</ItemGroup>
@@ -35,7 +36,7 @@
3536
Tools extension to be activated for this project even if the Windows App SDK Nuget
3637
package has not yet been restored -->
3738
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
38-
<ProjectCapability Include="Msix"/>
39+
<ProjectCapability Include="Msix" />
3940
</ItemGroup>
4041

4142
<ItemGroup>

SmartImage.Lib 3/SmartImage.Lib.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<DefineConstants>TRACE;JETBRAINS_ANNOTATIONS</DefineConstants>
2323
</PropertyGroup>
2424
<ItemGroup>
25-
<PackageReference Include="AngleSharp" Version="1.0.0" />
26-
<PackageReference Include="AngleSharp.Css" Version="0.16.4" />
27-
<PackageReference Include="AngleSharp.Io" Version="0.17.0" />
25+
<PackageReference Include="AngleSharp" Version="1.0.1" />
26+
<PackageReference Include="AngleSharp.Css" Version="0.17.0" />
27+
<PackageReference Include="AngleSharp.Io" Version="1.0.0" />
2828
<PackageReference Include="AngleSharp.Js" Version="0.15.0" />
2929
<PackageReference Include="AngleSharp.XPath" Version="2.0.1" />
3030
<PackageReference Include="Flurl.Http" Version="3.2.4" />

0 commit comments

Comments
 (0)