Skip to content
Open
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Then browse to `http://localhost:5000/odata/Products` (port may vary) to inspect
## Github Repository

This is the official ASP.NET Core OData repository.
[ASP.NET Core OData](https://www.nuget.org/packages/Microsoft.AspNetCore.OData/8.0.0) is a server side library built upon ODataLib and ASP.NET Core.
[ASP.NET Core OData](https://www.nuget.org/packages/Microsoft.AspNetCore.OData/10.0.0) is a server side library built upon ODataLib and ASP.NET Core.

**Blogs**:

Expand Down
2 changes: 1 addition & 1 deletion docs/odatamiddelware.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ASP.NET Core OData Middleware

Middleware is component that can be assembled into an app pipeline to handle requests and responses.
ASP.NET Core OData 8.x has the following middlewares:
ASP.NET Core OData 10.x has the following middlewares:

* [ODataBatchMiddleware](https://github.com/OData/AspNetCoreOData/blob/master/src/Microsoft.AspNetCore.OData/Batch/ODataBatchMiddleware.cs)

Expand Down
8 changes: 4 additions & 4 deletions pipelines/azure_pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ trigger:
branches:
include:
- main
- dev-9.x
- dev-10.x

pr:
- main
- dev-9.x
- dev-10.x

resources:
repositories:
Expand Down Expand Up @@ -53,9 +53,9 @@ extends:
versionSpec: '>=5.2.0'
checkLatest: true
- task: UseDotNet@2
displayName: Use .NET Core sdk 8.x
displayName: Use .NET Core sdk 10.x
inputs:
version: 8.x
version: 10.x
includePreviewVersions: true
- task: PowerShell@2
displayName: Validate OData Package Versions
Expand Down
6 changes: 3 additions & 3 deletions pipelines/azure_pipelines_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ schedules:
branches:
include:
- main
- dev-9.x
- dev-10.x
resources:
repositories:
- repository: self
Expand Down Expand Up @@ -70,9 +70,9 @@ extends:
versionSpec: '>=5.2.0'
checkLatest: true
- task: UseDotNet@2
displayName: Use .NET Core SDK 8.x
displayName: Use .NET Core SDK 10.x
inputs:
version: 8.x
version: 10.x
includePreviewVersions: true
- task: DotNetCoreCLI@2
displayName: Build Microsoft.AspNetCore.OData
Expand Down
17 changes: 6 additions & 11 deletions sample/BenchmarkServer/BenchmarkServer.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

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

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.13.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="Azure.Identity" Version="1.14.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

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

Expand Down
2 changes: 1 addition & 1 deletion sample/ODataAlternateKeySample/readme.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ODataAlternateKeySample
-------------------------

This sample illustrates how to use the Alternate key in ASP.NET Core OData 8.x.
This sample illustrates how to use the Alternate key in ASP.NET Core OData 10.x.

Alternate key is an 'alternate' key compared to the declared key.

Expand Down
2 changes: 1 addition & 1 deletion sample/ODataCustomizedSample/ODataCustomizedSample.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

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

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion sample/ODataCustomizedSample/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
app.UseSwagger();
app.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", "OData 8.x OpenAPI");
c.SwaggerEndpoint("/swagger/v1/swagger.json", "OData 10.x OpenAPI");
});

app.UseRouting();
Expand Down
4 changes: 2 additions & 2 deletions sample/ODataCustomizedSample/readme.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# A customized routing Sample

---
This is an ASP.NET Core OData 8.x customized routing sample project.
This is an ASP.NET Core OData 10.x customized routing sample project.

## Static Routing table

If you run the sample and send the following request in a Web brower:
If you run the sample and send the following request in a Web browser:

`~/$odata`, you will get the routing table

Expand Down
2 changes: 1 addition & 1 deletion sample/ODataDynamicModel/ODataDynamicModel.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

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

<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions sample/ODataMiniApi/ODataMiniApi.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

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

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions sample/ODataMiniApi/readme.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ASP.NET Core OData (8.x) Minimal API Sample
# ASP.NET Core OData (10.x) Minimal API Sample

---
This is an ASP.NET Core OData 8.x minimal API project.
This is an ASP.NET Core OData 10.x minimal API project.

Minimal APIs are a simplified approach for building fast HTTP APIs with ASP.NET Core. You can build fully functioning REST endpoints with minimal code and configuration. Skip traditional scaffolding and avoid unnecessary controllers by fluently declaring API routes and actions.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

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

<ItemGroup>
Expand Down
11 changes: 5 additions & 6 deletions sample/ODataRoutingSample/ODataRoutingSample.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<!--<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>-->
<!--<AssemblyOriginatorKeyFile>..\..\build\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>-->
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.6" />
<PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.OData.Edm" Version="9.0.0-preview.2" />
<PackageReference Include="Microsoft.OpenApi.OData" Version="1.6.9" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion sample/ODataRoutingSample/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
app.UseSwagger();
app.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", "OData 8.x OpenAPI");
c.SwaggerEndpoint("/swagger/v1/swagger.json", "OData 10.x OpenAPI");
c.SwaggerEndpoint("/$openapi", "OData raw OpenAPI");
});

Expand Down
12 changes: 6 additions & 6 deletions sample/ODataRoutingSample/readme.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# ASP.NET Core OData (8.x) Sample
# ASP.NET Core OData (10.x) Sample

---
This is an ASP.NET Core OData 8.x sample project. From this sample, you can see a lot of ASP.NET Core OData 8.x usage.
This is an ASP.NET Core OData 10.x sample project. From this sample, you can see a lot of ASP.NET Core OData 10.x usage.



## Static Routing table

If you run the sample and send the following request in a Web brower:
If you run the sample and send the following request in a Web browser:

`~/$odata`, you will get the following (similar) routing table:

Expand All @@ -16,15 +16,15 @@ If you run the sample and send the following request in a Web brower:

## OpenAPI/Swagger

If you run the sample and send the following request in a Web brower:
If you run the sample and send the following request in a Web browser:

`/swagger`, you will get the following (similar) swagger page:

![image](../../images/sample_swagger.png)

## Non-Edm model

Non-Edm model means there's no "Edm Model" configed for a route.
Non-Edm model means there's no "Edm Model" configured for a route.
For example: the following routing doesn't have the Edm model associated.

```C#
Expand Down Expand Up @@ -58,7 +58,7 @@ Known issue: It seems there are some issues related to the complex property sele

## Raw OpenAPI/Swagger

If you run the sample and send the following request in a Web brower:
If you run the sample and send the following request in a Web browser:

`/v1/$openapi`, you will get the following (similar) swagger page:

Expand Down
2 changes: 1 addition & 1 deletion sample/ODataSampleCommon/ODataSampleCommon.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<OutputType>Library</OutputType>
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Microsoft.AspNetCore.OData.NewtonsoftJson.Nightly.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
<icon>images\odata.png</icon>
<repository type="git" url="https://github.com/OData/AspNetCoreOData.git" branch="master" />
<dependencies>
<group targetFramework=".net8.0">
<group targetFramework=".net10.0">
<dependency id="Microsoft.AspNetCore.OData" version="$VersionFullSemantic$-Nightly$NightlyBuildVersion$" />
</group>
</dependencies>
</metadata>
<files>
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.NewtonsoftJson.dll" target="lib\net8.0" />
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.NewtonsoftJson.xml" target="lib\net8.0" />
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.NewtonsoftJson.pdb" target="lib\net8.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.NewtonsoftJson.dll" target="lib\net10.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.NewtonsoftJson.xml" target="lib\net10.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.NewtonsoftJson.pdb" target="lib\net10.0" />
<file src="$SourcesRoot$\images\odata.png" target="images\" />
</files>
</package>
8 changes: 4 additions & 4 deletions src/Microsoft.AspNetCore.OData.NewtonsoftJson.Release.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
<icon>images\odata.png</icon>
<repository type="git" url="https://github.com/OData/AspNetCoreOData.git" branch="master" />
<dependencies>
<group targetFramework=".net8.0">
<group targetFramework=".net10.0">
<dependency id="Microsoft.AspNetCore.OData" version="$VersionNuGetSemantic$" />
</group>
</dependencies>
</metadata>
<files>
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.NewtonsoftJson.dll" target="lib\net8.0" />
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.NewtonsoftJson.xml" target="lib\net8.0" />
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.NewtonsoftJson.pdb" target="lib\net8.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.NewtonsoftJson.dll" target="lib\net10.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.NewtonsoftJson.xml" target="lib\net10.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.NewtonsoftJson.pdb" target="lib\net10.0" />
<file src="$SourcesRoot$\images\odata.png" target="images\" />
</files>
</package>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<RootNamespace>Microsoft.AspNetCore.OData.NewtonsoftJson</RootNamespace>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>

Expand Down
12 changes: 6 additions & 6 deletions src/Microsoft.AspNetCore.OData.Nightly.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<package>
<metadata>
<id>Microsoft.AspNetCore.OData</id>
<title>Microsoft ASP.NET Core 8.x for OData v4.0</title>
<title>Microsoft ASP.NET Core 10.x for OData v4.0</title>
<version>$VersionFullSemantic$-Nightly$NightlyBuildVersion$</version>
<authors>Microsoft</authors>
<copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
<description>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC Core 8.x to support OData query syntax for your Web APIs.</description>
<description>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC Core 10.x to support OData query syntax for your Web APIs.</description>
<summary>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core.</summary>
<language>en-US</language>
<projectUrl>http://github.com/OData/AspNetCoreOData</projectUrl>
Expand All @@ -17,7 +17,7 @@
<icon>images\odata.png</icon>
<repository type="git" url="https://github.com/OData/AspNetCoreOData.git" branch="master" />
<dependencies>
<group targetFramework=".net8.0">
<group targetFramework=".net10.0">
<dependency id="Microsoft.OData.ModelBuilder" version="$ODataModelBuilderPackageDependency$" />
<dependency id="Microsoft.OData.Core" version="$ODataLibPackageDependency$" />
<dependency id="Microsoft.OData.Edm" version="$ODataLibPackageDependency$" />
Expand All @@ -26,9 +26,9 @@
</dependencies>
</metadata>
<files>
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.dll" target="lib\net8.0" />
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.xml" target="lib\net8.0" />
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.pdb" target="lib\net8.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.dll" target="lib\net10.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.xml" target="lib\net10.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.pdb" target="lib\net10.0" />
<file src="$SourcesRoot$\images\odata.png" target="images\" />

<!-- readme file -->
Expand Down
12 changes: 6 additions & 6 deletions src/Microsoft.AspNetCore.OData.Release.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<package>
<metadata>
<id>Microsoft.AspNetCore.OData</id>
<title>Microsoft ASP.NET Core 8.x for OData v4.0</title>
<title>Microsoft ASP.NET Core 10.x for OData v4.0</title>
<version>$VersionNuGetSemantic$</version>
<authors>Microsoft</authors>
<copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
<description>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC Core 8.x to support OData query syntax for your Web APIs.</description>
<description>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC Core 10.x to support OData query syntax for your Web APIs.</description>
<summary>This package contains everything you need to create OData v4.0 endpoints using ASP.NET Core MVC.</summary>
<language>en-US</language>
<projectUrl>http://github.com/OData/AspNetCoreOData</projectUrl>
Expand All @@ -17,7 +17,7 @@
<icon>images\odata.png</icon>
<repository type="git" url="https://github.com/OData/AspNetCoreOData.git" branch="master" />
<dependencies>
<group targetFramework=".net8.0">
<group targetFramework=".net10.0">
<dependency id="Microsoft.OData.ModelBuilder" version="$ODataModelBuilderPackageDependency$" />
<dependency id="Microsoft.OData.Core" version="$ODataLibPackageDependency$" />
<dependency id="Microsoft.OData.Edm" version="$ODataLibPackageDependency$" />
Expand All @@ -26,9 +26,9 @@
</dependencies>
</metadata>
<files>
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.dll" target="lib\net8.0" />
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.xml" target="lib\net8.0" />
<file src="$ProductRoot$\net8.0\Microsoft.AspNetCore.OData.pdb" target="lib\net8.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.dll" target="lib\net10.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.xml" target="lib\net10.0" />
<file src="$ProductRoot$\net10.0\Microsoft.AspNetCore.OData.pdb" target="lib\net10.0" />
<file src="$SourcesRoot$\images\odata.png" target="images\" />

<!-- readme file -->
Expand Down
Loading