Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" />
<PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="10.0.0-preview.5.25277.114" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="10.0.0-preview.7.25380.108" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
<PackageReference Include="Azure.Identity" />
<PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
<PackageReference Include="Microsoft.Identity.Client" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="System.Formats.Asn1" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" />
<PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="9.0.8" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
Expand Down
1 change: 1 addition & 0 deletions net/DevExtreme.AspNet.Data.sln
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C1FF285C-8342-4DCD-8EAF-01D91D1641E2}"
ProjectSection(SolutionItems) = preProject
..\bower.json = ..\bower.json
Directory.Packages.props = Directory.Packages.props
..\js\dx.aspnet.data.js = ..\js\dx.aspnet.data.js
..\js-test\test.js = ..\js-test\test.js
EndProjectSection
Expand Down
91 changes: 43 additions & 48 deletions net/Directory.Packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@

## Summary

[.NET 10.0](#net-100-projects)

- tfm: `net10.0`: [Assemblies: 2, Package References: 9 (override version 1)](#net-100-dependencies)

[.NET 8.0](#net-80-projects)

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

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

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

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

Expand All @@ -18,14 +22,26 @@

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

[net10.0](#net100-projects)

- tfm: ``: [Assemblies: 1, Package References: 5 (override version 1)](#net100-dependencies)

[Expected Directory.Packages.props file](expected-directorypackagesprops-file)

## Package References (by Target Framework)

### .NET 10.0 Dependencies

TFM: `net10.0`

- `Azure.Identity`
- `LinqKit.Microsoft.EntityFrameworkCore`
- `Microsoft.EntityFrameworkCore.SqlServer`
- `Microsoft.IdentityModel.Protocols.OpenIdConnect`
- `Microsoft.NET.Test.Sdk`
- `Microsoft.Web.LibraryManager.Build`
- `Newtonsoft.Json`[Deprecated ->](#newtonsoftjson-tfmnet100)
- `xunit`
- `xunit.runner.visualstudio`
---
- `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`10.0.0-preview.7.25380.108`[->](#microsoftentityframeworkcoresqlserver-versionoverride1000-preview725380108)

### .NET 8.0 Dependencies

TFM: `net8.0`
Expand All @@ -34,14 +50,10 @@ TFM: `net8.0`
- `DevExpress.Xpo`
- `FluentNHibernate`
- `LinqKit.Microsoft.EntityFrameworkCore`
- `Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation`
- `Microsoft.EntityFrameworkCore.SqlServer`
- `Microsoft.Identity.Client`
- `Microsoft.IdentityModel.Protocols.OpenIdConnect`
- `Microsoft.NET.Test.Sdk`
- `Microsoft.Web.LibraryManager.Build`
- `Newtonsoft.Json`[Deprecated ->](#newtonsoftjson-tfmnet80)
- `System.Data.SqlClient`
- `System.Formats.Asn1`
- `System.Linq.Dynamic.Core`
- `System.Net.Http`
- `System.Text.Json`
Expand All @@ -55,13 +67,15 @@ TFM: `net8.0`

TFM: `net9.0`

- `Azure.Identity`
- `LinqKit.Microsoft.EntityFrameworkCore`
- `Microsoft.EntityFrameworkCore.SqlServer`
- `Microsoft.IdentityModel.Protocols.OpenIdConnect`
- `Microsoft.NET.Test.Sdk`
- `xunit`
- `xunit.runner.visualstudio`
---
- `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`9.0.0`[->](#microsoftentityframeworkcoresqlserver-versionoverride900)
- `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`9.0.8`[->](#microsoftentityframeworkcoresqlserver-versionoverride908)

### .NET Framework 4.6.2 Dependencies

Expand All @@ -84,19 +98,14 @@ TFM: `net472`
- `xunit`
- `xunit.runner.visualstudio`

### net10.0 Dependencies
## Projects (by Target Framework)

TFM: ``
### .NET 10.0 Projects

- `LinqKit.Microsoft.EntityFrameworkCore`
- `Microsoft.EntityFrameworkCore.SqlServer`
- `Microsoft.NET.Test.Sdk`
- `xunit`
- `xunit.runner.visualstudio`
---
- `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`10.0.0-preview.5.25277.114`[->](#microsoftentityframeworkcoresqlserver-versionoverride1000-preview525277114)
TFM: `net10.0`

## Projects (by Target Framework)
- DevExtreme.AspNet.Data.Tests.EFCore10 (`\DevExtreme.AspNet.Data.Tests.EFCore10\DevExtreme.AspNet.Data.Tests.EFCore10.csproj`)
- Sample (`\Sample\Sample.csproj`)

### .NET 8.0 Projects

Expand All @@ -108,7 +117,6 @@ TFM: `net8.0`
- DevExtreme.AspNet.Data.Tests.EFCore8 (`\DevExtreme.AspNet.Data.Tests.EFCore8\DevExtreme.AspNet.Data.Tests.EFCore8.csproj`)
- DevExtreme.AspNet.Data.Tests.NH (`\DevExtreme.AspNet.Data.Tests.NH\DevExtreme.AspNet.Data.Tests.NH.csproj`)
- DevExtreme.AspNet.Data.Tests.Xpo (`\DevExtreme.AspNet.Data.Tests.Xpo\DevExtreme.AspNet.Data.Tests.Xpo.csproj`)
- Sample (`\Sample\Sample.csproj`)

### .NET 9.0 Projects

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

### net10.0 Projects

TFM: ``
## Projects with exact Versions or VersionOverrides

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

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

### TFM: `net9.0`

#### `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`9.0.0`
#### `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`9.0.8`
- `\DevExtreme.AspNet.Data.Tests.EFCore9\DevExtreme.AspNet.Data.Tests.EFCore9.csproj`

### TFM: ``

#### `Microsoft.EntityFrameworkCore.SqlServer` VersionOverride=`10.0.0-preview.5.25277.114`
- `\DevExtreme.AspNet.Data.Tests.EFCore10\DevExtreme.AspNet.Data.Tests.EFCore10.csproj`

## Projects with deprecated packages

### TFM: `net8.0`
### TFM: `net10.0`

#### Newtonsoft.Json tfm=`net8.0`
#### Newtonsoft.Json tfm=`net10.0`
- `\Sample\Sample.csproj`

### TFM: `net472`
Expand Down Expand Up @@ -181,17 +184,15 @@ TFM: ``
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>
<!-- .NET PackageReferences -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
<PackageVersion Include="DevExpress.Xpo" Version="25.1.3" />
<PackageVersion Include="FluentNHibernate" Version="3.4.0" />
<PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="6.1.3" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.61.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.19" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>
Expand All @@ -200,12 +201,6 @@ TFM: ``
<PackageVersion Include="EntityFramework" Version="6.5.1" />
<PackageVersion Include="LinqKit.EntityFramework" Version="1.2.3" />
</ItemGroup>
<!-- (Unknown) PackageReferences -->
<ItemGroup Condition="'$(TargetFramework)' == ''">
<PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="6.1.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
</ItemGroup>
</Project>

```
8 changes: 3 additions & 5 deletions net/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,18 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
<PackageVersion Include="DevExpress.Xpo" Version="25.1.3" />
<PackageVersion Include="EntityFramework" Version="6.5.1" />
<PackageVersion Include="FluentNHibernate" Version="3.4.0" />
<PackageVersion Include="LinqKit.EntityFramework" Version="1.2.3" />
<PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="6.1.3" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.61.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.19" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.6.0" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
Expand Down
4 changes: 1 addition & 3 deletions net/Sample/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ namespace Sample {
public class Program {
public static void Main(string[] args) {
var builder = WebApplication.CreateBuilder(args);
builder.Services
.AddControllersWithViews()
.AddRazorRuntimeCompilation();
builder.Services.AddControllersWithViews();
builder.Services
.AddLogging()
.AddEntityFrameworkSqlServer()
Expand Down
8 changes: 3 additions & 5 deletions net/Sample/Sample.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\DevExtreme.AspNet.Data\DevExtreme.AspNet.Data.csproj" />
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
<PackageReference Include="Microsoft.Identity.Client" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" VersionOverride="10.0.0-preview.7.25380.108" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
<PackageReference Include="Microsoft.Web.LibraryManager.Build" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Formats.Asn1" />
</ItemGroup>

<Target Name="Clean dx-aspnet-data-js" BeforeTargets="LibraryManagerRestore">
Expand Down
Loading