Skip to content

Commit 63d8ae7

Browse files
jonsagarajonsagara
committed
Multi-target .NET 8 and .NET 9.
1 parent 9b6eefa commit 63d8ae7

File tree

8 files changed

+39
-16
lines changed

8 files changed

+39
-16
lines changed

‎Directory.Build.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<PropertyGroup>
33

44
<!-- .NET and C# versions for all assemblies -->
5-
<TargetFramework>net8.0</TargetFramework>
6-
<LangVersion>12.0</LangVersion>
5+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
6+
<LangVersion>13.0</LangVersion>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99

1010
<!-- NuGet -->
11-
<Version>2.0.0</Version>
12-
<AssemblyVersion>2.0.0.0</AssemblyVersion>
13-
<FileVersion>2.0.0.0</FileVersion>
11+
<Version>2.1.0-alpha1</Version>
12+
<AssemblyVersion>2.1.0.0</AssemblyVersion>
13+
<FileVersion>2.1.0.0</FileVersion>
1414
<Authors>Armin Reiter; Jon Sagara</Authors>
1515
<Copyright>Copyright 2022-2024</Copyright>
1616
<RepositoryUrl>https://github.com/jonsagara/Sagara.FeedReader</RepositoryUrl>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.403",
3+
"version": "9.0.100-rc.2.24474.11",
44
"rollForward": "latestPatch"
55
}
66
}

‎src/Sagara.FeedReader.Benchmarks/Sagara.FeedReader.Benchmarks.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5+
<TargetFrameworks>net9.0</TargetFrameworks>
56
</PropertyGroup>
67

78
<ItemGroup>
@@ -10,7 +11,7 @@
1011

1112
<ItemGroup>
1213
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
13-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
14+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24473.5" />
1415
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
1516
<PackageReference Include="Polly.Core" Version="8.4.2" />
1617
<PackageReference Include="Scrutor" Version="5.0.1" />

‎src/Sagara.FeedReader.ConsoleSample/Sagara.FeedReader.ConsoleSample.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5+
<TargetFrameworks>net9.0</TargetFrameworks>
56
</PropertyGroup>
67

78
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
9-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
10-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" />
11-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
12-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
9+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rc.2.24473.5" />
10+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24473.5" />
11+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0-preview.9.24507.7" />
12+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24473.5" />
13+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24473.5" />
1314
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
1415
<PackageReference Include="Polly.Core" Version="8.4.2" />
1516
<PackageReference Include="Scrutor" Version="5.0.1" />

‎src/Sagara.FeedReader.TestDataCrawler/Sagara.FeedReader.TestDataCrawler.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5+
<TargetFramework>net9.0</TargetFramework>
56
</PropertyGroup>
67

78
<ItemGroup>
89
<Content Include="feeds.txt" CopyToOutputDirectory="PreserveNewest" />
910
</ItemGroup>
1011

1112
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
13+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24473.5" />
1314
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
1415
<PackageReference Include="Polly.Core" Version="8.4.2" />
1516
<PackageReference Include="Scrutor" Version="5.0.1" />

‎src/Sagara.FeedReader.Tests.Integration/Sagara.FeedReader.Tests.Integration.csproj

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

3+
<PropertyGroup>
4+
<TargetFrameworks>net9.0</TargetFrameworks>
5+
</PropertyGroup>
6+
37
<ItemGroup>
4-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
8+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24473.5" />
59
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
610
<PackageReference Include="xunit" Version="2.9.2" />
711
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

‎src/Sagara.FeedReader.Tests.Unit/Sagara.FeedReader.Tests.Unit.csproj

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

3+
<PropertyGroup>
4+
<TargetFrameworks>net9.0</TargetFrameworks>
5+
</PropertyGroup>
6+
37
<ItemGroup>
4-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
8+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24473.5" />
59
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
610
<PackageReference Include="xunit" Version="2.9.2" />
711
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

‎src/Sagara.FeedReader/Sagara.FeedReader.csproj

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,21 @@
3737
<!--<None Include="icon.png" Pack="True" PackagePath="\" />-->
3838
</ItemGroup>
3939

40-
<ItemGroup>
40+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
4141
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
4242
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" />
43+
<!-- Direct on STJ dependency to resolve vulnerability warning -->
44+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
45+
</ItemGroup>
46+
47+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
48+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0-rc.2.24473.5" />
49+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0-preview.9.24507.7" />
50+
<!-- Direct on STJ dependency to resolve vulnerability warning -->
51+
<PackageReference Include="System.Text.Json" Version="9.0.0-rc.2.24473.5" />
52+
</ItemGroup>
53+
54+
<ItemGroup>
4355
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
4456
<PackageReference Include="Microsoft.Net.Http.Headers" Version="8.0.10" />
4557
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">

0 commit comments

Comments
 (0)