Skip to content

Commit d534e03

Browse files
atifazizatifaziz
committed
Update .NET SDK to 10.0.100, including dependencies
1 parent 3be1f56 commit d534e03

File tree

10 files changed

+97
-282
lines changed

10 files changed

+97
-282
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"version": "latest"
2828
},
2929
"ghcr.io/devcontainers/features/dotnet:2": {
30-
"version": "9.0.300",
31-
"dotnetRuntimeVersions": "8.0.14"
30+
"version": "10.0.100",
31+
"dotnetRuntimeVersions": "8.0.14, 9.0.11"
3232
},
3333
"ghcr.io/devcontainers/features/common-utils:2": {
3434
"installZsh": false,

‎MoreLinq.Test.Aot/MoreLinq.Test.Aot.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
55
<OutputType>exe</OutputType>
66
<IsPackable>false</IsPackable>
77
<PublishAot>true</PublishAot>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="MSTest.Engine" Version="1.0.0-alpha.25277.3" />
12-
<PackageReference Include="MSTest.SourceGeneration" Version="1.0.0-alpha.25277.3" />
13-
<PackageReference Include="Microsoft.CodeCoverage.MSBuild" Version="17.14.2" />
14-
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
15-
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.7.1" />
16-
<PackageReference Include="Microsoft.Testing.Platform.MSBuild" Version="1.7.1" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.9.1" />
18-
<PackageReference Include="MSTest.Analyzers" Version="3.9.1">
11+
<PackageReference Include="MSTest.Engine" Version="2.0.0-alpha.25561.4" />
12+
<PackageReference Include="MSTest.SourceGeneration" Version="2.0.0-alpha.25561.4" />
13+
<PackageReference Include="Microsoft.CodeCoverage.MSBuild" Version="18.1.0" />
14+
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
15+
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
16+
<PackageReference Include="Microsoft.Testing.Platform.MSBuild" Version="2.0.2" />
17+
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
18+
<PackageReference Include="MSTest.Analyzers" Version="4.0.2">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
</PackageReference>

‎MoreLinq.Test.Aot/ToDataTableTest.cs‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void ToDataTableNullMemberExpressionMethod()
5656
[UnconditionalSuppressMessage("Aot", "IL2026")]
5757
void Act() => _ = this.testObjects.ToDataTable(expression!);
5858

59-
var e = Assert.ThrowsException<ArgumentException>(Act);
59+
var e = Assert.Throws<ArgumentException>(Act);
6060
Assert.AreEqual("expressions", e.ParamName);
6161
}
6262

@@ -69,7 +69,7 @@ public void ToDataTableTableWithWrongColumnNames()
6969
[UnconditionalSuppressMessage("Aot", "IL2026")]
7070
void Act() => _ = this.testObjects.ToDataTable(dt);
7171

72-
var e = Assert.ThrowsException<ArgumentException>(Act);
72+
var e = Assert.Throws<ArgumentException>(Act);
7373
Assert.AreEqual("table", e.ParamName);
7474
}
7575

@@ -82,7 +82,7 @@ public void ToDataTableTableWithWrongColumnDataType()
8282
[UnconditionalSuppressMessage("Aot", "IL2026")]
8383
void Act() => _ = this.testObjects.ToDataTable(dt, t => t.AString);
8484

85-
var e = Assert.ThrowsException<ArgumentException>(Act);
85+
var e = Assert.Throws<ArgumentException>(Act);
8686
Assert.AreEqual("table", e.ParamName);
8787
}
8888

@@ -91,12 +91,11 @@ void TestDataTableMemberExpression(Expression<Func<TestObject, object?>> express
9191
[UnconditionalSuppressMessage("Aot", "IL2026")]
9292
void Act() => _ = this.testObjects.ToDataTable(expression);
9393

94-
var e = Assert.ThrowsException<ArgumentException>(Act);
94+
var e = Assert.Throws<ArgumentException>(Act);
9595
Assert.AreEqual("expressions", e.ParamName);
9696
var innerException = e.InnerException;
9797
Assert.IsNotNull(innerException);
98-
Assert.IsInstanceOfType<ArgumentException>(innerException);
99-
Assert.AreEqual("lambda", ((ArgumentException)innerException).ParamName);
98+
Assert.AreEqual("lambda", Assert.IsInstanceOfType<ArgumentException>(innerException).ParamName);
10099
}
101100

102101
[TestMethod]
@@ -146,7 +145,7 @@ public void ToDataTableSchemaInDeclarationOrder()
146145
Assert.AreEqual("ANullableDecimal", dt.Columns[1].Caption);
147146
Assert.AreEqual(typeof(decimal), dt.Columns[1].DataType);
148147

149-
Assert.AreEqual(4, dt.Columns.Count);
148+
Assert.HasCount(4, dt.Columns);
150149
}
151150

152151
[TestMethod]
@@ -157,7 +156,7 @@ public void ToDataTableContainsAllElements()
157156

158157
var dt = Act();
159158

160-
Assert.AreEqual(this.testObjects.Length, dt.Rows.Count);
159+
Assert.HasCount(this.testObjects.Length, dt.Rows);
161160
}
162161

163162
[TestMethod]
@@ -171,7 +170,7 @@ public void ToDataTableWithExpression()
171170
Assert.AreEqual("AString", dt.Columns[0].Caption);
172171
Assert.AreEqual(typeof(string), dt.Columns[0].DataType);
173172

174-
Assert.AreEqual(1, dt.Columns.Count);
173+
Assert.HasCount(1, dt.Columns);
175174
}
176175

177176
[TestMethod]
@@ -195,7 +194,7 @@ public void ToDataTableWithSchema()
195194
Act();
196195

197196
var rows = dt.Rows.Cast<DataRow>().ToArray();
198-
Assert.AreEqual(vars.Length, rows.Length);
197+
Assert.HasCount(vars.Length, rows);
199198
CollectionAssert.AreEqual(vars.Select(e => e.Key).ToArray(), rows.Select(r => r["Name"]).ToArray());
200199
CollectionAssert.AreEqual(vars.Select(e => e.Value).ToArray(), rows.Select(r => r["Value"]).ToArray());
201200
}
@@ -218,7 +217,7 @@ public void ToDataTableIgnoresStaticMembers()
218217

219218
var points = Act();
220219

221-
Assert.AreEqual(3, points.Columns.Count);
220+
Assert.HasCount(3, points.Columns);
222221
var x = points.Columns["X"];
223222
var y = points.Columns["Y"];
224223
var empty = points.Columns["IsEmpty"];
@@ -228,7 +227,7 @@ public void ToDataTableIgnoresStaticMembers()
228227
var row = points.Rows.Cast<DataRow>().Single();
229228
Assert.AreEqual(12, row[x]);
230229
Assert.AreEqual(34, row[y]);
231-
Assert.AreEqual(row[empty], false);
230+
Assert.IsFalse(row[empty] as bool?);
232231
}
233232
}
234233
}

0 commit comments

Comments
 (0)