Skip to content

#2344 Upgrade solutions to Visual Studio 2026 format #2354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raman-m merged 11 commits into from
Jan 29, 2026
Merged

#2344 Upgrade solutions to Visual Studio 2026 format #2354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
01e93b9
Update all packs that include the new net10.0 TFM in the stack
raman-m Jan 22, 2026
1659258
Prevent ArgumentNullException in DefaultMemoryCache<T>
raman-m Jan 23, 2026
28fa8af
Fix tests by refactoring merging process when collection options are …
raman-m Jan 23, 2026
fc49362
Fix unit tests
raman-m Jan 23, 2026
03a5301
New solution files for Visual Studio 2026 and .NET 10 SDK
raman-m Jan 23, 2026
cd1806d
Avoid analyzing the code with StyleCop.Analyzers, as the package is n…
raman-m Jan 23, 2026
60eb03d
Reorganize MessageInvokerPoolTests
raman-m Jan 23, 2026
814d375
ShouldHighlyLoadOnUnstableKubeProvider_WithRoundRobinLoadBalancing fo…
raman-m Jan 23, 2026
f019503
Improve code coverage
raman-m Jan 23, 2026
6ebd24f
Update build.cake
raman-m Jan 29, 2026
8eb0926
Update workflows
raman-m Jan 29, 2026
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
26 changes: 13 additions & 13 deletions .github/workflows/develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v5
- name: Setup .NET 9
- name: Setup .NET 10
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.x
dotnet-version: 10.x
cache: true
cache-dependency-path: |
samples/**/packages.lock.json
Expand All @@ -30,11 +30,11 @@ jobs:
- name: Restore
run: dotnet restore --locked-mode ./Ocelot.Release.sln
- name: Build
run: dotnet build --no-restore ./Ocelot.Release.sln --framework net9.0
run: dotnet build --no-restore ./Ocelot.Release.sln --framework net10.0
- name: Unit Tests
run: dotnet test --no-restore --no-build --verbosity minimal --framework net9.0 ./test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
run: dotnet test --no-restore --no-build --verbosity minimal --framework net10.0 ./test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
- name: Acceptance Tests
run: dotnet test --no-restore --no-build --verbosity minimal --framework net9.0 ./test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
run: dotnet test --no-restore --no-build --verbosity minimal --framework net10.0 ./test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj

build-macos:
needs: build-windows
Expand All @@ -48,10 +48,10 @@ jobs:
run: |
chmod +x .github/steps/*.sh
ls -l .github/steps/*.sh
- name: Setup .NET 9
- name: Setup .NET 10
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.x
dotnet-version: 10.x
cache: true
cache-dependency-path: |
samples/**/packages.lock.json
Expand All @@ -66,17 +66,17 @@ jobs:
- name: Restore
run: dotnet restore --locked-mode ./Ocelot.Release.sln
- name: Build
run: dotnet build --no-restore ./Ocelot.Release.sln --framework net9.0
run: dotnet build --no-restore ./Ocelot.Release.sln --framework net10.0
- name: Unit Tests
run: dotnet test --no-restore --no-build --verbosity minimal --framework net9.0 ./test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
run: dotnet test --no-restore --no-build --verbosity minimal --framework net10.0 ./test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
- name: Acceptance Tests
run: dotnet test --no-restore --no-build --verbosity minimal --framework net9.0 ./test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
run: dotnet test --no-restore --no-build --verbosity minimal --framework net10.0 ./test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj

build-linux:
needs: build-macos
strategy:
matrix:
dotnet-version: [ '8', '9' ]
dotnet-version: [ '8', '9', '10' ]
runs-on: ubuntu-latest
env:
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
Expand Down Expand Up @@ -127,10 +127,10 @@ jobs:
fetch-depth: 0
- name: SH-scripts executable
run: chmod +x .github/steps/*.sh
- name: Setup .NET 9
- name: Setup .NET 10
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.x
dotnet-version: 10.x
cache: true
cache-dependency-path: |
samples/**/packages.lock.json
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/pr-closed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,18 @@ jobs:
echo Pull request $pr_no cache items to be deleted...
gh cache list --ref refs/pull/$pr_no/merge
echo --------------------------------------
echo All cache items to be deleted...
echo All cache items...
gh cache list
echo --------------------------------------
# gh cache list --ref refs/pull/$pr_no/merge --json id --jq '.[].id' | xargs -n1 gh cache delete
# Sometimes, items produced by other workflows get reused in the PR workflow
gh cache delete --all --succeed-on-no-caches
# gh cache delete --all --succeed-on-no-caches
echo "PR $pr_no: deleting caches for refs/pull/$pr_no/merge..."
ids=$(gh cache list --ref refs/pull/$pr_no/merge --json id --jq '.[].id')
if [ -z "$ids" ]; then
echo "No PR caches found."
else
echo "$ids" | xargs -r -I{} sh -c 'gh cache delete {} || echo "delete {} failed (ignored)"'
fi
echo DONE
continue-on-error: true
56 changes: 28 additions & 28 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
# run: |
# chmod +x .github/steps/*.sh
# ls -l .github/steps/*.sh
# - name: Check .NET 9
# id: check-dotnet9
# run: ./.github/steps/check-dotnet.sh 9
# - name: Setup .NET 9
# # if: env.DOTNET9_installed == 'false'
# - name: Check .NET 10
# id: check-dotnet10
# run: ./.github/steps/check-dotnet.sh 10
# - name: Setup .NET 10
# # if: env.DOTNET10_installed == 'false'
# uses: actions/setup-dotnet@v5
# with:
# dotnet-version: 9.x
# dotnet-version: 10.x
# cache: true
# cache-dependency-path: |
# samples/**/packages.lock.json
Expand All @@ -38,13 +38,13 @@ jobs:
# - name: Install certificate
# run: ./.github/steps/ubuntu.install-certificate.sh
# - name: Restore
# run: dotnet restore --locked-mode ./Ocelot.sln
# run: dotnet restore --locked-mode ./Ocelot.slnx
# - name: Build
# run: dotnet build --no-restore ./Ocelot.sln --framework net9.0
# run: dotnet build --no-restore ./Ocelot.slnx --framework net10.0
# - name: Unit Tests
# run: dotnet test --no-restore --no-build --verbosity normal --framework net9.0 ./test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
# run: dotnet test --no-restore --no-build --verbosity normal --framework net10.0 ./test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
# - name: Acceptance Tests
# run: dotnet test --no-restore --no-build --verbosity normal --framework net9.0 ./test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
# run: dotnet test --no-restore --no-build --verbosity normal --framework net10.0 ./test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj

# build-macos:
# runs-on: macos-latest
Expand All @@ -58,10 +58,10 @@ jobs:
# run: |
# chmod +x .github/steps/*.sh
# ls -l .github/steps/*.sh
# - name: Setup .NET 9
# - name: Setup .NET 10
# uses: actions/setup-dotnet@v5
# with:
# dotnet-version: 9.x
# dotnet-version: 10.x
# cache: true
# cache-dependency-path: |
# samples/**/packages.lock.json
Expand All @@ -74,13 +74,13 @@ jobs:
# - name: Install certificate
# run: ./.github/steps/macos.install-certificate.sh
# - name: Restore
# run: dotnet restore --locked-mode ./Ocelot.sln
# run: dotnet restore --locked-mode ./Ocelot.slnx
# - name: Build
# run: dotnet build --no-restore ./Ocelot.sln --framework net9.0
# run: dotnet build --no-restore ./Ocelot.slnx --framework net10.0
# - name: Unit Tests
# run: dotnet test --no-restore --no-build --verbosity minimal --framework net9.0 ./test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
# run: dotnet test --no-restore --no-build --verbosity minimal --framework net10.0 ./test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
# - name: Acceptance Tests
# run: dotnet test --no-restore --no-build --verbosity minimal --framework net9.0 ./test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
# run: dotnet test --no-restore --no-build --verbosity minimal --framework net10.0 ./test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj

# build-windows:
# runs-on: windows-latest
Expand All @@ -90,10 +90,10 @@ jobs:
# steps:
# - name: Checkout
# uses: actions/checkout@v5
# - name: Setup .NET 9
# - name: Setup .NET 10
# uses: actions/setup-dotnet@v5
# with:
# dotnet-version: 9.x
# dotnet-version: 10.x
# cache: true
# cache-dependency-path: |
# samples/**/packages.lock.json
Expand All @@ -106,13 +106,13 @@ jobs:
# - name: Install certificate
# run: ./.github/steps/windows.install-certificate.ps1
# - name: Restore
# run: dotnet restore --locked-mode ./Ocelot.sln
# run: dotnet restore --locked-mode ./Ocelot.slnx
# - name: Build
# run: dotnet build --no-restore ./Ocelot.sln --framework net9.0
# run: dotnet build --no-restore ./Ocelot.slnx --framework net10.0
# - name: Unit Tests
# run: dotnet test --no-restore --no-build --verbosity minimal --framework net9.0 ./test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
# run: dotnet test --no-restore --no-build --verbosity minimal --framework net10.0 ./test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
# - name: Acceptance Tests
# run: dotnet test --no-restore --no-build --verbosity minimal --framework net9.0 ./test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
# run: dotnet test --no-restore --no-build --verbosity minimal --framework net10.0 ./test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj

# build-success:
# needs: [build-linux, build-macos, build-windows]
Expand Down Expand Up @@ -146,14 +146,14 @@ jobs:
run: |
chmod +x .github/steps/*.sh
ls -l .github/steps/*.sh
- name: Check .NET 9
id: check-dotnet9
run: ./.github/steps/check-dotnet.sh 9
- name: Setup .NET 9
# if: env.DOTNET9_installed == 'false'
- name: Check .NET 10
id: check-dotnet10
run: ./.github/steps/check-dotnet.sh 10
- name: Setup .NET 10
# if: env.DOTNET10_installed == 'false'
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.x
dotnet-version: 10.x
cache: true
cache-dependency-path: |
samples/**/packages.lock.json
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build-windows:
strategy:
matrix:
dotnet-version: [ '8', '9' ]
dotnet-version: [ '8', '9', '10' ]
runs-on: windows-latest
env:
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
needs: build-windows
strategy:
matrix:
dotnet-version: [ '8', '9' ]
dotnet-version: [ '8', '9', '10' ]
runs-on: macos-latest
env:
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
needs: build-macos
strategy:
matrix:
dotnet-version: [ '8', '9' ]
dotnet-version: [ '8', '9', '10' ]
runs-on: ubuntu-latest
env:
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
Expand Down Expand Up @@ -145,13 +145,13 @@ jobs:
run: |
chmod +x .github/steps/*.sh
ls -l .github/steps/*.sh
- name: Check .NET 9
- name: Check .NET 10
id: check-dotnet
run: ./.github/steps/check-dotnet.sh 9
- name: Setup .NET 9
run: ./.github/steps/check-dotnet.sh 10
- name: Setup .NET 10
uses: actions/setup-dotnet@v5
with:
dotnet-version: 9.x
dotnet-version: 10.x
cache: true
cache-dependency-path: |
samples/**/packages.lock.json
Expand Down
Loading
Loading