Skip to content

Commit 3148050

Browse files
authored
Migrated to .NET9. Upgraded NuGet packages. Standardized project conf… (#199)
1 parent 2235981 commit 3148050

File tree

35 files changed

+192
-76
lines changed

35 files changed

+192
-76
lines changed

.github/workflows/build.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ jobs:
1717
- name: Checkout Repository
1818
uses: actions/checkout@v4
1919

20+
- name: Setup .NET9
21+
uses: actions/setup-dotnet@v4
22+
with:
23+
dotnet-version: 9.x
24+
2025
- name: Restore dependencies
2126
run: dotnet restore
2227

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
### Changed
1111

1212
- Changed YML extensions to YAML.
13+
- Migrated to .NET9.
14+
- Upgraded NuGet packages.
15+
16+
### Fixed
17+
18+
- Standardized project configuration.
1319

1420
### Removed
1521

demo/Logitar.Demo/Logitar.Demo.csproj

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<WarningsAsErrors>Nullable</WarningsAsErrors>
87
<UserSecretsId>a1f26849-0f4b-4b46-b010-84d4eb31d77c</UserSecretsId>
98
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
109
<DockerfileContext>..\..</DockerfileContext>
1110
</PropertyGroup>
1211

12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
13+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
14+
</PropertyGroup>
15+
16+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
17+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
18+
</PropertyGroup>
19+
1320
<ItemGroup>
14-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
15-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
21+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
22+
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
1623
</ItemGroup>
1724

1825
<ItemGroup>

src/Logitar.Data.PostgreSQL/Logitar.Data.PostgreSQL.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -35,7 +35,7 @@
3535
</PropertyGroup>
3636

3737
<ItemGroup>
38-
<PackageReference Include="Npgsql" Version="8.0.4" />
38+
<PackageReference Include="Npgsql" Version="9.0.1" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

src/Logitar.Data.SqlServer/Logitar.Data.SqlServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>

src/Logitar.Data/Logitar.Data.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>

src/Logitar.Net.Mail.Mailgun/Logitar.Net.Mail.Mailgun.csproj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<WarningsAsErrors>Nullable</WarningsAsErrors>
87
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
98
<Title>Logitar.Net.Mail.Mailgun</Title>
109
<Authors>Francis Pion</Authors>
@@ -27,6 +26,14 @@
2726
<PackageProjectUrl>https://github.com/Logitar/Logitar.NET/tree/dev/src/Logitar.Net.Mail.Mailgun</PackageProjectUrl>
2827
</PropertyGroup>
2928

29+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
30+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
31+
</PropertyGroup>
32+
33+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
34+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
35+
</PropertyGroup>
36+
3037
<ItemGroup>
3138
<None Update="LICENSE">
3239
<PackagePath>\</PackagePath>

src/Logitar.Net.Mail.SendGrid/Logitar.Net.Mail.SendGrid.csproj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<WarningsAsErrors>Nullable</WarningsAsErrors>
87
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
98
<Title>Logitar.Net.Mail.SendGrid</Title>
109
<Authors>Francis Pion</Authors>
@@ -27,6 +26,14 @@
2726
<PackageProjectUrl>https://github.com/Logitar/Logitar.NET/tree/dev/src/Logitar.Net.Mail.SendGrid</PackageProjectUrl>
2827
</PropertyGroup>
2928

29+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
30+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
31+
</PropertyGroup>
32+
33+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
34+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
35+
</PropertyGroup>
36+
3037
<ItemGroup>
3138
<None Update="LICENSE">
3239
<PackagePath>\</PackagePath>

src/Logitar.Net.Sms.Twilio/Logitar.Net.Sms.Twilio.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>

src/Logitar.Net/Logitar.Net.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>

src/Logitar.Security/Logitar.Security.csproj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<WarningsAsErrors>Nullable</WarningsAsErrors>
87
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
98
<Title>Logitar.Security</Title>
109
<Authors>Francis Pion</Authors>
@@ -27,6 +26,14 @@
2726
<PackageProjectUrl>https://github.com/Logitar/Logitar.NET/tree/dev/src/Logitar.Security</PackageProjectUrl>
2827
</PropertyGroup>
2928

29+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
30+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
31+
</PropertyGroup>
32+
33+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
34+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
35+
</PropertyGroup>
36+
3037
<ItemGroup>
3138
<None Update="LICENSE">
3239
<Pack>True</Pack>

tests/Logitar.Data.PostgreSQL.IntegrationTests/Logitar.Data.PostgreSQL.IntegrationTests.csproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<WarningsAsErrors>Nullable</WarningsAsErrors>
87

98
<IsPackable>false</IsPackable>
109
<IsTestProject>true</IsTestProject>
1110
<RootNamespace>Logitar.Data.PostgreSQL</RootNamespace>
1211
</PropertyGroup>
1312

13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
15+
</PropertyGroup>
16+
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
19+
</PropertyGroup>
20+
1421
<ItemGroup>
1522
<None Remove="appsettings.json" />
1623
<None Remove="Init.sql" />
@@ -26,8 +33,8 @@
2633
</ItemGroup>
2734

2835
<ItemGroup>
29-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
3138
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
3239
<PackageReference Include="xunit" Version="2.9.2" />
3340
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

tests/Logitar.Data.PostgreSQL.UnitTests/LikeOperatorTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ public void Ctor_it_constructs_the_correct_InsensitiveLikeOperator(bool notInsen
1717
[InlineData(null)]
1818
[InlineData("")]
1919
[InlineData(" ")]
20-
public void Ctor_it_throws_ArgumentException_when_pattern_is_null_empty_or_only_white_space(string pattern)
20+
public void Ctor_it_throws_ArgumentException_when_pattern_is_null_empty_or_only_white_space(string? pattern)
2121
{
22-
var exception = Assert.Throws<ArgumentException>(() => new InsensitiveLikeOperator(pattern));
22+
var exception = Assert.Throws<ArgumentException>(() => new InsensitiveLikeOperator(pattern!));
2323
Assert.Equal("pattern", exception.ParamName);
2424
}
2525
}

tests/Logitar.Data.PostgreSQL.UnitTests/Logitar.Data.PostgreSQL.UnitTests.csproj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<WarningsAsErrors>Nullable</WarningsAsErrors>
87

98
<IsPackable>false</IsPackable>
109
<IsTestProject>true</IsTestProject>
1110
<RootNamespace>Logitar.Data.PostgreSQL</RootNamespace>
1211
</PropertyGroup>
1312

13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
15+
</PropertyGroup>
16+
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
19+
</PropertyGroup>
20+
1421
<ItemGroup>
1522
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1623
<PackageReference Include="xunit" Version="2.9.2" />

tests/Logitar.Data.SqlServer.IntegrationTests/Logitar.Data.SqlServer.IntegrationTests.csproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<WarningsAsErrors>Nullable</WarningsAsErrors>
87

98
<IsPackable>false</IsPackable>
109
<IsTestProject>true</IsTestProject>
1110
<RootNamespace>Logitar.Data.SqlServer</RootNamespace>
1211
</PropertyGroup>
1312

13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
15+
</PropertyGroup>
16+
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
19+
</PropertyGroup>
20+
1421
<ItemGroup>
1522
<None Remove="appsettings.json" />
1623
<None Remove="Init.sql" />
@@ -26,8 +33,8 @@
2633
</ItemGroup>
2734

2835
<ItemGroup>
29-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
3138
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
3239
<PackageReference Include="xunit" Version="2.9.2" />
3340
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

tests/Logitar.Data.SqlServer.UnitTests/Logitar.Data.SqlServer.UnitTests.csproj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<WarningsAsErrors>Nullable</WarningsAsErrors>
87

98
<IsPackable>false</IsPackable>
109
<IsTestProject>true</IsTestProject>
1110
<RootNamespace>Logitar.Data.SqlServer</RootNamespace>
1211
</PropertyGroup>
1312

13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
15+
</PropertyGroup>
16+
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
19+
</PropertyGroup>
20+
1421
<ItemGroup>
1522
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1623
<PackageReference Include="xunit" Version="2.9.2" />

tests/Logitar.Data.UnitTests/ColumnIdTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ public void Ctor_it_constructs_the_correct_column_identifier(string columnName,
3939
[InlineData(null)]
4040
[InlineData("")]
4141
[InlineData(" ")]
42-
public void Ctor_it_throws_ArgumentException_when_column_name_is_null_empty_or_white_space(string name)
42+
public void Ctor_it_throws_ArgumentException_when_column_name_is_null_empty_or_white_space(string? name)
4343
{
44-
var exception = Assert.Throws<ArgumentException>(() => new ColumnId(name));
44+
var exception = Assert.Throws<ArgumentException>(() => new ColumnId(name!));
4545
Assert.Equal("name", exception.ParamName);
4646
}
4747
}

tests/Logitar.Data.UnitTests/CommandTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public void Ctor_it_constructs_the_correct_command(string text, params object[]
1717
[InlineData(null)]
1818
[InlineData("")]
1919
[InlineData(" ")]
20-
public void Ctor_it_throws_ArgumentException_when_text_is_null_empty_or_only_white_space(string text)
20+
public void Ctor_it_throws_ArgumentException_when_text_is_null_empty_or_only_white_space(string? text)
2121
{
22-
var exception = Assert.Throws<ArgumentException>(() => new Command(text, Enumerable.Empty<object>()));
22+
var exception = Assert.Throws<ArgumentException>(() => new Command(text!, Enumerable.Empty<object>()));
2323
}
2424
}

tests/Logitar.Data.UnitTests/ComparisonOperatorTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ public void Ctor_it_constructs_the_correct_ComparisonOperator(string @operator,
1717
[InlineData(null)]
1818
[InlineData("")]
1919
[InlineData(" ")]
20-
public void Ctor_it_throws_ArgumentException_when_operator_is_null_empty_or_only_white_space(string @operator)
20+
public void Ctor_it_throws_ArgumentException_when_operator_is_null_empty_or_only_white_space(string? @operator)
2121
{
22-
var exception = Assert.Throws<ArgumentException>(() => new ComparisonOperator(@operator, 0));
22+
var exception = Assert.Throws<ArgumentException>(() => new ComparisonOperator(@operator!, 0));
2323
Assert.Equal("operator", exception.ParamName);
2424
}
2525
}

tests/Logitar.Data.UnitTests/ConditionGroupTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ public void Ctor_it_throws_ArgumentException_when_conditions_are_empty()
2828
[InlineData(null)]
2929
[InlineData("")]
3030
[InlineData(" ")]
31-
public void Ctor_it_throws_ArgumentException_when_operator_is_null_empty_or_only_white_space(string @operator)
31+
public void Ctor_it_throws_ArgumentException_when_operator_is_null_empty_or_only_white_space(string? @operator)
3232
{
3333
Condition[] conditions = new[]
3434
{
3535
new OperatorCondition(new ColumnId("Id"), new NullOperator(notNull: true))
3636
};
37-
var exception = Assert.Throws<ArgumentException>(() => new ConditionGroupMock(conditions, @operator));
37+
var exception = Assert.Throws<ArgumentException>(() => new ConditionGroupMock(conditions, @operator!));
3838
}
3939
}

tests/Logitar.Data.UnitTests/LikeOperatorTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ public void Ctor_it_constructs_the_correct_LikeOperator(bool notLike, string pat
1717
[InlineData(null)]
1818
[InlineData("")]
1919
[InlineData(" ")]
20-
public void Ctor_it_throws_ArgumentException_when_pattern_is_null_empty_or_only_white_space(string pattern)
20+
public void Ctor_it_throws_ArgumentException_when_pattern_is_null_empty_or_only_white_space(string? pattern)
2121
{
22-
var exception = Assert.Throws<ArgumentException>(() => new LikeOperator(pattern));
22+
var exception = Assert.Throws<ArgumentException>(() => new LikeOperator(pattern!));
2323
Assert.Equal("pattern", exception.ParamName);
2424
}
2525
}

0 commit comments

Comments
 (0)