Skip to content

Commit 9911209

Browse files
jeromelabanjeromelaban
authored
Merge pull request #623 from unoplatform/dev/jela/wct-bump
fix: Datagrid build fix, WCT bump for uno5
2 parents 17fa360 + 31910c3 commit 9911209

File tree

9 files changed

+49
-45
lines changed

9 files changed

+49
-45
lines changed

‎UI/StatusBarThemeColor/StatusBarColorSample.Mobile/StatusBarColorSample.Mobile.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net8.0-macos'">osx-x64</RuntimeIdentifier>
2929
</PropertyGroup>
3030
<ItemGroup>
31-
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.100" />
31+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
3232
<PackageReference Include="Uno.WinUI" Version="5.0.64" />
3333
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.64" Condition="'$(Configuration)'=='Debug'" />
3434
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.64" />

‎UI/UnoContoso/UnoContoso.Mobile/UnoContoso.Mobile.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
</PropertyGroup>
1616
<ItemGroup>
1717
<PackageReference Include="Prism.DryIoc.Uno.WinUI" Version="8.1.97" />
18-
<PackageReference Include="Uno.CommunityToolkit.WinUI" Version="7.1.100" />
19-
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.100" />
20-
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.100" />
18+
<PackageReference Include="Uno.CommunityToolkit.WinUI" Version="7.1.200" />
19+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
20+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200" />
2121
<PackageReference Include="Uno.WinUI" Version="5.0.64" />
2222
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.64" Condition="'$(Configuration)'=='Debug'" />
2323
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.64" />

‎UI/UnoContoso/UnoContoso.Wasm/UnoContoso.Wasm.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<!--<PackageReference Include="Prism.DryIoc" Version="8.1.97" />-->
4848
<PackageReference Include="Prism.DryIoc.Uno.WinUI" Version="8.1.97" />
4949
<PackageReference Include="Prism.Uno.WinUI" Version="8.1.97" />
50-
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.100" />
51-
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.100" />
50+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
51+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200" />
5252
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
5353
<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.0.64" />
5454
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.64" Condition="'$(Configuration)'=='Debug'" />

‎UI/UnoWCTDataGridSample/WCTTestbed2/WCTTestbed2.Windows/WCTTestbed2.Windows.csproj

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
5-
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
6-
<RootNamespace>WCTTestbed2</RootNamespace>
7-
<Platforms>x86;x64;arm64</Platforms>
8-
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
2+
<PropertyGroup>
3+
<OutputType>WinExe</OutputType>
4+
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
5+
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
6+
<RootNamespace>WCTTestbed2</RootNamespace>
7+
<Platforms>x86;x64;arm64</Platforms>
8+
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
99
<UseRidGraph>true</UseRidGraph>
10-
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
11-
<DefaultLanguage>en</DefaultLanguage>
12-
<UseWinUI>true</UseWinUI>
13-
<EnableMsixTooling>true</EnableMsixTooling>
14-
<WindowsPackageType>MSIX</WindowsPackageType>
15-
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
16-
</PropertyGroup>
17-
<ItemGroup>
18-
<Content Include="Images\**" />
19-
</ItemGroup>
20-
<ItemGroup>
21-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
22-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
23-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
24-
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
25-
<Manifest Include="$(ApplicationManifest)" />
26-
</ItemGroup>
10+
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
11+
<DefaultLanguage>en</DefaultLanguage>
12+
<UseWinUI>true</UseWinUI>
13+
<EnableMsixTooling>true</EnableMsixTooling>
14+
<WindowsPackageType>MSIX</WindowsPackageType>
15+
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
16+
<UseRidGraph>true</UseRidGraph>
17+
</PropertyGroup>
18+
<ItemGroup>
19+
<Content Include="Images\**" />
20+
</ItemGroup>
21+
<ItemGroup>
22+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
23+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
24+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
25+
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
26+
<Manifest Include="$(ApplicationManifest)" />
27+
</ItemGroup>
2728

28-
<ItemGroup>
29-
<ProjectReference Include="..\WCTTestbed2\WCTTestbed2.csproj" />
30-
</ItemGroup>
31-
<Import Project="..\WCTTestbed2.Base\base.props" />
29+
<ItemGroup>
30+
<ProjectReference Include="..\WCTTestbed2\WCTTestbed2.csproj" />
31+
</ItemGroup>
32+
<Import Project="..\WCTTestbed2.Base\base.props" />
3233
</Project>

‎UI/UnoWCTDataGridSample/WCTTestbed2/WCTTestbed2/WCTTestbed2.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</SupportedOSPlatformVersion>
2121
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.0</TargetPlatformMinVersion>
2222
</PropertyGroup>
23+
24+
<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
25+
<UseRidGraph>true</UseRidGraph>
26+
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
27+
</PropertyGroup>
28+
2329
<PropertyGroup>
2430
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
2531
<GenerateLibraryLayout>true</GenerateLibraryLayout>
@@ -39,7 +45,7 @@
3945
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
4046
</ItemGroup>
4147
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
42-
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.100" />
48+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
4349
</ItemGroup>
4450

4551
<ItemGroup Condition="'$(TargetFramework)'!='net8.0-windows10.0.19041'">

‎UI/WCTDataTreeTabSample/WCTDataTreeTabSample/WCTDataTreeTabSample.Mobile/WCTDataTreeTabSample.Mobile.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<ItemGroup>
2121

2222
<PackageReference Include="Uno.Toolkit.WinUI" Version="5.0.15" />
23-
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.100" />
23+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
2424

2525
<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
2626
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />

‎UI/WCTDataTreeTabSample/WCTDataTreeTabSample/WCTDataTreeTabSample.Skia.Gtk/WCTDataTreeTabSample.Skia.Gtk.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
1818
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.6" />
1919
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
20-
21-
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.100" />
22-
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.64" />
20+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
21+
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.64" />
2322
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="5.0.64" />
2423
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.64" Condition="'$(Configuration)'=='Debug'" />
2524
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.64" />

‎UI/WCTDataTreeTabSample/WCTDataTreeTabSample/WCTDataTreeTabSample.Skia.Wpf/WCTDataTreeTabSample.Skia.Wpf.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@
3131
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="2.88.6" />
3232
<PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.88.6" />
3333
<PackageReference Include="SkiaSharp.Views.WPF" Version="2.88.6" />
34-
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.100" />
35-
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.100" />
34+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
35+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200" />
3636
<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
3737
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
38-
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Interactivity.WinUI" Version="2.3.1-uno.2" />
39-
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.1-uno.2" />
4038
<PackageReference Include="Uno.SourceGenerationTasks" Version="4.2.0" />
4139
<PackageReference Include="Uno.WinUI" Version="5.0.64" />
4240
<PackageReference Include="Uno.WinUI.Runtime.Skia.Wpf" Version="5.0.64" />

‎UI/WCTDataTreeTabSample/WCTDataTreeTabSample/WCTDataTreeTabSample.Wasm/WCTDataTreeTabSample.Wasm.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<ItemGroup>
4343
<PackageReference Include="Uno.Toolkit.WinUI" Version="5.0.15" />
4444
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
45-
<PackageReference Include="Uno.CommunityToolkit.WinUI" Version="7.1.100" />
46-
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.100" />
45+
<PackageReference Include="Uno.CommunityToolkit.WinUI" Version="7.1.200" />
46+
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
4747
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
4848

4949
<PackageReference Include="Uno.SourceGenerationTasks" Version="4.2.0" />

0 commit comments

Comments
 (0)