Skip to content

Commit 87ee86b

Browse files
pwelter34pwelter34
committed
update to roslyn 4.4.0
1 parent 496b615 commit 87ee86b

File tree

16 files changed

+66
-31
lines changed

16 files changed

+66
-31
lines changed

‎.github/dependabot.yml

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ updates:
1515
time: "02:00"
1616
timezone: "America/Chicago"
1717
open-pull-requests-limit: 10
18+
ignore:
19+
- dependency-name: "Microsoft.CodeAnalysis.CSharp"
1820
groups:
1921
Azure:
2022
patterns:

‎.github/workflows/merge.yml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919

2020
- name: Dependabot Auto-Merge PRs
21-
if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
2221
run: gh pr merge --auto --merge "$PR_URL"
2322
env:
2423
PR_URL: ${{github.event.pull_request.html_url}}

‎FluentCommand.sln

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
3+
# 17
44
VisualStudioVersion = 17.3.32804.467
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentCommand", "src\FluentCommand\FluentCommand.csproj", "{4D5F125D-8DD5-496B-959E-78F55D8BE946}"
@@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{38D98603
2222
.github\dependabot.yml = .github\dependabot.yml
2323
src\Directory.Build.props = src\Directory.Build.props
2424
.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
25+
.github\workflows\merge.yml = .github\workflows\merge.yml
2526
README.md = README.md
2627
EndProjectSection
2728
EndProject

‎src/Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
</PropertyGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="AssemblyMetadata.Generators" Version="2.0.0" PrivateAssets="All" />
42-
<PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
41+
<PackageReference Include="AssemblyMetadata.Generators" Version="2.1.0" PrivateAssets="All" />
42+
<PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="All" />
4343
</ItemGroup>
4444

4545
<ItemGroup>

‎src/FluentCommand.Generators/FluentCommand.Generators.csproj

+7-5
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,24 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<ImplicitUsings>true</ImplicitUsings>
6-
<IncludeSymbols>false</IncludeSymbols>
5+
76
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
7+
88
<IsRoslynComponent>true</IsRoslynComponent>
99
<NoPackageAnalysis>true</NoPackageAnalysis>
1010
<IncludeBuildOutput>false</IncludeBuildOutput>
1111
<DevelopmentDependency>true</DevelopmentDependency>
1212
<IsPackable>false</IsPackable>
13+
1314
<AnalyzerLanguage>cs</AnalyzerLanguage>
14-
<AnalyzerRoslynVersion>4.3</AnalyzerRoslynVersion>
15-
<LangVersion>latest</LangVersion>
15+
<AnalyzerRoslynVersion>4.4</AnalyzerRoslynVersion>
16+
1617
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
1718
</PropertyGroup>
1819

1920
<ItemGroup>
20-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="[4.3.1]" PrivateAssets="all" />
21+
<!-- https://learn.microsoft.com/en-us/visualstudio/extensibility/roslyn-version-support -->
22+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="[4.4.0]" PrivateAssets="all" />
2123
</ItemGroup>
2224

2325
</Project>

‎src/FluentCommand.SqlServer/FluentCommand.SqlServer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="MicroSoft.Data.SqlClient" Version="5.2.1" />
12+
<PackageReference Include="MicroSoft.Data.SqlClient" Version="5.2.2" />
1313
</ItemGroup>
1414

1515
</Project>

‎src/FluentCommand/FluentCommand.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<None Include="..\FluentCommand.Generators\bin\$(Configuration)\netstandard2.0\FluentCommand.Generators.dll" PackagePath="analyzers\dotnet\roslyn4.3\cs" Pack="true" Visible="false" />
21+
<None Include="..\FluentCommand.Generators\bin\$(Configuration)\netstandard2.0\FluentCommand.Generators.dll" PackagePath="analyzers\dotnet\roslyn4.4\cs" Pack="true" Visible="false" />
2222
</ItemGroup>
2323

2424
</Project>

‎src/FluentCommand/Internal/HashCode.cs

+24-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public HashCode Combine<TValue>(TValue value)
4343
var hashCode = value is null ? 0 : EqualityComparer<TValue>.Default.GetHashCode(value);
4444
unchecked
4545
{
46-
hashCode = _hashCode * Multiplier + hashCode;
46+
hashCode = (_hashCode * Multiplier) + hashCode;
4747
}
4848

4949
return new HashCode(hashCode);
@@ -235,3 +235,26 @@ public static int HashString(string text)
235235
return hash;
236236
}
237237
}
238+
239+
240+
public class MyClass
241+
{
242+
public string Name { get; set; }
243+
244+
public Type Type { get; set; }
245+
246+
public override bool Equals(object obj)
247+
{
248+
return obj is MyClass @class &&
249+
Name == @class.Name &&
250+
EqualityComparer<Type>.Default.Equals(Type, @class.Type);
251+
}
252+
253+
public override int GetHashCode()
254+
{
255+
int hashCode = -243844509;
256+
hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Name);
257+
hashCode = hashCode * -1521134295 + EqualityComparer<Type>.Default.GetHashCode(Type);
258+
return hashCode;
259+
}
260+
}

‎test/Directory.Build.props

+1-3
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33-
<PackageReference Include="AssemblyMetadata.Generators" Version="2.0.0" PrivateAssets="All" />
34-
<PackageReference Include="Bogus" Version="35.6.0" />
33+
<PackageReference Include="Bogus" Version="35.6.1" />
3534
<PackageReference Include="FluentAssertions" Version="6.12.0" />
36-
<PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
3735
<PackageReference Include="XUnit.Hosting" Version="1.7.1" />
3836
</ItemGroup>
3937

‎test/FluentCommand.Entities/StatusRecord.cs

+14
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,17 @@ public record StatusRecord(
1919
[DataFieldConverter(typeof(ConcurrencyTokenHandler))]
2020
ConcurrencyToken RowVersion
2121
);
22+
23+
public record StatusRecordList(
24+
int Id,
25+
string Name,
26+
string Description,
27+
int DisplayOrder,
28+
bool IsActive,
29+
DateTimeOffset Created,
30+
string CreatedBy,
31+
DateTimeOffset Updated,
32+
string UpdatedBy,
33+
ConcurrencyToken RowVersion,
34+
List<string> Versions
35+
);

‎test/FluentCommand.Generators.Tests/FluentCommand.Generators.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
</PackageReference>
2121
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
2222
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
24-
<PackageReference Include="Verify.Xunit" Version="26.1.6" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
24+
<PackageReference Include="Verify.Xunit" Version="26.4.0" />
2525
<PackageReference Include="xunit" Version="2.9.0" />
2626
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎test/FluentCommand.Performance/FluentCommand.Performance.csproj

-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,4 @@
2626
<ProjectReference Include="..\FluentCommand.Entities\FluentCommand.Entities.csproj" />
2727
</ItemGroup>
2828

29-
<ItemGroup>
30-
<PackageReference Update="XUnit.Hosting" Version="1.7.1" />
31-
</ItemGroup>
32-
3329
</Project>

‎test/FluentCommand.PostgreSQL.Tests/FluentCommand.PostgreSQL.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
3131
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
3232
<PackageReference Include="Npgsql" Version="8.0.3" />
33-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
34-
<PackageReference Include="Testcontainers.Postgresql" Version="3.9.0" />
33+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
34+
<PackageReference Include="Testcontainers.Postgresql" Version="3.10.0" />
3535
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
3636
<PrivateAssets>all</PrivateAssets>
3737
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎test/FluentCommand.SQLite.Tests/FluentCommand.SQLite.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.8" />
3131
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
3232
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
33-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
33+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
3434
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎test/FluentCommand.SqlServer.Tests/FluentCommand.SqlServer.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
3535
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.8" />
3636
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
38-
<PackageReference Include="Testcontainers.Azurite" Version="3.9.0" />
39-
<PackageReference Include="Testcontainers.MsSql" Version="3.9.0" />
40-
<PackageReference Include="Testcontainers.Redis" Version="3.9.0" />
41-
<PackageReference Include="Verify.Xunit" Version="26.1.6" />
37+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
38+
<PackageReference Include="Testcontainers.Azurite" Version="3.10.0" />
39+
<PackageReference Include="Testcontainers.MsSql" Version="3.10.0" />
40+
<PackageReference Include="Testcontainers.Redis" Version="3.10.0" />
41+
<PackageReference Include="Verify.Xunit" Version="26.4.0" />
4242
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
4343
<PrivateAssets>all</PrivateAssets>
4444
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎test/FluentCommand.Tests/FluentCommand.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
</PackageReference>
2020
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
2121
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
23-
<PackageReference Include="Verify.Xunit" Version="26.1.6" />
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
23+
<PackageReference Include="Verify.Xunit" Version="26.4.0" />
2424
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

0 commit comments

Comments
 (0)