Skip to content

Commit 4b3c6fb

Browse files
beto-rodriguezbeto-rodriguez
authored
Merge pull request #2053 from Live-Charts/update-dotnet
update net 10
2 parents 7942a1b + 17b0cc9 commit 4b3c6fb

125 files changed

Lines changed: 662 additions & 882 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LiveCharts.slnx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,13 @@
142142
<Folder Name="/Solution Items/">
143143
<File Path=".editorconfig" />
144144
<File Path="Directory.Build.props" />
145-
<File Path="global.json" />
146145
</Folder>
147-
<Folder Name="/Solution Items/RenderingSettings/">
146+
<Folder Name="/Solution Items/MSBuild/">
147+
<File Path="build/NativeSharedLinks.Build.props" />
148148
<File Path="build/RenderSettings.Build.props" />
149+
<File Path="build/SharedLinks.Build.props" />
150+
<File Path="build/WinUISharedLinks.Build.props" />
151+
<File Path="build/XamlSharedLinks.Build.props" />
149152
</Folder>
150153
<Folder Name="/Tests/">
151154
<Project Path="tests/LiveChartsCore.UnitTesting/LiveChartsCore.UnitTesting.csproj">

‎build/NativeSharedLinks.Build.props‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<ItemGroup>
3+
<Compile Include="..\..\_Shared.Native\**\*.cs">
4+
<Link>Native\%(RecursiveDir)%(Filename).cs</Link>
5+
</Compile>
6+
</ItemGroup>
7+
</Project>

‎build/SharedLinks.Build.props‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<Project>
2+
<ItemGroup>
3+
<Compile Include="..\_Shared\SourceGenChart.*.cs">
4+
<Link>%(Filename).cs</Link>
5+
<DependentUpon>SourceGenChart.cs</DependentUpon>
6+
</Compile>
7+
8+
<Compile Include="..\_Shared\SourceGenCartesianChart.*.cs">
9+
<Link>%(Filename).cs</Link>
10+
<DependentUpon>CartesianChart.cs</DependentUpon>
11+
</Compile>
12+
<Compile Update="SourceGenCartesianChart.*.cs">
13+
<DependentUpon>CartesianChart.cs</DependentUpon>
14+
</Compile>
15+
16+
<Compile Include="..\_Shared\SourceGenPieChart.*.cs">
17+
<Link>%(Filename).cs</Link>
18+
<DependentUpon>PieChart.cs</DependentUpon>
19+
</Compile>
20+
<Compile Update="SourceGenPieChart.*.cs">
21+
<DependentUpon>PieChart.cs</DependentUpon>
22+
</Compile>
23+
24+
<Compile Include="..\_Shared\SourceGenPolarChart.*.cs">
25+
<Link>%(Filename).cs</Link>
26+
<DependentUpon>PolarChart.cs</DependentUpon>
27+
</Compile>
28+
<Compile Update="SourceGenPolarChart.*.cs">
29+
<DependentUpon>PolarChart.cs</DependentUpon>
30+
</Compile>
31+
32+
<Compile Include="..\_Shared\SourceGenMapChart.*.cs">
33+
<Link>%(Filename).cs</Link>
34+
<DependentUpon>GeoMap.cs</DependentUpon>
35+
</Compile>
36+
<Compile Update="SourceGenMapChart.*.cs">
37+
<DependentUpon>GeoMap.cs</DependentUpon>
38+
</Compile>
39+
</ItemGroup>
40+
</Project>

‎build/WinUISharedLinks.Build.props‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project>
2+
<ItemGroup>
3+
<Compile Include="..\_Shared.WinUI\**\*.cs">
4+
<Link>%(RecursiveDir)%(Filename).cs</Link>
5+
</Compile>
6+
7+
<Compile Update="..\_Shared.WinUI\SourceGenCartesianChart.*.cs">
8+
<DependentUpon>CartesianChart.cs</DependentUpon>
9+
</Compile>
10+
11+
<Compile Update="..\_Shared.WinUI\SourceGenPieChart.*.cs">
12+
<DependentUpon>PieChart.cs</DependentUpon>
13+
</Compile>
14+
15+
<Compile Update="..\_Shared.WinUI\SourceGenPolarChart.*.cs">
16+
<DependentUpon>PolarChart.cs</DependentUpon>
17+
</Compile>
18+
19+
<Compile Update="..\_Shared.WinUI\SourceGenMapChart.*.cs">
20+
<DependentUpon>GeoMap.cs</DependentUpon>
21+
</Compile>
22+
23+
</ItemGroup>
24+
</Project>

‎build/XamlSharedLinks.Build.props‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<ItemGroup>
3+
<Compile Include="..\_Shared.Xaml\*.cs">
4+
<Link>XamlFriendlySourceGenerated\%(Filename).cs</Link>
5+
</Compile>
6+
</ItemGroup>
7+
</Project>

‎global.json‎

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

‎samples/AvaloniaSample/AvaloniaSample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="../../Directory.Build.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Nullable>enable</Nullable>
88
<LangVersion>$(GlobalLangVersion)</LangVersion>
99
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>

‎samples/AvaloniaSample/Platforms/AvaloniaSample.Android/AvaloniaSample.Android.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0-android</TargetFramework>
5+
<TargetFramework>net10.0-android</TargetFramework>
66
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
77
<Nullable>enable</Nullable>
88
<ApplicationId>com.CompanyName.AvaloniaSample</ApplicationId>

‎samples/AvaloniaSample/Platforms/AvaloniaSample.Android/Properties/launchSettings.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"profiles": {
3+
"WSL": {
4+
"commandName": "WSL2",
5+
"distributionName": ""
6+
}
7+
}
8+
}

‎samples/AvaloniaSample/Platforms/AvaloniaSample.Browser/AvaloniaSample.Browser.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WebAssembly">
22
<PropertyGroup>
3-
<TargetFramework>net9.0-browser</TargetFramework>
3+
<TargetFramework>net10.0-browser</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
</PropertyGroup>

0 commit comments

Comments
 (0)