Skip to content

Commit 6d3ce4b

Browse files
louis-zlouis-z
committed
Add net10.0 as target
1 parent 9404c51 commit 6d3ce4b

11 files changed

Lines changed: 5243 additions & 22 deletions

File tree

‎NGitLab.Mock.Tests/GroupsMockTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void Test_get_groups_with_top_level_only_ignores_subgroups()
7373
var groups = client.Groups.GetAsync(new Models.GroupQuery { TopLevelOnly = true });
7474

7575
var expected = new string[] { "user1", "tlg" };
76-
Assert.That(groups.Select(g => g.FullPath), Is.EquivalentTo(expected));
76+
Assert.That(groups.AsEnumerable().Select(g => g.FullPath), Is.EquivalentTo(expected));
7777
}
7878

7979
[Test]
@@ -174,7 +174,7 @@ public void Test_get_subgroups_descendants_by_fullpath()
174174
var group = client.Groups.GetSubgroupsByFullPathAsync("tlg", new Models.SubgroupQuery { IncludeDescendants = true });
175175

176176
var expected = new string[] { "tlg/sg1", "tlg/sg1/sg1_1", "tlg/sg2", "tlg/sg2/sg2_1" };
177-
Assert.That(group.Select(g => g.FullPath), Is.EquivalentTo(expected));
177+
Assert.That(group.AsEnumerable().Select(g => g.FullPath), Is.EquivalentTo(expected));
178178
}
179179

180180
[Test]
@@ -186,7 +186,7 @@ public void Test_get_subgroups_descendants_by_id()
186186
var group = client.Groups.GetSubgroupsByIdAsync(1, new Models.SubgroupQuery { IncludeDescendants = true });
187187

188188
var expected = new string[] { "tlg/sg1", "tlg/sg1/sg1_1", "tlg/sg2", "tlg/sg2/sg2_1" };
189-
Assert.That(group.Select(g => g.FullPath), Is.EquivalentTo(expected));
189+
Assert.That(group.AsEnumerable().Select(g => g.FullPath), Is.EquivalentTo(expected));
190190
}
191191

192192
[Test]
@@ -198,7 +198,7 @@ public void Test_get_subgroups_descendants_of_subgroup_by_fullpath()
198198
var group = client.Groups.GetSubgroupsAsync("tlg/sg2", new Models.SubgroupQuery { IncludeDescendants = true });
199199

200200
var expected = new string[] { "tlg/sg2/sg2_1" };
201-
Assert.That(group.Select(g => g.FullPath), Is.EquivalentTo(expected));
201+
Assert.That(group.AsEnumerable().Select(g => g.FullPath), Is.EquivalentTo(expected));
202202
}
203203

204204
[Test]
@@ -210,7 +210,7 @@ public void Test_get_subgroups_descendants_of_subgroup_by_id()
210210
var group = client.Groups.GetSubgroupsAsync(2, new Models.SubgroupQuery { IncludeDescendants = true });
211211

212212
var expected = new string[] { "tlg/sg1/sg1_1" };
213-
Assert.That(group.Select(g => g.FullPath), Is.EquivalentTo(expected));
213+
Assert.That(group.AsEnumerable().Select(g => g.FullPath), Is.EquivalentTo(expected));
214214
}
215215

216216
[Test]

‎NGitLab.Mock.Tests/MembersMockTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ public async Task Test_members_async_methods_simulate_gitlab_behavior()
118118
// Does NOT search inherited permission by default...
119119
AssertThrowsGitLabException(() => client.Members.GetMemberOfProjectAsync(projectId, user1.Id), System.Net.HttpStatusCode.NotFound);
120120
AssertThrowsGitLabException(() => client.Members.GetMemberOfGroupAsync(groupId, user1.Id), System.Net.HttpStatusCode.NotFound);
121-
Assert.That(client.Members.OfProjectAsync(projectId).Select(m => m.UserName), Is.Empty);
122-
Assert.That(client.Members.OfGroupAsync(groupId).Select(m => m.UserName), Is.EquivalentTo([ownerName]));
121+
Assert.That(client.Members.OfProjectAsync(projectId).AsEnumerable().Select(m => m.UserName), Is.Empty);
122+
Assert.That(client.Members.OfGroupAsync(groupId).AsEnumerable().Select(m => m.UserName), Is.EquivalentTo([ownerName]));
123123

124124
// Does search inherited permission when asked...
125125
Assert.That((await client.Members.GetMemberOfProjectAsync(projectId, user1.Id, includeInheritedMembers: true)).UserName, Is.EqualTo(user1Name));
126126
Assert.That((await client.Members.GetMemberOfGroupAsync(groupId, user1.Id, includeInheritedMembers: true)).UserName, Is.EqualTo(user1Name));
127-
Assert.That(client.Members.OfProjectAsync(projectId, includeInheritedMembers: true).Select(m => m.UserName), Is.EquivalentTo([ownerName, user1Name]));
128-
Assert.That(client.Members.OfGroupAsync(groupId, includeInheritedMembers: true).Select(m => m.UserName), Is.EquivalentTo([ownerName, user1Name]));
127+
Assert.That(client.Members.OfProjectAsync(projectId, includeInheritedMembers: true).AsEnumerable().Select(m => m.UserName), Is.EquivalentTo([ownerName, user1Name]));
128+
Assert.That(client.Members.OfGroupAsync(groupId, includeInheritedMembers: true).AsEnumerable().Select(m => m.UserName), Is.EquivalentTo([ownerName, user1Name]));
129129

130130
// Cannot update non-existent membership...
131131
AssertThrowsGitLabException(() => client.Members.UpdateMemberOfProjectAsync(projectId, new() { UserId = user1Id, AccessLevel = Models.AccessLevel.Owner }), System.Net.HttpStatusCode.NotFound);

‎NGitLab.Mock.Tests/NGitLab.Mock.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net472</TargetFrameworks>
3+
<TargetFrameworks>net472;net10.0</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>

‎NGitLab.Mock.Tests/TagTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void GetTaskAsync_CanSortByName([Values] bool useDefault)
5757
var tags = tagClient.GetAsync(query);
5858

5959
// Assert
60-
Assert.That(tags.Select(t => t.Name), Is.EqualTo(["0.0.1", "0.0.10", "0.0.2", "not-semver"]));
60+
Assert.That(tags.AsEnumerable().Select(t => t.Name), Is.EqualTo(["0.0.1", "0.0.10", "0.0.2", "not-semver"]));
6161
}
6262

6363
[Test]
@@ -86,6 +86,6 @@ public void GetTagAsync_CanSortByVersion()
8686
var tags = tagClient.GetAsync(query);
8787

8888
// Assert
89-
Assert.That(tags.Select(t => t.Name), Is.EqualTo(["not-semver", "0.0.1", "0.0.2", "0.0.10"]));
89+
Assert.That(tags.AsEnumerable().Select(t => t.Name), Is.EqualTo(["not-semver", "0.0.1", "0.0.2", "0.0.10"]));
9090
}
9191
}

‎NGitLab.Mock/NGitLab.Mock.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net472;net6.0;net10.0</TargetFrameworks>
44
<Description>GitLab REST API .NET Client Mock Library</Description>
55
</PropertyGroup>
66
<ItemGroup>
@@ -15,4 +15,4 @@
1515
<PackageReference Include="NeoSmart.AsyncLock" />
1616
<PackageReference Include="YamlDotNet" />
1717
</ItemGroup>
18-
</Project>
18+
</Project>

‎NGitLab.Tests/MembersClientTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,14 @@ public async Task AsyncMethodsBehaveAsExpected()
184184
// Does NOT search inherited permission by default...
185185
AssertThrowsGitLabException(() => client.Members.GetMemberOfProjectAsync(projectId, user1.Id), System.Net.HttpStatusCode.NotFound);
186186
AssertThrowsGitLabException(() => client.Members.GetMemberOfGroupAsync(groupId, user1.Id), System.Net.HttpStatusCode.NotFound);
187-
Assert.That(client.Members.OfProjectAsync(projectId).Select(m => m.UserName), Is.Empty);
188-
Assert.That(client.Members.OfGroupAsync(groupId).Select(m => m.UserName), Is.EquivalentTo(new[] { ownerName }));
187+
Assert.That(client.Members.OfProjectAsync(projectId).AsEnumerable().Select(m => m.UserName), Is.Empty);
188+
Assert.That(client.Members.OfGroupAsync(groupId).AsEnumerable().Select(m => m.UserName), Is.EquivalentTo(new[] { ownerName }));
189189

190190
// Does search inherited permission when asked...
191191
await client.Members.GetMemberOfProjectAsync(projectId, user1.Id, includeInheritedMembers: true);
192192
await client.Members.GetMemberOfGroupAsync(groupId, user1.Id, includeInheritedMembers: true);
193-
Assert.That(client.Members.OfProjectAsync(projectId, includeInheritedMembers: true).Select(m => m.UserName), Is.EquivalentTo(new[] { ownerName, user1Name }));
194-
Assert.That(client.Members.OfGroupAsync(groupId, includeInheritedMembers: true).Select(m => m.UserName), Is.EquivalentTo(new[] { ownerName, user1Name }));
193+
Assert.That(client.Members.OfProjectAsync(projectId, includeInheritedMembers: true).AsEnumerable().Select(m => m.UserName), Is.EquivalentTo(new[] { ownerName, user1Name }));
194+
Assert.That(client.Members.OfGroupAsync(groupId, includeInheritedMembers: true).AsEnumerable().Select(m => m.UserName), Is.EquivalentTo(new[] { ownerName, user1Name }));
195195

196196
// Cannot update non-existent membership...
197197
AssertThrowsGitLabException(() => client.Members.UpdateMemberOfProjectAsync(projectId, new() { UserId = user1Id, AccessLevel = AccessLevel.Owner }), System.Net.HttpStatusCode.NotFound);

‎NGitLab.Tests/NGitLab.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>

‎NGitLab/NGitLab.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;netstandard2.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net472;netstandard2.0;net8.0;net10.0</TargetFrameworks>
44
<!-- Keep "WebRequest is obsolete" as a warning -->
55
<WarningsNotAsErrors>$(WarningsNotAsErrors);SYSLIB0014</WarningsNotAsErrors>
66
</PropertyGroup>
@@ -12,7 +12,7 @@
1212
</PackageReference>
1313
</ItemGroup>
1414

15-
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
15+
<ItemGroup Condition="'$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'netstandard2.0'">
1616
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
1717
<PackageReference Include="PolySharp">
1818
<PrivateAssets>all</PrivateAssets>

‎NGitLab/PublicAPI/net10.0/PublicAPI.Shipped.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+


0 commit comments

Comments
 (0)