Skip to content

Commit fa6c811

Browse files
mpreyskurantovmpreyskurantov
authored
.NET 10 Preview 7 (#668)
1 parent 024c596 commit fa6c811

File tree

8 files changed

+58
-65
lines changed

8 files changed

+58
-65
lines changed

‎net/DevExtreme.AspNet.Data.Tests.EFCore10/DevExtreme.AspNet.Data.Tests.EFCore10.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9+
<PackageReference Include="Azure.Identity" />
910
<PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="10.0.0-preview.5.25277.114" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="10.0.0-preview.7.25380.108" />
12+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
1113
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1214
<PackageReference Include="xunit" />
1315
<PackageReference Include="xunit.runner.visualstudio" />

‎net/DevExtreme.AspNet.Data.Tests.EFCore8/DevExtreme.AspNet.Data.Tests.EFCore8.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
<PackageReference Include="Azure.Identity" />
1010
<PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" />
1111
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
12-
<PackageReference Include="Microsoft.Identity.Client" />
12+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" />
14-
<PackageReference Include="System.Formats.Asn1" />
1514
<PackageReference Include="xunit" />
1615
<PackageReference Include="xunit.runner.visualstudio" />
1716
</ItemGroup>

‎net/DevExtreme.AspNet.Data.Tests.EFCore9/DevExtreme.AspNet.Data.Tests.EFCore9.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9+
<PackageReference Include="Azure.Identity" />
910
<PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="9.0.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="9.0.8" />
12+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
1113
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1214
<PackageReference Include="xunit" />
1315
<PackageReference Include="xunit.runner.visualstudio" />

‎net/DevExtreme.AspNet.Data.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C1FF285C-8342-4DCD-8EAF-01D91D1641E2}"
77
ProjectSection(SolutionItems) = preProject
88
..\bower.json = ..\bower.json
9+
Directory.Packages.props = Directory.Packages.props
910
..\js\dx.aspnet.data.js = ..\js\dx.aspnet.data.js
1011
..\js-test\test.js = ..\js-test\test.js
1112
EndProjectSection

‎net/Directory.Packages.md‎

Lines changed: 43 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22

33
## Summary
44

5+
[.NET 10.0](#net-100-projects)
6+
7+
- tfm: `net10.0`: [Assemblies: 2, Package References: 9 (override version 1)](#net-100-dependencies)
8+
59
[.NET 8.0](#net-80-projects)
610

7-
- tfm: `net8.0`: [Assemblies: 7, Package References: 20, References: 1](#net-80-dependencies)
11+
- tfm: `net8.0`: [Assemblies: 6, Package References: 16, References: 1](#net-80-dependencies)
812

913
[.NET 9.0](#net-90-projects)
1014

11-
- tfm: `net9.0`: [Assemblies: 1, Package References: 5 (override version 1)](#net-90-dependencies)
15+
- tfm: `net9.0`: [Assemblies: 1, Package References: 7 (override version 1)](#net-90-dependencies)
1216

1317
[.NET Framework 4.6.2](#net-framework-462-projects)
1418

@@ -18,14 +22,26 @@
1822

1923
- tfm: `net472`: [Assemblies: 3, Package References: 7, References: 4](#net-framework-472-dependencies)
2024

21-
[net10.0](#net100-projects)
22-
23-
- tfm: ``: [Assemblies: 1, Package References: 5 (override version 1)](#net100-dependencies)
24-
2525
[Expected Directory.Packages.props file](expected-directorypackagesprops-file)
2626

2727
## Package References (by Target Framework)
2828

29+
### .NET 10.0 Dependencies
30+
31+
TFM: `net10.0`
32+
33+
- `Azure.Identity`
34+
- `LinqKit.Microsoft.EntityFrameworkCore`
35+
- `Microsoft.EntityFrameworkCore.SqlServer`
36+
- `Microsoft.IdentityModel.Protocols.OpenIdConnect`
37+
- `Microsoft.NET.Test.Sdk`
38+
- `Microsoft.Web.LibraryManager.Build`
39+
- `Newtonsoft.Json`[Deprecated ->](#newtonsoftjson-tfmnet100)
40+
- `xunit`
41+
- `xunit.runner.visualstudio`
42+
---
43+
- `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`10.0.0-preview.7.25380.108`[->](#microsoftentityframeworkcoresqlserver-versionoverride1000-preview725380108)
44+
2945
### .NET 8.0 Dependencies
3046

3147
TFM: `net8.0`
@@ -34,14 +50,10 @@ TFM: `net8.0`
3450
- `DevExpress.Xpo`
3551
- `FluentNHibernate`
3652
- `LinqKit.Microsoft.EntityFrameworkCore`
37-
- `Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation`
3853
- `Microsoft.EntityFrameworkCore.SqlServer`
39-
- `Microsoft.Identity.Client`
54+
- `Microsoft.IdentityModel.Protocols.OpenIdConnect`
4055
- `Microsoft.NET.Test.Sdk`
41-
- `Microsoft.Web.LibraryManager.Build`
42-
- `Newtonsoft.Json`[Deprecated ->](#newtonsoftjson-tfmnet80)
4356
- `System.Data.SqlClient`
44-
- `System.Formats.Asn1`
4557
- `System.Linq.Dynamic.Core`
4658
- `System.Net.Http`
4759
- `System.Text.Json`
@@ -55,13 +67,15 @@ TFM: `net8.0`
5567

5668
TFM: `net9.0`
5769

70+
- `Azure.Identity`
5871
- `LinqKit.Microsoft.EntityFrameworkCore`
5972
- `Microsoft.EntityFrameworkCore.SqlServer`
73+
- `Microsoft.IdentityModel.Protocols.OpenIdConnect`
6074
- `Microsoft.NET.Test.Sdk`
6175
- `xunit`
6276
- `xunit.runner.visualstudio`
6377
---
64-
- `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`9.0.0`[->](#microsoftentityframeworkcoresqlserver-versionoverride900)
78+
- `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`9.0.8`[->](#microsoftentityframeworkcoresqlserver-versionoverride908)
6579

6680
### .NET Framework 4.6.2 Dependencies
6781

@@ -84,19 +98,14 @@ TFM: `net472`
8498
- `xunit`
8599
- `xunit.runner.visualstudio`
86100

87-
### net10.0 Dependencies
101+
## Projects (by Target Framework)
88102

89-
TFM: ``
103+
### .NET 10.0 Projects
90104

91-
- `LinqKit.Microsoft.EntityFrameworkCore`
92-
- `Microsoft.EntityFrameworkCore.SqlServer`
93-
- `Microsoft.NET.Test.Sdk`
94-
- `xunit`
95-
- `xunit.runner.visualstudio`
96-
---
97-
- `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`10.0.0-preview.5.25277.114`[->](#microsoftentityframeworkcoresqlserver-versionoverride1000-preview525277114)
105+
TFM: `net10.0`
98106

99-
## Projects (by Target Framework)
107+
- DevExtreme.AspNet.Data.Tests.EFCore10 (`\DevExtreme.AspNet.Data.Tests.EFCore10\DevExtreme.AspNet.Data.Tests.EFCore10.csproj`)
108+
- Sample (`\Sample\Sample.csproj`)
100109

101110
### .NET 8.0 Projects
102111

@@ -108,7 +117,6 @@ TFM: `net8.0`
108117
- DevExtreme.AspNet.Data.Tests.EFCore8 (`\DevExtreme.AspNet.Data.Tests.EFCore8\DevExtreme.AspNet.Data.Tests.EFCore8.csproj`)
109118
- DevExtreme.AspNet.Data.Tests.NH (`\DevExtreme.AspNet.Data.Tests.NH\DevExtreme.AspNet.Data.Tests.NH.csproj`)
110119
- DevExtreme.AspNet.Data.Tests.Xpo (`\DevExtreme.AspNet.Data.Tests.Xpo\DevExtreme.AspNet.Data.Tests.Xpo.csproj`)
111-
- Sample (`\Sample\Sample.csproj`)
112120

113121
### .NET 9.0 Projects
114122

@@ -131,29 +139,24 @@ TFM: `net472`
131139
- DevExtreme.AspNet.Data.Tests.EF6 (`\DevExtreme.AspNet.Data.Tests.EF6\DevExtreme.AspNet.Data.Tests.EF6.csproj`)
132140
- DevExtreme.AspNet.Data.Tests.L2S (`\DevExtreme.AspNet.Data.Tests.L2S\DevExtreme.AspNet.Data.Tests.L2S.csproj`)
133141

134-
### net10.0 Projects
135-
136-
TFM: ``
142+
## Projects with exact Versions or VersionOverrides
137143

138-
- DevExtreme.AspNet.Data.Tests.EFCore10 (`\DevExtreme.AspNet.Data.Tests.EFCore10\DevExtreme.AspNet.Data.Tests.EFCore10.csproj`)
144+
### TFM: `net10.0`
139145

140-
## Projects with exact Versions or VersionOverrides
146+
#### `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`10.0.0-preview.7.25380.108`
147+
- `\DevExtreme.AspNet.Data.Tests.EFCore10\DevExtreme.AspNet.Data.Tests.EFCore10.csproj`
148+
- `\Sample\Sample.csproj`
141149

142150
### TFM: `net9.0`
143151

144-
#### `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`9.0.0`
152+
#### `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`9.0.8`
145153
- `\DevExtreme.AspNet.Data.Tests.EFCore9\DevExtreme.AspNet.Data.Tests.EFCore9.csproj`
146154

147-
### TFM: ``
148-
149-
#### `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`10.0.0-preview.5.25277.114`
150-
- `\DevExtreme.AspNet.Data.Tests.EFCore10\DevExtreme.AspNet.Data.Tests.EFCore10.csproj`
151-
152155
## Projects with deprecated packages
153156

154-
### TFM: `net8.0`
157+
### TFM: `net10.0`
155158

156-
#### Newtonsoft.Json tfm=`net8.0`
159+
#### Newtonsoft.Json tfm=`net10.0`
157160
- `\Sample\Sample.csproj`
158161

159162
### TFM: `net472`
@@ -181,17 +184,15 @@ TFM: ``
181184
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
182185
</ItemGroup>
183186
<!-- .NET PackageReferences -->
184-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
185-
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
187+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
188+
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
186189
<PackageVersion Include="DevExpress.Xpo" Version="25.1.3" />
187190
<PackageVersion Include="FluentNHibernate" Version="3.4.0" />
188191
<PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="6.1.3" />
189-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.11" />
190-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
191-
<PackageVersion Include="Microsoft.Identity.Client" Version="4.61.3" />
192+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.19" />
193+
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.2" />
192194
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
193195
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
194-
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
195196
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
196197
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
197198
</ItemGroup>
@@ -200,12 +201,6 @@ TFM: ``
200201
<PackageVersion Include="EntityFramework" Version="6.5.1" />
201202
<PackageVersion Include="LinqKit.EntityFramework" Version="1.2.3" />
202203
</ItemGroup>
203-
<!-- (Unknown) PackageReferences -->
204-
<ItemGroup Condition="'$(TargetFramework)' == ''">
205-
<PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="6.1.3" />
206-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
207-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
208-
</ItemGroup>
209204
</Project>
210205

211206
```

‎net/Directory.Packages.props‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@
44
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
7+
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
88
<PackageVersion Include="DevExpress.Xpo" Version="25.1.3" />
99
<PackageVersion Include="EntityFramework" Version="6.5.1" />
1010
<PackageVersion Include="FluentNHibernate" Version="3.4.0" />
1111
<PackageVersion Include="LinqKit.EntityFramework" Version="1.2.3" />
1212
<PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="6.1.3" />
13-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.11" />
14-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
15-
<PackageVersion Include="Microsoft.Identity.Client" Version="4.61.3" />
13+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.19" />
14+
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.2" />
1615
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
1716
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
1817
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
1918
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
20-
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
2119
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.6.0" />
2220
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
2321
<PackageVersion Include="System.Text.Json" Version="8.0.5" />

‎net/Sample/Program.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ namespace Sample {
55
public class Program {
66
public static void Main(string[] args) {
77
var builder = WebApplication.CreateBuilder(args);
8-
builder.Services
9-
.AddControllersWithViews()
10-
.AddRazorRuntimeCompilation();
8+
builder.Services.AddControllersWithViews();
119
builder.Services
1210
.AddLogging()
1311
.AddEntityFrameworkSqlServer()

‎net/Sample/Sample.csproj‎

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

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

88
<ItemGroup>
99
<ProjectReference Include="..\DevExtreme.AspNet.Data\DevExtreme.AspNet.Data.csproj" />
1010
<PackageReference Include="Azure.Identity" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
13-
<PackageReference Include="Microsoft.Identity.Client" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="10.0.0-preview.7.25380.108" />
12+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
1413
<PackageReference Include="Microsoft.Web.LibraryManager.Build" />
1514
<PackageReference Include="Newtonsoft.Json" />
16-
<PackageReference Include="System.Formats.Asn1" />
1715
</ItemGroup>
1816

1917
<Target Name="Clean dx-aspnet-data-js" BeforeTargets="LibraryManagerRestore">

0 commit comments

Comments
 (0)