Skip to content
Draft
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
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.177.0/containers/dotnet/.devcontainer/base.Dockerfile

# [Choice] .NET version: use "latest" or a specific version like "10.0"
ARG VARIANT="10.0"
# [Choice] .NET version: use "latest" or a specific version like "11.0"
ARG VARIANT="11.0"
FROM mcr.microsoft.com/vscode/devcontainers/dotnet
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"remoteEnv": {
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
"DOTNET_MULTILEVEL_LOOKUP": "0",
"TARGET": "net10.0",
"TARGET": "net11.0",
"DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true"
},
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/setup-dotnet@v4
id: installdotnet
with:
dotnet-version: 10.0.x
dotnet-version: 11.0.x

- name: Create temporary global.json
run: echo '{"sdk":{"version":"${{ steps.installdotnet.outputs.dotnet-version }}"}}' > ./global.json
Expand Down
2 changes: 1 addition & 1 deletion build/nuget.props
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</PropertyGroup>

<ItemGroup Label="SourceLink">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.0-*" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="11.0.100-preview.6.26359.118" PrivateAssets="All"/>
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions build/steps-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ steps:
displayName: Install .NET SDK
inputs:
packageType: sdk
version: 10.0.x # https://github.com/dotnet/core/blob/main/release-notes/releases-index.json
includePreviewVersions: true
version: 11.0.x # https://github.com/dotnet/core/blob/main/release-notes/releases-index.json

- script: >
dotnet test
Expand All @@ -29,4 +30,4 @@ steps:
displayName: Publish Code Coverage
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: $(System.DefaultWorkingDirectory)/**/*.cobertura.xml
summaryFileLocation: $(System.DefaultWorkingDirectory)/**/*.cobertura.xml
4 changes: 2 additions & 2 deletions build/test.targets
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup Condition=" '$(IsAspNetCore)' == 'true' ">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(DotNetReleaseBasePackageVersion).*" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="11.0.0-preview.6.26359.118" />
</ItemGroup>

<ItemGroup>
Expand All @@ -22,4 +22,4 @@
<Using Include="Xunit.v3" />
</ItemGroup>

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

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

<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>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>

<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>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>

<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>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<AssemblyTitle>Example API</AssemblyTitle>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<AssemblyTitle>Example API</AssemblyTitle>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

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

<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>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>

<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>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>

<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>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

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

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<AssemblyTitle>Example API</AssemblyTitle>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<AssemblyTitle>Example API</AssemblyTitle>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions examples/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

<ItemGroup Label="ASP.NET Core">
<PackageVersion Include="Microsoft.AspNetCore.OData" Version="10.0.0-preview.2" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.3" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.12.46" />
<PackageVersion Include="Scalar.AspNetCore.Microsoft" Version="2.12.46" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="11.0.0-preview.6.26359.118" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.16.13" />
<PackageVersion Include="Scalar.AspNetCore.Microsoft" Version="2.16.13" />
</ItemGroup>

</Project>
5 changes: 4 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"sdk": {
"version": "11.0.100-preview.6.26359.118"
},
"test": {
"runner": "Microsoft.Testing.Platform"
"runner": "Microsoft.Testing.Platform"
}
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>10.0.0</VersionPrefix>
<AssemblyVersion>10.0.0.0</AssemblyVersion>
<VersionPrefix>11.0.0</VersionPrefix>
<AssemblyVersion>11.0.0.0</AssemblyVersion>
<TargetFrameworks>$(DefaultTargetFramework);netstandard1.0;netstandard2.0</TargetFrameworks>
<AssemblyTitle>API Versioning Abstractions</AssemblyTitle>
<Description>The abstractions library for API versioning.</Description>
<RootNamespace>Asp.Versioning</RootNamespace>
<PackageTags>Asp;AspNet;AspNetCore;Versioning</PackageTags>

<!--
Not directly used by this library so leave it up to consumers to resolve.
Consider removing at a future date.

REF: https://github.com/advisories/GHSA-cmhx-cq75-c4mj
-->
<NoWarn>$(NoWarn);NU1903</NoWarn>
Expand Down Expand Up @@ -59,7 +59,7 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.0' ">
<PackageReference Include="Microsoft.Extensions.Primitives" Version="$(DotNetReleasePackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="11.0.0-preview.6.26359.118" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>10.0.0</VersionPrefix>
<AssemblyVersion>10.0.0.0</AssemblyVersion>
<VersionPrefix>11.0.0</VersionPrefix>
<AssemblyVersion>11.0.0.0</AssemblyVersion>
<TargetFrameworks>net45;net472</TargetFrameworks>
<RootNamespace>Asp.Versioning</RootNamespace>
<AssemblyTitle>ASP.NET Web API Versioning API Explorer for OData v4.0</AssemblyTitle>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>10.0.0</VersionPrefix>
<AssemblyVersion>10.0.0.0</AssemblyVersion>
<VersionPrefix>11.0.0</VersionPrefix>
<AssemblyVersion>11.0.0.0</AssemblyVersion>
<TargetFrameworks>net45;net472</TargetFrameworks>
<RootNamespace>Asp.Versioning</RootNamespace>
<AssemblyTitle>API Versioning for ASP.NET Web API with OData v4.0</AssemblyTitle>
Expand All @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNet.OData" Version="[7.7.9,8.0.0)" />
<PackageReference Include="Microsoft.AspNet.OData" Version="[7.8.0,8.0.0)" />
</ItemGroup>

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

<PropertyGroup>
<VersionPrefix>10.0.0</VersionPrefix>
<AssemblyVersion>10.0.0.0</AssemblyVersion>
<VersionPrefix>11.0.0</VersionPrefix>
<AssemblyVersion>11.0.0.0</AssemblyVersion>
<TargetFrameworks>net45;net472</TargetFrameworks>
<AssemblyTitle>ASP.NET Web API Versioning API Explorer</AssemblyTitle>
<Description>The API Explorer extensions for ASP.NET Web API Versioning.</Description>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>10.0.0</VersionPrefix>
<AssemblyVersion>10.0.0.0</AssemblyVersion>
<VersionPrefix>11.0.0</VersionPrefix>
<AssemblyVersion>11.0.0.0</AssemblyVersion>
<TargetFrameworks>net45;net472</TargetFrameworks>
<AssemblyTitle>ASP.NET Web API Versioning</AssemblyTitle>
<Description>A service API versioning library for Microsoft ASP.NET Web API.</Description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="$(DotNetReleaseBasePackageVersion).*" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="11.0.0-preview.6.26359.118" />
</ItemGroup>

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

<PropertyGroup>
<VersionPrefix>10.0.0</VersionPrefix>
<AssemblyVersion>10.0.0.0</AssemblyVersion>
<VersionPrefix>11.0.0</VersionPrefix>
<AssemblyVersion>11.0.0.0</AssemblyVersion>
<TargetFramework>$(DefaultTargetFramework)</TargetFramework>
<RootNamespace>Asp.Versioning</RootNamespace>
<AssemblyTitle>ASP.NET Core API Versioning API Explorer for OData v4.0</AssemblyTitle>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>10.0.0</VersionPrefix>
<AssemblyVersion>10.0.0.0</AssemblyVersion>
<VersionPrefix>11.0.0</VersionPrefix>
<AssemblyVersion>11.0.0.0</AssemblyVersion>
<TargetFramework>$(DefaultTargetFramework)</TargetFramework>
<RootNamespace>Asp.Versioning</RootNamespace>
<AssemblyTitle>ASP.NET Core API Versioning with OData v4.0</AssemblyTitle>
<Description>A service API versioning library for Microsoft ASP.NET Core with OData v4.0.</Description>
<PackageTags>Asp;AspNet;AspNetCore;Versioning;OData</PackageTags>
<IsTrimmable>true</IsTrimmable>

<!-- TODO: remove when OData net.10 is out of preview -->
<NoWarn>$(NoWarn);NU5104</NoWarn>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public override bool AppliesToAction( ODataControllerActionContext context )
// REF: https://github.com/OData/AspNetCoreOData/blob/main/src/Microsoft.AspNetCore.OData/Routing/Conventions/AttributeRoutingConvention.cs#L238
private static string? FindRelatedODataPrefix( string routeTemplate, string[] prefixes )
{
if ( routeTemplate.StartsWith( '/' ) )
if ( routeTemplate.StartsWith( '/', StringComparison.Ordinal ) )
{
routeTemplate = routeTemplate[1..];
}
Expand Down Expand Up @@ -175,7 +175,7 @@ private static void NormalizeAttributeRouteTemplates( ODataControllerActionConte
// route template pattern.
//
// REF: https://github.com/OData/AspNetCoreOData/blob/main/src/Microsoft.AspNetCore.OData/Routing/Conventions/AttributeRoutingConvention.cs#L181
if ( attributeRoute.Template is string template && template.StartsWith( '/' ) )
if ( attributeRoute.Template is string template && template.StartsWith( '/', StringComparison.Ordinal ) )
{
attributeRoute.Template = template.TrimStart( '/' );
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>10.0.0</VersionPrefix>
<AssemblyVersion>10.0.0.0</AssemblyVersion>
<VersionPrefix>11.0.0</VersionPrefix>
<AssemblyVersion>11.0.0.0</AssemblyVersion>
<TargetFramework>$(DefaultTargetFramework)</TargetFramework>
<RootNamespace>Asp.Versioning</RootNamespace>
<AssemblyTitle>ASP.NET Core API Versioning</AssemblyTitle>
Expand All @@ -12,7 +12,7 @@

<!--
Possibly remove in a future release.

REF: https://github.com/advisories/GHSA-cmhx-cq75-c4mj
-->
<NoWarn>$(NoWarn);NU1903</NoWarn>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>10.0.0</VersionPrefix>
<AssemblyVersion>10.0.0.0</AssemblyVersion>
<VersionPrefix>11.0.0</VersionPrefix>
<AssemblyVersion>11.0.0.0</AssemblyVersion>
<TargetFramework>$(DefaultTargetFramework)</TargetFramework>
<RootNamespace>Asp.Versioning.ApiExplorer</RootNamespace>
<AssemblyTitle>ASP.NET Core API Versioning API Explorer</AssemblyTitle>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>10.0.0</VersionPrefix>
<AssemblyVersion>10.0.0.0</AssemblyVersion>
<VersionPrefix>11.0.0</VersionPrefix>
<AssemblyVersion>11.0.0.0</AssemblyVersion>
<TargetFramework>$(DefaultTargetFramework)</TargetFramework>
<RootNamespace>Asp.Versioning</RootNamespace>
<AssemblyTitle>ASP.NET Core API Versioning</AssemblyTitle>
Expand Down
Loading
Loading