tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-12-24 02:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Feat/net6.0 upgrade (#1558)

Browse Source 
* +semver: major upgrading from net5.0 to net6.0

* packages upgraded

* removed global.json for ocelot sf sample

* update build image

* test new build

* remove make

* fix tests

* make test fail like in CI

* tests passing locally

* updated docs


Co-authored-by: TGP <thomasgardham-pallister@Thomass-MacBook-Pro-2.local>
This commit is contained in:
Tom Pallister
2022-01-20 09:04:04 +00:00
committed by GitHub
parent 3dcc6b6d14
commit e5ee57bf24
46 changed files with 255 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/Ocelot.AcceptanceTests/ConfigurationReloadTests.cs
View File

@@ -39,7 +39,7 @@ namespace Ocelot.AcceptanceTests
this.Given(x => _steps.GivenThereIsAConfiguration(_initialConfig))
.And(x => _steps.GivenOcelotIsRunningReloadingConfig(true))
.And(x => _steps.GivenThereIsAConfiguration(_anotherConfig))
.And(x => _steps.GivenIWait(2500))
.And(x => _steps.GivenIWait(5000))
.And(x => _steps.ThenConfigShouldBe(_anotherConfig))
.BDDfy();
}
@@ -50,7 +50,7 @@ namespace Ocelot.AcceptanceTests
this.Given(x => _steps.GivenThereIsAConfiguration(_initialConfig))
.And(x => _steps.GivenOcelotIsRunningReloadingConfig(false))
.And(x => _steps.GivenThereIsAConfiguration(_anotherConfig))
.And(x => _steps.GivenIWait(2500))
.And(x => _steps.GivenIWait(MillisecondsToWaitForChangeToken))
.And(x => _steps.ThenConfigShouldBe(_initialConfig))
.BDDfy();
}