Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to .NET 8 #316

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Update to .NET 8 #316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1ec16c4
Update to .NET 8
wieslawsoltes Nov 24, 2024
edccd39
Update nuke project
wieslawsoltes Nov 24, 2024
039a658
Update nuke schema
wieslawsoltes Nov 24, 2024
72ea2df
Install SDKs
wieslawsoltes Nov 24, 2024
aab0261
Remove TargetFramework from Directory.Build.props to fix dotnet pack
wieslawsoltes Nov 24, 2024
437c2ca
Move LangVersion to Directory.Build.props
wieslawsoltes Nov 24, 2024
db73bcc
Update Avalonia.Controls.TreeDataGrid.sln
wieslawsoltes Nov 24, 2024
780ca1a
Use same SDK version as Avalonia
wieslawsoltes Nov 24, 2024
951baa8
Enable useGlobalJson and don't install other SDKs
wieslawsoltes Nov 24, 2024
b0f55a6
Update GitHub actions
wieslawsoltes Nov 24, 2024
b1ace57
Merge branch 'master' into update-to-net8
wieslawsoltes Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors>nullable</WarningsAsErrors>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>9</LangVersion>
<!-- https://github.com/dotnet/msbuild/issues/2661 -->
<AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.101",
"version": "8.0.100",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion samples/TreeDataGridDemo/TreeDataGridDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>False</IsPackable>
<OutputType>WinExe</OutputType>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Avalonia.Controls.TreeDataGrid/Avalonia.Controls.TreeDataGrid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFrameworks>net5.0;net6.0;net8.0</TargetFrameworks>
<IsPackable>True</IsPackable>
<LangVersion>10</LangVersion>
<RootNamespace>Avalonia.Controls</RootNamespace>
Expand Down
2 changes: 2 additions & 0 deletions src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/AnonymousRow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ namespace Avalonia.Controls.Models.TreeDataGrid
internal class AnonymousRow<TModel> : IRow<TModel>, IModelIndexableRow
{
private int _modelIndex;
#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
[AllowNull] private TModel _model;
#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.

public object? Header => _modelIndex;
public TModel Model => _model;
Expand Down
2 changes: 1 addition & 1 deletion tests/Avalonia.Controls.TreeDataGrid.Tests/Avalonia.Controls.TreeDataGrid.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>False</IsPackable>
<RootNamespace>Avalonia.Controls.TreeDataGridTests</RootNamespace>
</PropertyGroup>
Expand Down
Loading