Skip to content

Commit e4b4849

Browse files
VincentH-NetVincentH-Net
committed
version to 3; update NuGets and TFMs to .NET 8/9 latest stable
1 parent 8361246 commit e4b4849

File tree

8 files changed

+32
-42
lines changed

8 files changed

+32
-42
lines changed

‎src/CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView/CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.38">
1+
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
22
<PropertyGroup>
33
<Configurations>Debug;Release;Generate</Configurations>
44
<IsUno>true</IsUno>
@@ -44,7 +44,7 @@
4444
</PropertyGroup>
4545

4646
<PropertyGroup>
47-
<TargetFrameworks>$(CSharpMarkupWinUINet7TargetFrameworks)</TargetFrameworks>
47+
<TargetFrameworks>net8.0-windows10.0.19041;net8.0;net8.0-android34.0;net8.0-ios18.0;net8.0-maccatalyst18.0</TargetFrameworks>
4848
<RootNamespace>CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView</RootNamespace>
4949
</PropertyGroup>
5050

‎src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.38">
1+
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
22
<PropertyGroup>
33
<Configurations>Debug;Release;Generate</Configurations>
44
<IsUno>true</IsUno>
@@ -44,7 +44,7 @@
4444
</PropertyGroup>
4545

4646
<PropertyGroup>
47-
<TargetFrameworks>$(CSharpMarkupWinUINet8TargetFrameworks)</TargetFrameworks>
47+
<TargetFrameworks>$(CSharpMarkupWinUIExtensionsTargetFrameworks)</TargetFrameworks>
4848
<RootNamespace>CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit</RootNamespace>
4949
</PropertyGroup>
5050

‎src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/CSharpMarkup.WinUI.Uno.Extensions.Navigation.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.38">
1+
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
22
<PropertyGroup>
33
<Configurations>Debug;Release;Generate</Configurations>
44
<IsUno>true</IsUno>
@@ -44,7 +44,7 @@
4444
</PropertyGroup>
4545

4646
<PropertyGroup>
47-
<TargetFrameworks>$(CSharpMarkupWinUINet8TargetFrameworks)</TargetFrameworks>
47+
<TargetFrameworks>$(CSharpMarkupWinUIExtensionsTargetFrameworks)</TargetFrameworks>
4848
<RootNamespace>CSharpMarkup.WinUI.Uno.Extensions.Navigation</RootNamespace>
4949
</PropertyGroup>
5050

‎src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/CSharpMarkup.WinUI.Uno.Extensions.Reactive.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.38">
1+
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
22
<PropertyGroup>
33
<Configurations>Debug;Release;Generate</Configurations>
44
<IsUno>true</IsUno>
@@ -44,7 +44,7 @@
4444
</PropertyGroup>
4545

4646
<PropertyGroup>
47-
<TargetFrameworks>$(CSharpMarkupWinUINet8TargetFrameworks)</TargetFrameworks>
47+
<TargetFrameworks>$(CSharpMarkupWinUIExtensionsTargetFrameworks)</TargetFrameworks>
4848
<RootNamespace>CSharpMarkup.WinUI.Uno.Extensions.Reactive</RootNamespace>
4949
</PropertyGroup>
5050

‎src/CSharpMarkup.WinUI.Uno.Toolkit/CSharpMarkup.WinUI.Uno.Toolkit.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.38">
1+
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
22
<PropertyGroup>
33
<Configurations>Debug;Release;Generate</Configurations>
44
<IsUno>true</IsUno>
@@ -44,7 +44,7 @@
4444
</PropertyGroup>
4545

4646
<PropertyGroup>
47-
<TargetFrameworks>$(CSharpMarkupWinUINet7TargetFrameworks)</TargetFrameworks>
47+
<TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8.0-ios17.2;net8.0-maccatalyst17.2;net8.0-macos14.2</TargetFrameworks>
4848
<RootNamespace>CSharpMarkup.WinUI.Uno.Toolkit</RootNamespace>
4949
</PropertyGroup>
5050

‎src/CSharpMarkup.WinUI/CSharpMarkup.WinUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.38">
1+
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
22
<PropertyGroup>
33
<Configurations>Debug;Release;Generate</Configurations>
44
</PropertyGroup>

‎src/Directory.Build.props

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!-- For CSharpMarkup projects-->
22
<Project>
33
<PropertyGroup>
4-
<CSharpMarkupVersion>2.4.18</CSharpMarkupVersion>
5-
<CSharpMarkupReleaseTag>csharpmarkup2-winui-2-4-18</CSharpMarkupReleaseTag>
4+
<CSharpMarkupVersion>3.0.1</CSharpMarkupVersion>
5+
<CSharpMarkupReleaseTag>csharpmarkup2-winui-3-0-1</CSharpMarkupReleaseTag>
66
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
77

88
<IsUno>true</IsUno>
@@ -14,24 +14,25 @@
1414
<IsWinAppSdk>false</IsWinAppSdk>
1515
<IsWasm>false</IsWasm>
1616

17-
<CSharpMarkupWinUINet7TargetFrameworks>net7.0-windows10.0.19041;net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</CSharpMarkupWinUINet7TargetFrameworks>
18-
<CSharpMarkupWinUINet8TargetFrameworks>net8.0-windows10.0.19041;net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-macos</CSharpMarkupWinUINet8TargetFrameworks>
17+
<CSharpMarkupWinUINet8TargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android30.0;net8.0-ios17.0;net8.0-maccatalyst17.0;net8.0-macos14.0</CSharpMarkupWinUINet8TargetFrameworks>
18+
<CSharpMarkupWinUINet9TargetFrameworks>net9.0;net9.0-android30.0;net9.0-ios18.0;net9.0-maccatalyst18.0;net9.0-macos15.0</CSharpMarkupWinUINet9TargetFrameworks>
19+
<CSharpMarkupWinUIExtensionsTargetFrameworks>net8.0-windows10.0.19041.0;net8.0;net8.0-android34.0;net8-browserwasm1.0;net8-desktop1.0;net8.0-ios17.2;net8.0-maccatalyst17.2</CSharpMarkupWinUIExtensionsTargetFrameworks>
1920
</PropertyGroup>
2021

2122
<Choose>
2223
<When Condition=" '$(Configuration)' == 'Generate' And '$(DotNetPreviousMajor)' == 'true' ">
2324
<PropertyGroup>
24-
<CSharpMarkupWinUITargetFrameworks>$(CSharpMarkupWinUINet7TargetFrameworks)</CSharpMarkupWinUITargetFrameworks>
25+
<CSharpMarkupWinUITargetFrameworks>$(CSharpMarkupWinUINet8TargetFrameworks)</CSharpMarkupWinUITargetFrameworks>
2526
</PropertyGroup>
2627
</When>
2728
<When Condition=" '$(Configuration)' == 'Generate' And '$(DotNetPreviousMajor)' != 'true' ">
2829
<PropertyGroup>
29-
<CSharpMarkupWinUITargetFrameworks>$(CSharpMarkupWinUINet8TargetFrameworks)</CSharpMarkupWinUITargetFrameworks>
30+
<CSharpMarkupWinUITargetFrameworks>$(CSharpMarkupWinUINet9TargetFrameworks)</CSharpMarkupWinUITargetFrameworks>
3031
</PropertyGroup>
3132
</When>
3233
<Otherwise>
3334
<PropertyGroup>
34-
<CSharpMarkupWinUITargetFrameworks>$(CSharpMarkupWinUINet7TargetFrameworks);$(CSharpMarkupWinUINet8TargetFrameworks)</CSharpMarkupWinUITargetFrameworks>
35+
<CSharpMarkupWinUITargetFrameworks>$(CSharpMarkupWinUINet8TargetFrameworks);$(CSharpMarkupWinUINet9TargetFrameworks)</CSharpMarkupWinUITargetFrameworks>
3536
</PropertyGroup>
3637
</Otherwise>
3738
</Choose>
@@ -64,21 +65,10 @@
6465

6566
<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
6667
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
68+
69+
<!-- .NET 8+ Windows runtime identifiers -->
70+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
6771
</PropertyGroup>
68-
<Choose>
69-
<When Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)', 1)) &lt; 8">
70-
<PropertyGroup>
71-
<!-- Pre .NET 8 Windows runtime identifiers -->
72-
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
73-
</PropertyGroup>
74-
</When>
75-
<Otherwise>
76-
<PropertyGroup>
77-
<!-- .NET 8+ Windows runtime identifiers -->
78-
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
79-
</PropertyGroup>
80-
</Otherwise>
81-
</Choose>
8272
</When>
8373
<Otherwise>
8474
<PropertyGroup>
@@ -98,6 +88,6 @@
9888
</PropertyGroup>
9989

10090
<Target Name="DisplayCustomVariable" BeforeTargets="BeforeBuild">
101-
<Message Text="CSharpMarkupWinUITargetFrameworks is: $(CSharpMarkupWinUITargetFrameworks)" Importance="high" />
91+
<Message Text="CSharpMarkupWinUITargetFrameworks is: $(CSharpMarkupWinUITargetFrameworks), TargetPlatformIdentifier is: $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')), IsUno is: $(IsUno), DefineConstants is : $(DefineConstants)" Importance="high" />
10292
</Target>
10393
</Project>

‎src/Directory.Packages.props

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<Project ToolsVersion="15.0">
33
<ItemGroup>
44
<PackageVersion Include="CSharpMarkup.WinUI" Version="$(CSharpMarkupVersion)" />
5-
<PackageVersion Include="LiveChartsCore.SkiaSharpView.Uno.WinUI" Version="2.0.0-rc2" />
6-
<PackageVersion Include="LiveChartsCore.SkiaSharpView.WinUI" Version="2.0.0-rc2" />
5+
<PackageVersion Include="LiveChartsCore.SkiaSharpView.Uno.WinUI" Version="2.0.0-rc5.3" />
6+
<PackageVersion Include="LiveChartsCore.SkiaSharpView.WinUI" Version="2.0.0-rc5.3" />
77
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
8-
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
9-
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240404000" />
10-
<PackageVersion Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="4.1.14" />
11-
<PackageVersion Include="Uno.Extensions.Navigation.WinUI" Version="4.1.14" />
12-
<PackageVersion Include="Uno.Extensions.Reactive.WinUI" Version="4.1.14" />
13-
<PackageVersion Include="Uno.Toolkit.WinUI" Version="6.0.18" />
14-
<PackageVersion Include="Uno.WinUI" Version="5.2.108" />
8+
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
9+
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250228001" />
10+
<PackageVersion Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="5.2.7" />
11+
<PackageVersion Include="Uno.Extensions.Navigation.WinUI" Version="5.2.7" />
12+
<PackageVersion Include="Uno.Extensions.Reactive.WinUI" Version="5.2.7" />
13+
<PackageVersion Include="Uno.Toolkit.WinUI" Version="6.4.6" />
14+
<PackageVersion Include="Uno.WinUI" Version="5.6.99" />
1515
</ItemGroup>
1616
</Project>

0 commit comments

Comments
 (0)