Skip to content

Commit bac6946

Browse files
authored
Merge pull request #155 from w-ahmad/project_update
Project update
2 parents 4a139f8 + 9f54fa9 commit bac6946

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

src/WinUI.TableView.csproj

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
1-
<Project Sdk="Uno.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>
4-
net8.0-desktop;
5-
net8.0-maccatalyst;
6-
net8.0-windows10.0.22621.0;
7-
net8.0-browserwasm;
8-
</TargetFrameworks>
9-
<IsPackable>true</IsPackable>
10-
<UnoSingleProject>true</UnoSingleProject>
11-
<OutputType>Library</OutputType>
12-
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
13-
<GenerateLibraryLayout>true</GenerateLibraryLayout>
14-
<Nullable>enable</Nullable>
15-
<DisableImplicitUnoPackages>true</DisableImplicitUnoPackages>
4+
net8.0;
5+
net9.0;
6+
net8.0-windows10.0.19041.0;
7+
net9.0-windows10.0.19041.0;
8+
</TargetFrameworks>
9+
<Nullable>enable</Nullable>
1610
</PropertyGroup>
1711

1812
<PropertyGroup Condition="'$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'windows'">
13+
<UseWinUI>true</UseWinUI>
1914
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
15+
<WindowsSdkPackageVersion>10.0.19041.56</WindowsSdkPackageVersion>
2016
</PropertyGroup>
2117

2218
<ItemGroup>
23-
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.1.240916" />
19+
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402" />
20+
<!--CommunityToolkit.WinUI.Behaviors version 8.2 is not supported on .net8.0 so let's downgrade it-->
21+
<PackageReference Update="CommunityToolkit.WinUI.Behaviors" Version="8.1.240916" Condition="'$(TargetFramework)' == 'net8.0'" />
2422
</ItemGroup>
25-
26-
<ItemGroup Condition="'$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' != 'windows'">
27-
<PackageReference Include="Uno.WinUI" Version="5.6.91" />
23+
24+
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
25+
<PackageReference Include="Uno.WinUI" Version="6.0.465" />
2826
</ItemGroup>
29-
30-
<ItemGroup Condition="'$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'windows'">
27+
28+
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
3129
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
3230
</ItemGroup>
31+
32+
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
33+
<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
34+
<Compile Update="**\*.xaml.cs">
35+
<DependentUpon>%(Filename)</DependentUpon>
36+
</Compile>
37+
<PRIResource Include="**\*.resw" Exclude="bin\**\*.resw;obj\**\*.resw" />
38+
</ItemGroup>
3339

3440
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
3541
<PackageId>WinUI.TableView</PackageId>

src/global.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)