Skip to content

Commit 9d256aa

Browse files
kzukzu
committed
Bump template package dependencies
1 parent 358a84e commit 9d256aa

File tree

5 files changed

+45
-63
lines changed

5 files changed

+45
-63
lines changed

‎src/StructId.FunctionalTests/StructId.FunctionalTests.csproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Dapper" Version="2.1.35" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.11" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
11+
<PackageReference Include="Dapper" Version="2.1.72" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.5" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.5" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.5" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
16-
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
17-
<PackageReference Include="Ulid" Version="1.3.4" />
16+
<PackageReference Include="Ulid" Version="1.4.1" />
1817
<PackageReference Include="xunit" Version="2.9.3" />
1918
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
20-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
19+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
2120
</ItemGroup>
2221

2322
<ItemGroup>

‎src/StructId.Tests/DapperGeneratorTests.cs‎

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
using System.Text;
2-
using Microsoft.CodeAnalysis;
3-
using Microsoft.CodeAnalysis.CSharp.Syntax;
42
using Microsoft.CodeAnalysis.CSharp.Testing;
53
using Microsoft.CodeAnalysis.Testing;
64

@@ -13,13 +11,6 @@ public async Task GenerateHandler()
1311
{
1412
var test = new StructIdGeneratorTest<DapperGenerator>("UserId", "int")
1513
{
16-
SolutionTransforms =
17-
{
18-
(solution, projectId) => solution
19-
.GetProject(projectId)?
20-
.AddMetadataReference(MetadataReference.CreateFromFile(typeof(Dapper.DbString).Assembly.ManifestModule.FullyQualifiedName))
21-
.Solution ?? solution
22-
},
2314
TestState =
2415
{
2516
Sources =
@@ -37,7 +28,8 @@ public async Task GenerateHandler()
3728
Encoding.UTF8)
3829
},
3930
},
40-
}.WithAnalyzerDefaults();
31+
}.WithAnalyzerDefaults()
32+
.WithReferencePackages(new PackageIdentity("Dapper", "2.1.35"));
4133

4234
await test.RunAsync();
4335
}
@@ -47,13 +39,6 @@ public async Task GenerateStringHandler()
4739
{
4840
var test = new StructIdGeneratorTest<DapperGenerator>("UserId", "string")
4941
{
50-
SolutionTransforms =
51-
{
52-
(solution, projectId) => solution
53-
.GetProject(projectId)?
54-
.AddMetadataReference(MetadataReference.CreateFromFile(typeof(Dapper.DbString).Assembly.ManifestModule.FullyQualifiedName))
55-
.Solution ?? solution
56-
},
5742
TestState =
5843
{
5944
Sources =
@@ -71,7 +56,8 @@ public async Task GenerateStringHandler()
7156
Encoding.UTF8)
7257
},
7358
},
74-
}.WithAnalyzerDefaults();
59+
}.WithAnalyzerDefaults()
60+
.WithReferencePackages(new PackageIdentity("Dapper", "2.1.35"));
7561

7662
await test.RunAsync();
7763
}
@@ -83,14 +69,6 @@ public async Task GenerateCustomHandler()
8369

8470
var test = new StructIdGeneratorTest<DapperGenerator>("UserId", "System.Ulid")
8571
{
86-
SolutionTransforms =
87-
{
88-
(solution, projectId) => solution
89-
.GetProject(projectId)?
90-
.AddMetadataReference(MetadataReference.CreateFromFile(typeof(Dapper.DbString).Assembly.Location))
91-
.AddMetadataReference(MetadataReference.CreateFromFile(typeof(Ulid).Assembly.Location))
92-
.Solution ?? solution
93-
},
9472
TestState =
9573
{
9674
Sources =
@@ -127,7 +105,10 @@ public override void SetValue(IDbDataParameter parameter, Ulid value)
127105
(typeof(DapperGenerator), "DapperExtensions.cs", code, Encoding.UTF8)
128106
},
129107
},
130-
}.WithAnalyzerDefaults();
108+
}.WithAnalyzerDefaults()
109+
.WithReferencePackages(
110+
new PackageIdentity("Dapper", "2.1.35"),
111+
new PackageIdentity("Ulid", "1.3.4"));
131112

132113
await test.RunAsync();
133114
}
@@ -151,14 +132,6 @@ public override void SetValue(IDbDataParameter parameter, System.Ulid value)
151132

152133
var test = new StructIdGeneratorTest<DapperGenerator>("UserId", "System.Ulid")
153134
{
154-
SolutionTransforms =
155-
{
156-
(solution, projectId) => solution
157-
.GetProject(projectId)?
158-
.AddMetadataReference(MetadataReference.CreateFromFile(typeof(Dapper.DbString).Assembly.Location))
159-
.AddMetadataReference(MetadataReference.CreateFromFile(typeof(Ulid).Assembly.Location))
160-
.Solution ?? solution
161-
},
162135
TestState =
163136
{
164137
Sources =
@@ -176,7 +149,10 @@ public override void SetValue(IDbDataParameter parameter, System.Ulid value)
176149
(typeof(DapperGenerator), "DapperExtensions.cs", code, Encoding.UTF8)
177150
},
178151
},
179-
}.WithAnalyzerDefaults();
152+
}.WithAnalyzerDefaults()
153+
.WithReferencePackages(
154+
new PackageIdentity("Dapper", "2.1.35"),
155+
new PackageIdentity("Ulid", "1.3.4"));
180156

181157
await test.RunAsync();
182158
}
@@ -187,13 +163,6 @@ public async Task SkipsUnsupported()
187163
var test = new CSharpSourceGeneratorTest<DapperGenerator, DefaultVerifier>
188164
{
189165
ReferenceAssemblies = ReferenceAssemblies.Net.Net80,
190-
SolutionTransforms =
191-
{
192-
(solution, projectId) => solution
193-
.GetProject(projectId)?
194-
.AddMetadataReference(MetadataReference.CreateFromFile(typeof(Dapper.DbString).Assembly.ManifestModule.FullyQualifiedName))
195-
.Solution ?? solution
196-
},
197166
TestState =
198167
{
199168
Sources =
@@ -208,7 +177,8 @@ public readonly partial record struct UserId(uint Value) : IStructId<uint>, INew
208177
""",
209178
},
210179
},
211-
}.WithAnalyzerDefaults();
180+
}.WithAnalyzerDefaults()
181+
.WithReferencePackages(new PackageIdentity("Dapper", "2.1.35"));
212182

213183
await test.RunAsync();
214184
}

‎src/StructId.Tests/StructId.Tests.csproj‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
11-
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
1211
<PackageReference Include="xunit" Version="2.9.3" />
1312
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
14-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
15-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
16-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
17-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
18-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
19-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" Version="1.1.2" />
13+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
14+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0" />
15+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.3" />
16+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.3" />
17+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.3" />
18+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" Version="1.1.3" />
2019
<PackageReference Include="ThisAssembly.Resources" Version="2.1.2" PrivateAssets="all" />
21-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
20+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
2221
<PackageReference Include="Dapper" Version="2.1.72" />
23-
<PackageReference Include="Ulid" Version="1.3.4" />
22+
<PackageReference Include="Ulid" Version="1.4.1" />
2423
</ItemGroup>
2524

2625
<ItemGroup>
@@ -50,4 +49,4 @@
5049
</Target>
5150

5251

53-
</Project>
52+
</Project>

‎src/StructId.Tests/StructIdExtensions.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Collections.Immutable;
34
using System.Linq;
45
using System.Text;
56
using System.Text.RegularExpressions;
@@ -49,6 +50,18 @@ public static TTest WithAnalyzerDefaults<TTest>(this TTest test) where TTest : A
4950
return test;
5051
}
5152

53+
public static TTest WithReferencePackages<TTest>(this TTest test, params PackageIdentity[] packages)
54+
where TTest : AnalyzerTest<DefaultVerifier>
55+
{
56+
if (packages.Length == 0)
57+
return test;
58+
59+
test.ReferenceAssemblies = (test.ReferenceAssemblies ?? ReferenceAssemblies.Default)
60+
.AddPackages(packages.ToImmutableArray());
61+
62+
return test;
63+
}
64+
5265
static void AddSourceIfNotExists(SourceFileList sources, string filename, string content)
5366
{
5467
if (!sources.Any(s => s.filename == filename))

‎src/StructId/StructId.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
55
<ImplicitUsings>disable</ImplicitUsings>
66
</PropertyGroup>
77

88
<ItemGroup Condition="!$(CI)">
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.25" Condition="'$(TargetFramework)' == 'net8.0'" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.5" Condition="'$(TargetFramework)' == 'net10.0'" />
1011
<PackageReference Include="Dapper" Version="2.1.72" />
1112
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1213
<PackageReference Include="Ulid" Version="1.3.4" />

0 commit comments

Comments
 (0)