diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 584345951..f279735bf 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,17 +1,15 @@ -## :package: End of .NET 6, 7 Support (version {0}) +## :fire: Hot fixing #2246 issue (version {0}) aka v[{1}](https://github.com/ThreeMammals/Ocelot/releases/tag/{1}) patch :package: > Read the Docs: [Ocelot 23.4](https://ocelot.readthedocs.io/en/{0}/) with [PDF](https://ocelot.readthedocs.io/_/downloads/en/{0}/pdf/) > Hot fixed version: [{1}](https://github.com/ThreeMammals/Ocelot/releases/tag/{1}) > Milestone: [November'24](https://github.com/ThreeMammals/Ocelot/milestone/10) -This is the last patched version for .NET 6 and 7 frameworks. The upcoming major release, version [24.0](https://github.com/ThreeMammals/Ocelot/milestone/11), will target .NET 9 alongside the LTS .NET 8. Projects targeting .NET 6 or 7 should update to this version while considering an upgrade to .NET 8 or 9 in the future. +### :information_source: About +:fire: Hot fixed issue: #2246 +:heart: A sincere and heartfelt "Thank You" to **Donny Tian**, @donnytian for reporting the bug. -### :information_source: About -- All package versions have been updated to latest versions targeting the `net6.0` and `net7.0` frameworks, along with the LTS `net8.0`. -- Dependabot alerts concerning [reported vulnerabilities](https://github.com/ThreeMammals/Ocelot/security/dependabot) related to `IdentityServer4` have not yet been addressed; these will be resolved in the next major release (refer to **Warnings** further information). +### :warning: Warning +1. Consider this patch as the last one supporting .NET 6 and 7 frameworks. For more details, refer to the [previous version notes](https://github.com/ThreeMammals/Ocelot/releases/tag/{1}). +2. No further patches for this minor version are expected. The next major release will be [.NET 9](https://github.com/ThreeMammals/Ocelot/milestone/11), version **24.0**. -### :exclamation: Warning -1. Releasing a patched `23.4.*` is possible. -2. In the next major version, the Ocelot team will remove references to the [IdentityServer4](https://github.comIdentityServer/IdentityServer4) package from testing projects due to its "Public Archive" status; the version, [4.1.2](https://github.comIdentityServer/IdentityServer4/releases/tag/4.1.2), was [released](https://github.com/IdentityServer/IdentityServer4/releases) on July 7, 2021. -3. The main Ocelot package is not integrated with `IdentityServer4`, allowing Ocelot users to utilize [any authentication provider](https://github.com/ThreeMammals/Ocelot/discussions/2194), as Ocelot's [Authentication](https://github.com/ThreeMammals/Ocelot/blob/main/docs/authentication.rst) feature is provider-agnostic. -4. Our plans to utilize the [ASP.NET Core Identity](https://learn.microsoft.com/en-us/aspnet/core/security/authentication/identity) framework in testing projects due to industry standards, instead the `IdentityServer4` library. -5. Following the release of .NET 9, the team will begin the deprecation of the Ocelot extension-packages: `Ocelot.Cache.CacheManager`, `Ocelot.Tracing.Butterfly`, and `Ocelot.Tracing.OpenTracing`. +### :exclamation: Breaking Changes +Upgrading from [23.4.0](https://github.com/ThreeMammals/Ocelot/releases/tag/23.4.0)-[{1}](https://github.com/ThreeMammals/Ocelot/releases/tag/{1}) to [{0}](https://github.com/Threeammals/Ocelot/releases/tag/{0}) introduces **no breaking changes**. However, some internal interfaces have been updated, which should not introduce IBC for 99.99% of projects. For further information, refer to the source code. diff --git a/build.cake b/build.cake index a38836e04..83341eeb3 100644 --- a/build.cake +++ b/build.cake @@ -725,10 +725,17 @@ private void PublishPackages(ConvertableDirectoryPath packagesDir, ConvertableFi var artifacts = System.IO.File .ReadAllLines(artifactsFile) .Distinct(); - - foreach(var artifact in artifacts) + var skippable = new List + { + "ReleaseNotes.md", // skip always + "Ocelot.Provider.Eureka", // do not release for version 23.4.3 + "Ocelot.Provider.Kubernetes", + "Ocelot.Tracing.Butterfly", + "Ocelot.Tracing.OpenTracing", + }; + foreach (var artifact in artifacts) { - if (artifact == "ReleaseNotes.md") + if (skippable.Exists(x => artifact.StartsWith(x))) continue; var codePackage = packagesDir + File(artifact); diff --git a/docs/index.rst b/docs/index.rst index 78dc76f07..d9429c9fd 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,4 +1,4 @@ -.. _23.4: https://github.com/ThreeMammals/Ocelot/releases/tag/23.4.2 +.. _23.4: https://github.com/ThreeMammals/Ocelot/releases/tag/23.4.3 ############################ Ocelot `23.4`_ Documentation diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst index 231f44bba..3d5b99bfc 100644 --- a/docs/releasenotes.rst +++ b/docs/releasenotes.rst @@ -4,15 +4,16 @@ .. _@jlukawska: https://github.com/jlukawska .. _@kesskalli: https://github.com/kesskalli -.. _23.4: https://github.com/ThreeMammals/Ocelot/releases/tag/23.4.2 +.. _23.4: https://github.com/ThreeMammals/Ocelot/releases/tag/23.4.3 .. _23.4.0: https://github.com/ThreeMammals/Ocelot/releases/tag/23.4.0 .. _23.4.1: https://github.com/ThreeMammals/Ocelot/releases/tag/23.4.1 .. _23.4.2: https://github.com/ThreeMammals/Ocelot/releases/tag/23.4.2 +.. _23.4.3: https://github.com/ThreeMammals/Ocelot/releases/tag/23.4.3 -.. _1111: https://github.com/ThreeMammals/Ocelot/issues/1111 .. _1307: https://github.com/ThreeMammals/Ocelot/pull/1307 .. _1403: https://github.com/ThreeMammals/Ocelot/pull/1403 .. _2200: https://github.com/ThreeMammals/Ocelot/pull/2200 +.. _2246: https://github.com/ThreeMammals/Ocelot/issues/2246 .. role:: htm(raw) :format: html @@ -33,6 +34,7 @@ The major version `23.4.0`_ includes several patches, the history of which is pr - `23.4.1`_, on Nov 22, 2024: Routing patch. - `23.4.2`_, on Nov 27, 2024: End of .NET 6/7 Support patch. + - `23.4.3`_, on Jan 17, 2025: Issue `2246`_ patch. .. _release-notes: diff --git a/src/Ocelot.Administration/Ocelot.Administration.csproj b/src/Ocelot.Administration/Ocelot.Administration.csproj index ebc924a0f..a6195393e 100644 --- a/src/Ocelot.Administration/Ocelot.Administration.csproj +++ b/src/Ocelot.Administration/Ocelot.Administration.csproj @@ -52,7 +52,7 @@ - - + + diff --git a/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj b/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj index 7ac170844..0aa8af8c1 100644 --- a/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj +++ b/src/Ocelot.Cache.CacheManager/Ocelot.Cache.CacheManager.csproj @@ -43,10 +43,10 @@ - - - - + + + + @@ -59,10 +59,10 @@ - - - - + + + + diff --git a/src/Ocelot.Provider.Consul/Ocelot.Provider.Consul.csproj b/src/Ocelot.Provider.Consul/Ocelot.Provider.Consul.csproj index b97fe54a9..4e00b1e8d 100644 --- a/src/Ocelot.Provider.Consul/Ocelot.Provider.Consul.csproj +++ b/src/Ocelot.Provider.Consul/Ocelot.Provider.Consul.csproj @@ -30,7 +30,7 @@ - + all diff --git a/src/Ocelot.Provider.Polly/Ocelot.Provider.Polly.csproj b/src/Ocelot.Provider.Polly/Ocelot.Provider.Polly.csproj index 46df97c7f..640be7ea1 100644 --- a/src/Ocelot.Provider.Polly/Ocelot.Provider.Polly.csproj +++ b/src/Ocelot.Provider.Polly/Ocelot.Provider.Polly.csproj @@ -34,7 +34,7 @@ all - + diff --git a/src/Ocelot/Ocelot.csproj b/src/Ocelot/Ocelot.csproj index a22a44ffe..53d5442e4 100644 --- a/src/Ocelot/Ocelot.csproj +++ b/src/Ocelot/Ocelot.csproj @@ -53,8 +53,8 @@ - - + + diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj index 70a29bfed..934c8d9a9 100644 --- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj +++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj @@ -45,14 +45,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -63,7 +63,7 @@ - + @@ -75,27 +75,27 @@ - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj index d4b9e96f8..826ca692f 100644 --- a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj +++ b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj @@ -36,14 +36,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -56,27 +56,27 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj index bd45991e1..3096a98e9 100644 --- a/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj +++ b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj @@ -39,25 +39,25 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + diff --git a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj index 137f5b474..b773d66c8 100644 --- a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj +++ b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj @@ -51,13 +51,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -71,36 +71,36 @@ - + - - + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + +