Skip to content

Commit a1b5249

Browse files
authored
Add support for .NET 10 (#182)
* Add support for .NET 10 * Update to CodeAnalysis version 4.14.0
1 parent 6376705 commit a1b5249

File tree

23 files changed

+210
-121
lines changed

23 files changed

+210
-121
lines changed

.config/dotnet-tools.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "2.0.0",
6+
"version": "6.0.0",
77
"commands": [
88
"dotnet-cake"
9-
]
9+
],
10+
"rollForward": false
1011
}
1112
}
1213
}

Common.props

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1212
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
1313
<TreatSpecificWarningsAsErrors />
14-
<LibTargetFrameworks Condition ="$(LibTargetFrameworks) == ''">netstandard2.0;net8.0</LibTargetFrameworks>
15-
<AppTargetFrameworks Condition ="$(AppTargetFrameworks) == ''">net472;net8.0</AppTargetFrameworks>
16-
<TestTargetFramework Condition ="$(TestTargetFramework) == ''">net8.0</TestTargetFramework>
17-
<ToolTargetFrameworks Condition ="$(ToolTargetFrameworks) == ''">net8.0</ToolTargetFrameworks>
18-
<MicrosoftCodeAnalysisVersion>4.10.0</MicrosoftCodeAnalysisVersion>
19-
<MicrosoftBuildLocatorVersion>1.7.8</MicrosoftBuildLocatorVersion>
20-
<SQLitePCLRawVersion>2.1.8</SQLitePCLRawVersion>
14+
<LibTargetFrameworks Condition ="$(LibTargetFrameworks) == ''">netstandard2.0;net8.0;net10.0</LibTargetFrameworks>
15+
<AppTargetFrameworks Condition ="$(AppTargetFrameworks) == ''">net472;net8.0;net10.0</AppTargetFrameworks>
16+
<TestTargetFramework Condition ="$(TestTargetFramework) == ''">net10.0</TestTargetFramework>
17+
<ToolTargetFrameworks Condition ="$(ToolTargetFrameworks) == ''">net8.0;net10.0</ToolTargetFrameworks>
18+
<MicrosoftCodeAnalysisVersion>4.14.0</MicrosoftCodeAnalysisVersion>
2119
</PropertyGroup>
2220
</Project>

Source/AsyncGenerator.CommandLine/AsyncGenerator.CommandLine.csproj

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,44 @@
3737
</PropertyGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
42-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
40+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
41+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
42+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" />
43+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
44+
</ItemGroup>
45+
46+
<ItemGroup>
47+
<PackageReference Include="Microsoft.Build" ExcludeAssets="Runtime" PrivateAssets="all">
48+
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
49+
</PackageReference>
50+
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" PrivateAssets="all">
51+
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
52+
</PackageReference>
53+
<PackageReference Include="Microsoft.Build.Tasks.Core" ExcludeAssets="Runtime" PrivateAssets="all">
54+
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
55+
</PackageReference>
4356
</ItemGroup>
4457

4558
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
46-
<PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
47-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
48-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(MicrosoftCodeAnalysisVersion)" />
49-
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" /> <!-- https://github.com/advisories/GHSA-447r-wph3-92pm -->
59+
<PackageReference Include="Microsoft.Build.Locator" />
60+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
61+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
5062
</ItemGroup>
5163

5264
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
53-
<PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)">
65+
<PackageReference Include="Microsoft.Build.Locator">
5466
<PrivateAssets>all</PrivateAssets>
5567
</PackageReference>
56-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)">
68+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
5769
<PrivateAssets>all</PrivateAssets>
5870
</PackageReference>
59-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(MicrosoftCodeAnalysisVersion)">
71+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting">
6072
<PrivateAssets>all</PrivateAssets>
6173
</PackageReference>
62-
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.1">
74+
<PackageReference Include="System.Threading.Tasks.Dataflow">
6375
<PrivateAssets>all</PrivateAssets>
6476
</PackageReference>
65-
<PackageReference Include="SQLitePCLRaw.core" Version="$(SQLitePCLRawVersion)"> <!-- Needed for mono 5.16+ -->
77+
<PackageReference Include="SQLitePCLRaw.core"> <!-- Needed for mono 5.16+ -->
6678
<PrivateAssets>all</PrivateAssets>
6779
</PackageReference>
6880
</ItemGroup>

Source/AsyncGenerator.Configuration.Yaml/AsyncGenerator.Configuration.Yaml.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="YamlDotNet" Version="16.0.0" />
14+
<PackageReference Include="YamlDotNet" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

Source/AsyncGenerator.Core/AsyncGenerator.Core.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88
<IncludeSymbols>true</IncludeSymbols>
99
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
1010
<LangVersion>7.3</LangVersion>
11+
<NoWarn>NU1510</NoWarn>
1112
</PropertyGroup>
1213
<ItemGroup>
13-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
14-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisVersion)" />
14+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
15+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
16+
<PackageReference Include="System.Collections.Immutable" />
17+
<PackageReference Include="System.Reflection.Metadata" />
1518
</ItemGroup>
1619
</Project>

Source/AsyncGenerator.TestCases/AsyncGenerator.TestCases.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
11-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisVersion)" />
10+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
11+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

Source/AsyncGenerator.TestProjects/MultiTargetFrameworks/MultiTargetFrameworks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="NUnit" Version="3.8.0" />
8+
<PackageReference Include="NUnit" />
99
</ItemGroup>
1010

1111
</Project>

Source/AsyncGenerator.Tests/AsyncGenerator.Tests.csproj

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<PropertyGroup>
44
<TargetFramework>$(TestTargetFramework)</TargetFramework>
55
<IsPackable>false</IsPackable>
6-
<LangVersion>9.0</LangVersion>
6+
<LangVersion>latest</LangVersion>
7+
<NoWarn>CA2022;CS0618</NoWarn>
78
</PropertyGroup>
89

910
<PropertyGroup>
@@ -20,29 +21,32 @@
2021
</PropertyGroup>
2122

2223
<ItemGroup>
23-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
24-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
26-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
27-
<PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
28-
<PackageReference Include="NUnit" Version="3.14.0" />
29-
<PackageReference Include="NUnit.Analyzers" Version="4.0.1">
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
25+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" />
26+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
28+
<PackageReference Include="Microsoft.Build.Locator" />
29+
<PackageReference Include="NUnit" />
30+
<PackageReference Include="NUnit.Analyzers">
3031
<PrivateAssets>all</PrivateAssets>
3132
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3233
</PackageReference>
33-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
34-
<PackageReference Include="System.Interactive.Async" Version="4.1.1" />
34+
<PackageReference Include="NUnit3TestAdapter" />
35+
</ItemGroup>
36+
37+
<ItemGroup Condition="'$(TargetFramework)' != 'net10.0'">
38+
<PackageReference Include="System.Interactive.Async" />
3539
</ItemGroup>
3640

3741
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
3842
<Reference Include="Microsoft.CSharp" />
3943
<Reference Include="System.Transactions" />
40-
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
41-
<PackageReference Include="SQLitePCLRaw.core" Version="$(SQLitePCLRawVersion)" /> <!-- Needed for MONO 5.16+ -->
44+
<PackageReference Include="System.Threading.Tasks.Dataflow" />
45+
<PackageReference Include="SQLitePCLRaw.core" /> <!-- Needed for MONO 5.16+ -->
4246
</ItemGroup>
4347

4448
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
45-
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
49+
<PackageReference Include="System.Data.SqlClient" />
4650
</ItemGroup>
4751

4852
<ItemGroup>

Source/AsyncGenerator.Tests/CancellationTokens/Output/Override.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace AsyncGenerator.Tests.CancellationTokens.Input
2929
return ExecuteWriteAsync(cancellationToken);
3030
}
3131

32-
#if TEST
32+
#if TEST
3333
#endif
3434
}
3535

Source/AsyncGenerator.Tests/Github/Issue105/Output/TestCase2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ namespace AsyncGenerator.Tests.Github.Issue105.Input
3838
}
3939
}
4040

41-
#if TEST
41+
#if TEST
4242
#endif
4343
}

0 commit comments

Comments
 (0)